diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb b/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb
rename to snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/makefile b/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/makefile
rename to snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices.ApplicationIDAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices.ApplicationIDAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesApplicationQueuingAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesApplicationQueuingAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesAutoCompleteAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesAutoCompleteAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/makefile b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/makefile
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/makefile b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/makefile
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/transaction.vb b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/transaction.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/transaction.vb
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/transaction.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmclient.vb b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmclient.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmclient.vb
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmclient.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/makefile b/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/makefile
rename to snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesEventTrackingEnabledAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesEventTrackingEnabledAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesInterfaceQueuingAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/InterfaceQueuingAttribute/.ctor/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesInterfaceQueuingAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/InterfaceQueuingAttribute/.ctor/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesJustInTimeActivationAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesJustInTimeActivationAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesLoadBalancingSupportedAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesLoadBalancingSupportedAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesMustRunInClientContextAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesMustRunInClientContextAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesPrivateComponentAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/PrivateComponentAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesPrivateComponentAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/PrivateComponentAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices Registration/VB/deployservicedcomponent.vb b/snippets/visualbasic/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices Registration/VB/deployservicedcomponent.vb
rename to snippets/visualbasic/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb b/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb
rename to snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationOption/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/SynchronizationOption/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationOption/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/SynchronizationOption/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionAttribute/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/TransactionAttribute/.ctor/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionAttribute/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/TransactionAttribute/.ctor/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionIsolationLevel/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/TransactionIsolationLevel/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionIsolationLevel/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/TransactionIsolationLevel/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionOption/VB/class1.vb b/snippets/visualbasic/System.EnterpriseServices/TransactionOption/Overview/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionOption/VB/class1.vb
rename to snippets/visualbasic/System.EnterpriseServices/TransactionOption/Overview/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb b/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb
rename to snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessagingBinaryFormatter/VB/message_binaryformatter.vb b/snippets/visualbasic/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessagingBinaryFormatter/VB/message_binaryformatter.vb
rename to snippets/visualbasic/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.DefaultPropertiesToSend/VB/mqdefaultpropertiestosend.vb b/snippets/visualbasic/System.Messaging/DefaultPropertiesToSend/Overview/mqdefaultpropertiestosend.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.DefaultPropertiesToSend/VB/mqdefaultpropertiestosend.vb
rename to snippets/visualbasic/System.Messaging/DefaultPropertiesToSend/Overview/mqdefaultpropertiestosend.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb b/snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb
rename to snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb b/snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb
rename to snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageEnumerator/VB/mqgetmessageenumerator.vb b/snippets/visualbasic/System.Messaging/MessageEnumerator/Overview/mqgetmessageenumerator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageEnumerator/VB/mqgetmessageenumerator.vb
rename to snippets/visualbasic/System.Messaging/MessageEnumerator/Overview/mqgetmessageenumerator.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ctor_PathSharedModeDenyReceive/VB/mqctor_denysharedreceive.vb b/snippets/visualbasic/System.Messaging/MessageQueue/.ctor/mqctor_denysharedreceive.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ctor_PathSharedModeDenyReceive/VB/mqctor_denysharedreceive.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/.ctor/mqctor_denysharedreceive.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/VB/mqbeginpeek_noparms.vb b/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/VB/mqbeginpeek_noparms.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_timeout/VB/mqbeginpeek_timeout.vb b/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_timeout/VB/mqbeginpeek_timeout.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeout.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_TimeSpanStateObject/VB/mqbeginpeek_timeoutstateobject.vb b/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeoutstateobject.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_TimeSpanStateObject/VB/mqbeginpeek_timeoutstateobject.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeoutstateobject.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/makefile b/snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/makefile
rename to snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/mqbeginreceive_noparms_mre.vb b/snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_mre.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/mqbeginreceive_noparms_mre.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_mre.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/mqbeginreceive_noparms_wh.vb b/snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_wh.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/mqbeginreceive_noparms_wh.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_wh.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Close/VB/mqclose.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Close/mqclose.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Close/VB/mqclose.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Close/mqclose.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Create_path/VB/mqcreate.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Create/mqcreate.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Create_path/VB/mqcreate.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Create/mqcreate.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Create_PathTransactional/VB/mqcreate_transactional.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Create/mqcreate_transactional.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Create_PathTransactional/VB/mqcreate_transactional.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Create/mqcreate_transactional.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ExistsDelete/VB/mqexistsdelete.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Delete/mqexistsdelete.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ExistsDelete/VB/mqexistsdelete.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Delete/mqexistsdelete.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_noparms/VB/mqgetmessagequeueenumerator.vb b/snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_noparms/VB/mqgetmessagequeueenumerator.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_criteria/VB/mqgetmessagequeueenumerator_criteria.vb b/snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator_criteria.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_criteria/VB/mqgetmessagequeueenumerator_criteria.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator_criteria.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb b/snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.MessageReadPropertyFilter/VB/mqmessagereadpropertyfilter.vb b/snippets/visualbasic/System.Messaging/MessageQueue/MessageReadPropertyFilter/mqmessagereadpropertyfilter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.MessageReadPropertyFilter/VB/mqmessagereadpropertyfilter.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/MessageReadPropertyFilter/mqmessagereadpropertyfilter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Path/VB/mqpath.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqpath.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Path/VB/mqpath.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqpath.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_noparms/VB/mqreceive_noparms.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqreceive_noparms.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_noparms/VB/mqreceive_noparms.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqreceive_noparms.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Peek_noparms/VB/mqpeek_noparms.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Peek/mqpeek_noparms.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Peek_noparms/VB/mqpeek_noparms.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Peek/mqpeek_noparms.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Peek_timeout/VB/mqpeek_timeout.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Peek/mqpeek_timeout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Peek_timeout/VB/mqpeek_timeout.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Peek/mqpeek_timeout.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_timeout/VB/mqreceive_timeout.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_timeout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_timeout/VB/mqreceive_timeout.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_timeout.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_TimeoutTransaction/VB/mqreceive_timeouttransaction.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_timeouttransaction.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_TimeoutTransaction/VB/mqreceive_timeouttransaction.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_timeouttransaction.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_transaction/VB/mqreceive_transaction.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_transaction.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_transaction/VB/mqreceive_transaction.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_transaction.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/VB/mqreceivecompletedeventhandler.vb b/snippets/visualbasic/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/VB/mqreceivecompletedeventhandler.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Send_obj/VB/mqsend_generic.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Send/mqsend_generic.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Send_obj/VB/mqsend_generic.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Send/mqsend_generic.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Send_ObjectTransaction/VB/mqsend_objtransaction.vb b/snippets/visualbasic/System.Messaging/MessageQueue/Send/mqsend_objtransaction.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Send_ObjectTransaction/VB/mqsend_objtransaction.vb
rename to snippets/visualbasic/System.Messaging/MessageQueue/Send/mqsend_objtransaction.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source.vb b/snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source.vb
rename to snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source2.vb b/snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source2.vb
rename to snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source3.vb b/snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source3.vb
rename to snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb b/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb
rename to snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb b/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb
rename to snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb b/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb
rename to snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclNetAddressChanged1/VB/changed.vb b/snippets/visualbasic/System.Net.NetworkInformation/NetworkChange/Overview/changed.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclNetAddressChanged1/VB/changed.vb
rename to snippets/visualbasic/System.Net.NetworkInformation/NetworkChange/Overview/changed.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclNetworkInfoPerms/VB/permissionexample.vb b/snippets/visualbasic/System.Net.NetworkInformation/NetworkInformationAccess/Overview/permissionexample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclNetworkInfoPerms/VB/permissionexample.vb
rename to snippets/visualbasic/System.Net.NetworkInformation/NetworkInformationAccess/Overview/permissionexample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb b/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb
rename to snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/Project.vbproj b/snippets/visualbasic/System.Net.Security/SslStream/.ctor/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/Project.vbproj
rename to snippets/visualbasic/System.Net.Security/SslStream/.ctor/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb b/snippets/visualbasic/System.Net.Security/SslStream/.ctor/clientasync.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb
rename to snippets/visualbasic/System.Net.Security/SslStream/.ctor/clientasync.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/Project.vbproj b/snippets/visualbasic/System.Net.Security/SslStream/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/Project.vbproj
rename to snippets/visualbasic/System.Net.Security/SslStream/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/Project.vbproj b/snippets/visualbasic/System.Net.Security/SslStream/Overview/Project1.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/Project.vbproj
rename to snippets/visualbasic/System.Net.Security/SslStream/Overview/Project1.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/clientsync.vb b/snippets/visualbasic/System.Net.Security/SslStream/Overview/clientsync.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/clientsync.vb
rename to snippets/visualbasic/System.Net.Security/SslStream/Overview/clientsync.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb b/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb
rename to snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Socket_Send_Receive/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/AddressFamily/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Socket_Send_Receive/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/AddressFamily/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb b/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb
rename to snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic LingerOption Example/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/LingerOption/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic LingerOption Example/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/LingerOption/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionListener/VB/listener.vb b/snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/listener.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionListener/VB/listener.vb
rename to snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/listener.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionSender/VB/sender.vb b/snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/sender.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionSender/VB/sender.vb
rename to snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/sender.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Protected_Members/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/NetworkStream/Readable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Protected_Members/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/NetworkStream/Readable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Synch_SendAndReceive/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/NetworkStream/Write/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Synch_SendAndReceive/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/NetworkStream/Write/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SelectModeExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/SelectMode/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SelectModeExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/SelectMode/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Accept Example/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/Socket/Accept/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Accept Example/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/Socket/Accept/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Bind Example/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/Socket/Bind/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Bind Example/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/Socket/Bind/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Close Example/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/Socket/Close/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Close Example/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/Socket/Close/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Connect Example/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/Socket/Connect/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Connect Example/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/Socket/Connect/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Listen Example/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/Socket/Listen/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Listen Example/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/Socket/Listen/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Socket_Select/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/Socket/Select/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Socket_Select/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/Socket/Select/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TcpClientProtectedMethodsAndPropertiesExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/TcpClient/Client/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TcpClientProtectedMethodsAndPropertiesExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpClient/Client/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpClient/VB/Project.vbproj b/snippets/visualbasic/System.Net.Sockets/TcpClient/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpClient/VB/Project.vbproj
rename to snippets/visualbasic/System.Net.Sockets/TcpClient/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpClient/VB/tcpclient.vb b/snippets/visualbasic/System.Net.Sockets/TcpClient/Overview/tcpclient.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpClient/VB/tcpclient.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpClient/Overview/tcpclient.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListener.PublicMethodsAndPropertiesExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/TcpListener/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListener.PublicMethodsAndPropertiesExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpListener/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListenerExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/TcpListener/AcceptTcpClient/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListenerExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpListener/AcceptTcpClient/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener1/VB/tcpserver.vb b/snippets/visualbasic/System.Net.Sockets/TcpListener/ExclusiveAddressUse/tcpserver.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener1/VB/tcpserver.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpListener/ExclusiveAddressUse/tcpserver.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TcpListener_Pending_LocalEndPoint/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/TcpListener/LocalEndpoint/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TcpListener_Pending_LocalEndPoint/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpListener/LocalEndpoint/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener/VB/tcpserver.vb b/snippets/visualbasic/System.Net.Sockets/TcpListener/Overview/tcpserver.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener/VB/tcpserver.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpListener/Overview/tcpserver.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TcpListenerProtectedMembers1/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/TcpListener/Server/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TcpListenerProtectedMembers1/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/TcpListener/Server/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.ProtectedMethodsAndPropertiesExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/UdpClient/Client/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.ProtectedMethodsAndPropertiesExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/UdpClient/Client/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClientExample/VB/source.vb b/snippets/visualbasic/System.Net.Sockets/UdpClient/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClientExample/VB/source.vb
rename to snippets/visualbasic/System.Net.Sockets/UdpClient/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic NetworkCredential Example/VB/Project.vbproj b/snippets/visualbasic/System.Net/AuthenticationManager/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic NetworkCredential Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Net/AuthenticationManager/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb b/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb
rename to snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.Authentication/VB/custombasicauthentication.vb b/snippets/visualbasic/System.Net/AuthenticationManager/Register/custombasicauthentication.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.Authentication/VB/custombasicauthentication.vb
rename to snippets/visualbasic/System.Net/AuthenticationManager/Register/custombasicauthentication.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/AuthenticationManager_UnRegister2/VB/authenticationmanager_unregister2.vb b/snippets/visualbasic/System.Net/AuthenticationManager/Unregister/authenticationmanager_unregister2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/AuthenticationManager_UnRegister2/VB/authenticationmanager_unregister2.vb
rename to snippets/visualbasic/System.Net/AuthenticationManager/Unregister/authenticationmanager_unregister2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb b/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb
rename to snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Authorization_Constructor3/VB/authorization_constructor3.vb b/snippets/visualbasic/System.Net/Authorization/.ctor/authorization_constructor3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Authorization_Constructor3/VB/authorization_constructor3.vb
rename to snippets/visualbasic/System.Net/Authorization/.ctor/authorization_constructor3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Authorization_ProtectionRealm/VB/authorization_protectionrealm.vb b/snippets/visualbasic/System.Net/Authorization/.ctor/authorization_protectionrealm.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Authorization_ProtectionRealm/VB/authorization_protectionrealm.vb
rename to snippets/visualbasic/System.Net/Authorization/.ctor/authorization_protectionrealm.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Authorization_Constructor3/VB/makefile b/snippets/visualbasic/System.Net/Authorization/.ctor/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Authorization_Constructor3/VB/makefile
rename to snippets/visualbasic/System.Net/Authorization/.ctor/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb b/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb
rename to snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_1/VB/CookiesServer.vb.aspx b/snippets/visualbasic/System.Net/CookieCollection/Item/CookiesServer.vb.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_1/VB/CookiesServer.vb.aspx
rename to snippets/visualbasic/System.Net/CookieCollection/Item/CookiesServer.vb.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_2/VB/CookiesServer.vb.aspx b/snippets/visualbasic/System.Net/CookieCollection/Item/CookiesServer.vb1.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_2/VB/CookiesServer.vb.aspx
rename to snippets/visualbasic/System.Net/CookieCollection/Item/CookiesServer.vb1.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_1/VB/cookiecollection_item_1.vb b/snippets/visualbasic/System.Net/CookieCollection/Item/cookiecollection_item_1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_1/VB/cookiecollection_item_1.vb
rename to snippets/visualbasic/System.Net/CookieCollection/Item/cookiecollection_item_1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_2/VB/cookiecollection_item_2.vb b/snippets/visualbasic/System.Net/CookieCollection/Item/cookiecollection_item_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_2/VB/cookiecollection_item_2.vb
rename to snippets/visualbasic/System.Net/CookieCollection/Item/cookiecollection_item_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_1/VB/makefile b/snippets/visualbasic/System.Net/CookieCollection/Item/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_1/VB/makefile
rename to snippets/visualbasic/System.Net/CookieCollection/Item/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_2/VB/makefile b/snippets/visualbasic/System.Net/CookieCollection/Item/makefile1
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_2/VB/makefile
rename to snippets/visualbasic/System.Net/CookieCollection/Item/makefile1
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCL_Credential.Cache.Add_SMTP/VB/source.vb b/snippets/visualbasic/System.Net/CredentialCache/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCL_Credential.Cache.Add_SMTP/VB/source.vb
rename to snippets/visualbasic/System.Net/CredentialCache/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_DefaultCredentials/VB/credentialcache_defaultcredentials.vb b/snippets/visualbasic/System.Net/CredentialCache/DefaultCredentials/credentialcache_defaultcredentials.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_DefaultCredentials/VB/credentialcache_defaultcredentials.vb
rename to snippets/visualbasic/System.Net/CredentialCache/DefaultCredentials/credentialcache_defaultcredentials.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_GetCredential/VB/credentialcache_getcredential.vb b/snippets/visualbasic/System.Net/CredentialCache/GetCredential/credentialcache_getcredential.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_GetCredential/VB/credentialcache_getcredential.vb
rename to snippets/visualbasic/System.Net/CredentialCache/GetCredential/credentialcache_getcredential.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_GetEnumerator/VB/credentialcache_getenumerator.vb b/snippets/visualbasic/System.Net/CredentialCache/GetEnumerator/credentialcache_getenumerator.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_GetEnumerator/VB/credentialcache_getenumerator.vb
rename to snippets/visualbasic/System.Net/CredentialCache/GetEnumerator/credentialcache_getenumerator.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic CredentialCache.Add Example/VB/source.vb b/snippets/visualbasic/System.Net/CredentialCache/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic CredentialCache.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Net/CredentialCache/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_Add_Remove/VB/credentialcache_add_remove.vb b/snippets/visualbasic/System.Net/CredentialCache/Remove/credentialcache_add_remove.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_Add_Remove/VB/credentialcache_add_remove.vb
rename to snippets/visualbasic/System.Net/CredentialCache/Remove/credentialcache_add_remove.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Dns/vb/dnsnewmethods.vb b/snippets/visualbasic/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Dns/vb/dnsnewmethods.vb
rename to snippets/visualbasic/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Dns_Begin_EndResolve/VB/dns_begin_endresolve.vb b/snippets/visualbasic/System.Net/Dns/BeginResolve/dns_begin_endresolve.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Dns_Begin_EndResolve/VB/dns_begin_endresolve.vb
rename to snippets/visualbasic/System.Net/Dns/BeginResolve/dns_begin_endresolve.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostByAddress_IPAddress/VB/dns_gethostbyaddress_ipaddress.vb b/snippets/visualbasic/System.Net/Dns/GetHostByAddress/dns_gethostbyaddress_ipaddress.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostByAddress_IPAddress/VB/dns_gethostbyaddress_ipaddress.vb
rename to snippets/visualbasic/System.Net/Dns/GetHostByAddress/dns_gethostbyaddress_ipaddress.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostByName/VB/dns_gethostbyname.vb b/snippets/visualbasic/System.Net/Dns/GetHostByName/dns_gethostbyname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostByName/VB/dns_gethostbyname.vb
rename to snippets/visualbasic/System.Net/Dns/GetHostByName/dns_gethostbyname.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostName/VB/dns_gethostname.vb b/snippets/visualbasic/System.Net/Dns/GetHostName/dns_gethostname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostName/VB/dns_gethostname.vb
rename to snippets/visualbasic/System.Net/Dns/GetHostName/dns_gethostname.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Dns Example/VB/source.vb b/snippets/visualbasic/System.Net/Dns/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Dns Example/VB/source.vb
rename to snippets/visualbasic/System.Net/Dns/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Dns_Resolve/VB/dns_resolve.vb b/snippets/visualbasic/System.Net/Dns/Resolve/dns_resolve.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Dns_Resolve/VB/dns_resolve.vb
rename to snippets/visualbasic/System.Net/Dns/Resolve/dns_resolve.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb b/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb
rename to snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ReqBeginEnd/VB/filewebrequest_reqbeginend.vb b/snippets/visualbasic/System.Net/FileWebRequest/BeginGetRequestStream/filewebrequest_reqbeginend.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ReqBeginEnd/VB/filewebrequest_reqbeginend.vb
rename to snippets/visualbasic/System.Net/FileWebRequest/BeginGetRequestStream/filewebrequest_reqbeginend.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ResBeginEnd/VB/filewebrequest_resbeginend.vb b/snippets/visualbasic/System.Net/FileWebRequest/BeginGetResponse/filewebrequest_resbeginend.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ResBeginEnd/VB/filewebrequest_resbeginend.vb
rename to snippets/visualbasic/System.Net/FileWebRequest/BeginGetResponse/filewebrequest_resbeginend.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest.GetResponse/VB/getresponse.vb b/snippets/visualbasic/System.Net/FileWebRequest/GetResponse/getresponse.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest.GetResponse/VB/getresponse.vb
rename to snippets/visualbasic/System.Net/FileWebRequest/GetResponse/getresponse.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest/VB/getrequeststream.vb b/snippets/visualbasic/System.Net/FileWebRequest/Overview/getrequeststream.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest/VB/getrequeststream.vb
rename to snippets/visualbasic/System.Net/FileWebRequest/Overview/getrequeststream.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ContentLength/VB/filewebrequest_contentlength.vb b/snippets/visualbasic/System.Net/FileWebRequest/RequestUri/filewebrequest_contentlength.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ContentLength/VB/filewebrequest_contentlength.vb
rename to snippets/visualbasic/System.Net/FileWebRequest/RequestUri/filewebrequest_contentlength.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_Close/VB/filewebresponse_close.vb b/snippets/visualbasic/System.Net/FileWebResponse/Close/filewebresponse_close.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_Close/VB/filewebresponse_close.vb
rename to snippets/visualbasic/System.Net/FileWebResponse/Close/filewebresponse_close.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_ContentLength_ContentType/VB/filewebresponse_contentlength_contenttype.vb b/snippets/visualbasic/System.Net/FileWebResponse/ContentLength/filewebresponse_contentlength_contenttype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_ContentLength_ContentType/VB/filewebresponse_contentlength_contenttype.vb
rename to snippets/visualbasic/System.Net/FileWebResponse/ContentLength/filewebresponse_contentlength_contenttype.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_GetResponseStream/VB/filewebresponse_getresponsestream.vb b/snippets/visualbasic/System.Net/FileWebResponse/GetResponseStream/filewebresponse_getresponsestream.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_GetResponseStream/VB/filewebresponse_getresponsestream.vb
rename to snippets/visualbasic/System.Net/FileWebResponse/GetResponseStream/filewebresponse_getresponsestream.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_Headers/VB/filewebresponse_headers.vb b/snippets/visualbasic/System.Net/FileWebResponse/Headers/filewebresponse_headers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_Headers/VB/filewebresponse_headers.vb
rename to snippets/visualbasic/System.Net/FileWebResponse/Headers/filewebresponse_headers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_ResponseUri/VB/filewebresponse_responseuri.vb b/snippets/visualbasic/System.Net/FileWebResponse/ResponseUri/filewebresponse_responseuri.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_ResponseUri/VB/filewebresponse_responseuri.vb
rename to snippets/visualbasic/System.Net/FileWebResponse/ResponseUri/filewebresponse_responseuri.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb b/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb
rename to snippets/visualbasic/System.Net/HttpListener/Overview/test.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri Example/VB/Project.vbproj b/snippets/visualbasic/System.Net/HttpVersion/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Net/HttpVersion/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpVersion_Version10/VB/httpversion_version10.vb b/snippets/visualbasic/System.Net/HttpVersion/Overview/httpversion_version10.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpVersion_Version10/VB/httpversion_version10.vb
rename to snippets/visualbasic/System.Net/HttpVersion/Overview/httpversion_version10.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Accept/VB/httpwebrequest_accept.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Accept/httpwebrequest_accept.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Accept/VB/httpwebrequest_accept.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Accept/httpwebrequest_accept.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest.RequestUri Example/VB/source.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Address/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest.RequestUri Example/VB/source.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Address/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_AllowAutoRedirect/VB/httpwebrequest_allowautoredirect.vb b/snippets/visualbasic/System.Net/HttpWebRequest/AllowAutoRedirect/httpwebrequest_allowautoredirect.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_AllowAutoRedirect/VB/httpwebrequest_allowautoredirect.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/AllowAutoRedirect/httpwebrequest_allowautoredirect.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_AllowWriteStreamBuffering/VB/httpwebrequest_allowwritestreambuffering.vb b/snippets/visualbasic/System.Net/HttpWebRequest/AllowWriteStreamBuffering/httpwebrequest_allowwritestreambuffering.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_AllowWriteStreamBuffering/VB/httpwebrequest_allowwritestreambuffering.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/AllowWriteStreamBuffering/httpwebrequest_allowwritestreambuffering.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_BeginGetRequestStream/VB/httpwebrequest_begingetrequeststream.vb b/snippets/visualbasic/System.Net/HttpWebRequest/BeginGetRequestStream/httpwebrequest_begingetrequeststream.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_BeginGetRequestStream/VB/httpwebrequest_begingetrequeststream.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/BeginGetRequestStream/httpwebrequest_begingetrequeststream.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Connection/VB/httpwebrequest_connection.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Connection/httpwebrequest_connection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Connection/VB/httpwebrequest_connection.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Connection/httpwebrequest_connection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ContentLength/VB/httpwebrequest_contentlength.vb b/snippets/visualbasic/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ContentLength/VB/httpwebrequest_contentlength.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Httpwebrequest_HaveResponse/VB/httpwebrequest_haveresponse.vb b/snippets/visualbasic/System.Net/HttpWebRequest/HaveResponse/httpwebrequest_haveresponse.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Httpwebrequest_HaveResponse/VB/httpwebrequest_haveresponse.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/HaveResponse/httpwebrequest_haveresponse.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Headers/VB/httpwebrequest_headers.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Headers/httpwebrequest_headers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Headers/VB/httpwebrequest_headers.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Headers/httpwebrequest_headers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_IfModifiedSince/VB/httpwebrequest_ifmodifiedsince.vb b/snippets/visualbasic/System.Net/HttpWebRequest/IfModifiedSince/httpwebrequest_ifmodifiedsince.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_IfModifiedSince/VB/httpwebrequest_ifmodifiedsince.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/IfModifiedSince/httpwebrequest_ifmodifiedsince.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest Example/VB/source.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest Example/VB/source.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_PipeLined/VB/httpwebrequest_pipelined.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Pipelined/httpwebrequest_pipelined.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_PipeLined/VB/httpwebrequest_pipelined.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Pipelined/httpwebrequest_pipelined.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ProtocolVersion/VB/httpwebrequest_protocolversion.vb b/snippets/visualbasic/System.Net/HttpWebRequest/ProtocolVersion/httpwebrequest_protocolversion.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ProtocolVersion/VB/httpwebrequest_protocolversion.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/ProtocolVersion/httpwebrequest_protocolversion.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Httpwebrequest_proxy/VB/httpwebrequest_proxy.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Proxy/httpwebrequest_proxy.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Httpwebrequest_proxy/VB/httpwebrequest_proxy.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Proxy/httpwebrequest_proxy.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Referer/VB/httpwebrequest_referer.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Referer/httpwebrequest_referer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Referer/VB/httpwebrequest_referer.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Referer/httpwebrequest_referer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_SendChunked/VB/httpwebrequest_sendchunked.vb b/snippets/visualbasic/System.Net/HttpWebRequest/SendChunked/httpwebrequest_sendchunked.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_SendChunked/VB/httpwebrequest_sendchunked.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/SendChunked/httpwebrequest_sendchunked.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb b/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Timeout/VB/httpwebrequest_timeout.vb b/snippets/visualbasic/System.Net/HttpWebRequest/Timeout/httpwebrequest_timeout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Timeout/VB/httpwebrequest_timeout.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/Timeout/httpwebrequest_timeout.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_UserAgent/VB/httpwebrequest_useragent.vb b/snippets/visualbasic/System.Net/HttpWebRequest/UserAgent/httpwebrequest_useragent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_UserAgent/VB/httpwebrequest_useragent.vb
rename to snippets/visualbasic/System.Net/HttpWebRequest/UserAgent/httpwebrequest_useragent.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ContentEncoding_CharacterSet/VB/source.vb b/snippets/visualbasic/System.Net/HttpWebResponse/CharacterSet/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ContentEncoding_CharacterSet/VB/source.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/CharacterSet/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Close/VB/httpwebresponse_close.vb b/snippets/visualbasic/System.Net/HttpWebResponse/Close/httpwebresponse_close.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Close/VB/httpwebresponse_close.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/Close/httpwebresponse_close.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_GetResponseHeader/VB/httpwebresponse_getresponseheader.vb b/snippets/visualbasic/System.Net/HttpWebResponse/GetResponseHeader/httpwebresponse_getresponseheader.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_GetResponseHeader/VB/httpwebresponse_getresponseheader.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/GetResponseHeader/httpwebresponse_getresponseheader.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_GetResponseStream/VB/httpwebresponse_getresponsestream.vb b/snippets/visualbasic/System.Net/HttpWebResponse/GetResponseStream/httpwebresponse_getresponsestream.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_GetResponseStream/VB/httpwebresponse_getresponsestream.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/GetResponseStream/httpwebresponse_getresponsestream.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Headers/VB/httpwebresponse_headers.vb b/snippets/visualbasic/System.Net/HttpWebResponse/Headers/httpwebresponse_headers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Headers/VB/httpwebresponse_headers.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/Headers/httpwebresponse_headers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_LastModified/VB/httpwebresponse_lastmodified.vb b/snippets/visualbasic/System.Net/HttpWebResponse/LastModified/httpwebresponse_lastmodified.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_LastModified/VB/httpwebresponse_lastmodified.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/LastModified/httpwebresponse_lastmodified.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Method_Server/VB/httpwebresponse_method_server.vb b/snippets/visualbasic/System.Net/HttpWebResponse/Method/httpwebresponse_method_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Method_Server/VB/httpwebresponse_method_server.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/Method/httpwebresponse_method_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebResponse Example/VB/source.vb b/snippets/visualbasic/System.Net/HttpWebResponse/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebResponse Example/VB/source.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ProtocolVersion/VB/httpwebresponse_protocolversion.vb b/snippets/visualbasic/System.Net/HttpWebResponse/ProtocolVersion/httpwebresponse_protocolversion.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ProtocolVersion/VB/httpwebresponse_protocolversion.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/ProtocolVersion/httpwebresponse_protocolversion.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ResponseUri/VB/httpwebresponse_responseuri.vb b/snippets/visualbasic/System.Net/HttpWebResponse/ResponseUri/httpwebresponse_responseuri.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ResponseUri/VB/httpwebresponse_responseuri.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/ResponseUri/httpwebresponse_responseuri.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_StatusCode_StatusDescription/VB/httpwebresponse_statuscode_statusdescription.vb b/snippets/visualbasic/System.Net/HttpWebResponse/StatusCode/httpwebresponse_statuscode_statusdescription.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_StatusCode_StatusDescription/VB/httpwebresponse_statuscode_statusdescription.vb
rename to snippets/visualbasic/System.Net/HttpWebResponse/StatusCode/httpwebresponse_statuscode_statusdescription.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic ICertificatePolicy Example/VB/source.vb b/snippets/visualbasic/System.Net/ICertificatePolicy/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic ICertificatePolicy Example/VB/source.vb
rename to snippets/visualbasic/System.Net/ICertificatePolicy/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ICredential/VB/icredential.vb b/snippets/visualbasic/System.Net/ICredentials/Overview/icredential.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ICredential/VB/icredential.vb
rename to snippets/visualbasic/System.Net/ICredentials/Overview/icredential.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_Broadcast_Loopback/VB/ipaddress_broadcast_loopback.vb b/snippets/visualbasic/System.Net/IPAddress/Broadcast/ipaddress_broadcast_loopback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IPAddress_Broadcast_Loopback/VB/ipaddress_broadcast_loopback.vb
rename to snippets/visualbasic/System.Net/IPAddress/Broadcast/ipaddress_broadcast_loopback.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IPv6NoneAnyLoopback/VB/noneanyloopback.vb b/snippets/visualbasic/System.Net/IPAddress/IPv6Any/noneanyloopback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IPv6NoneAnyLoopback/VB/noneanyloopback.vb
rename to snippets/visualbasic/System.Net/IPAddress/IPv6Any/noneanyloopback.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IsLoopback/VB/isloopback.vb b/snippets/visualbasic/System.Net/IPAddress/IsLoopback/isloopback.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IsLoopback/VB/isloopback.vb
rename to snippets/visualbasic/System.Net/IPAddress/IsLoopback/isloopback.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_NetworkToHost/VB/ipaddress_networktohost.vb b/snippets/visualbasic/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IPAddress_NetworkToHost/VB/ipaddress_networktohost.vb
rename to snippets/visualbasic/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_None/VB/ipaddress_none.vb b/snippets/visualbasic/System.Net/IPAddress/None/ipaddress_none.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IPAddress_None/VB/ipaddress_none.vb
rename to snippets/visualbasic/System.Net/IPAddress/None/ipaddress_none.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress/VB/ipaddress.vb b/snippets/visualbasic/System.Net/IPAddress/Overview/ipaddress.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress/VB/ipaddress.vb
rename to snippets/visualbasic/System.Net/IPAddress/Overview/ipaddress.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.Parse/VB/parse.vb b/snippets/visualbasic/System.Net/IPAddress/Parse/parse.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.Parse/VB/parse.vb
rename to snippets/visualbasic/System.Net/IPAddress/Parse/parse.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IPEndPoint_Properties/VB/ipendpoint_properties.vb b/snippets/visualbasic/System.Net/IPEndPoint/.ctor/ipendpoint_properties.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IPEndPoint_Properties/VB/ipendpoint_properties.vb
rename to snippets/visualbasic/System.Net/IPEndPoint/.ctor/ipendpoint_properties.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb b/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb
rename to snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IPHostEntry_AddressList/VB/iphostentry_addresslist.vb b/snippets/visualbasic/System.Net/IPHostEntry/AddressList/iphostentry_addresslist.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IPHostEntry_AddressList/VB/iphostentry_addresslist.vb
rename to snippets/visualbasic/System.Net/IPHostEntry/AddressList/iphostentry_addresslist.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IWebProxy_Interface/VB/iwebproxy_interface.vb b/snippets/visualbasic/System.Net/IWebProxy/Credentials/iwebproxy_interface.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IWebProxy_Interface/VB/iwebproxy_interface.vb
rename to snippets/visualbasic/System.Net/IWebProxy/Credentials/iwebproxy_interface.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_Constructor2/VB/networkcredential_constructor2.vb b/snippets/visualbasic/System.Net/NetworkCredential/.ctor/networkcredential_constructor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_Constructor2/VB/networkcredential_constructor2.vb
rename to snippets/visualbasic/System.Net/NetworkCredential/.ctor/networkcredential_constructor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_UserName_Password_Domain/VB/networkcredential_username_password_domain.vb b/snippets/visualbasic/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_UserName_Password_Domain/VB/networkcredential_username_password_domain.vb
rename to snippets/visualbasic/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_GetCredential/VB/networkcredential_getcredential.vb b/snippets/visualbasic/System.Net/NetworkCredential/GetCredential/networkcredential_getcredential.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_GetCredential/VB/networkcredential_getcredential.vb
rename to snippets/visualbasic/System.Net/NetworkCredential/GetCredential/networkcredential_getcredential.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic WebProxy Example/VB/Project.vbproj b/snippets/visualbasic/System.Net/NetworkCredential/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic WebProxy Example/VB/Project.vbproj
rename to snippets/visualbasic/System.Net/NetworkCredential/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic NetworkCredential Example/VB/source.vb b/snippets/visualbasic/System.Net/NetworkCredential/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic NetworkCredential Example/VB/source.vb
rename to snippets/visualbasic/System.Net/NetworkCredential/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLServicePoint/VB/nclservicepoint.vb b/snippets/visualbasic/System.Net/ServicePoint/ConnectionLeaseTimeout/nclservicepoint.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLServicePoint/VB/nclservicepoint.vb
rename to snippets/visualbasic/System.Net/ServicePoint/ConnectionLeaseTimeout/nclservicepoint.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic ServicePointManager.CertificatePolicy Example/VB/source.vb b/snippets/visualbasic/System.Net/ServicePointManager/CertificatePolicy/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic ServicePointManager.CertificatePolicy Example/VB/source.vb
rename to snippets/visualbasic/System.Net/ServicePointManager/CertificatePolicy/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePointWhidbey/VB/servicepoint.vb b/snippets/visualbasic/System.Net/ServicePointManager/DnsRefreshTimeout/servicepoint.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePointWhidbey/VB/servicepoint.vb
rename to snippets/visualbasic/System.Net/ServicePointManager/DnsRefreshTimeout/servicepoint.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic ServicePoint Example/VB/source.vb b/snippets/visualbasic/System.Net/ServicePointManager/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic ServicePoint Example/VB/source.vb
rename to snippets/visualbasic/System.Net/ServicePointManager/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SocketAddressExample/VB/source.vb b/snippets/visualbasic/System.Net/SocketAddress/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SocketAddressExample/VB/source.vb
rename to snippets/visualbasic/System.Net/SocketAddress/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient/VB/webclient.vb b/snippets/visualbasic/System.Net/WebClient/.ctor/webclient.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient/VB/webclient.vb
rename to snippets/visualbasic/System.Net/WebClient/.ctor/webclient.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_BaseAddress_ResponseHeaders/VB/webclient_baseaddress_responseheaders.vb b/snippets/visualbasic/System.Net/WebClient/BaseAddress/webclient_baseaddress_responseheaders.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_BaseAddress_ResponseHeaders/VB/webclient_baseaddress_responseheaders.vb
rename to snippets/visualbasic/System.Net/WebClient/BaseAddress/webclient_baseaddress_responseheaders.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClientAuthentication/VB/webclientauth.vb b/snippets/visualbasic/System.Net/WebClient/Credentials/webclientauth.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClientAuthentication/VB/webclientauth.vb
rename to snippets/visualbasic/System.Net/WebClient/Credentials/webclientauth.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_DownloadData/VB/webclient_downloaddata.vb b/snippets/visualbasic/System.Net/WebClient/DownloadData/webclient_downloaddata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_DownloadData/VB/webclient_downloaddata.vb
rename to snippets/visualbasic/System.Net/WebClient/DownloadData/webclient_downloaddata.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_DownloadFile/VB/webclient_downloadfile.vb b/snippets/visualbasic/System.Net/WebClient/DownloadFile/webclient_downloadfile.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_DownloadFile/VB/webclient_downloadfile.vb
rename to snippets/visualbasic/System.Net/WebClient/DownloadFile/webclient_downloadfile.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadData_Headers/VB/webclient_uploaddata_headers.vb b/snippets/visualbasic/System.Net/WebClient/Headers/webclient_uploaddata_headers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadData_Headers/VB/webclient_uploaddata_headers.vb
rename to snippets/visualbasic/System.Net/WebClient/Headers/webclient_uploaddata_headers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenRead/VB/webclient_openread.vb b/snippets/visualbasic/System.Net/WebClient/OpenRead/webclient_openread.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenRead/VB/webclient_openread.vb
rename to snippets/visualbasic/System.Net/WebClient/OpenRead/webclient_openread.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenWrite/VB/webclient_openwrite.vb b/snippets/visualbasic/System.Net/WebClient/OpenWrite/webclient_openwrite.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenWrite/VB/webclient_openwrite.vb
rename to snippets/visualbasic/System.Net/WebClient/OpenWrite/webclient_openwrite.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenWrite2/VB/webclient_openwrite2.vb b/snippets/visualbasic/System.Net/WebClient/OpenWrite/webclient_openwrite2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenWrite2/VB/webclient_openwrite2.vb
rename to snippets/visualbasic/System.Net/WebClient/OpenWrite/webclient_openwrite2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpVersion_Version10/VB/Project.vbproj b/snippets/visualbasic/System.Net/WebClient/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpVersion_Version10/VB/Project.vbproj
rename to snippets/visualbasic/System.Net/WebClient/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientUserAgent/VB/useragent.vb b/snippets/visualbasic/System.Net/WebClient/Overview/useragent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientUserAgent/VB/useragent.vb
rename to snippets/visualbasic/System.Net/WebClient/Overview/useragent.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_QueryString/VB/webclient_querystring.vb b/snippets/visualbasic/System.Net/WebClient/QueryString/webclient_querystring.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_QueryString/VB/webclient_querystring.vb
rename to snippets/visualbasic/System.Net/WebClient/QueryString/webclient_querystring.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadData2/VB/webclient_uploaddata2.vb b/snippets/visualbasic/System.Net/WebClient/UploadData/webclient_uploaddata2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadData2/VB/webclient_uploaddata2.vb
rename to snippets/visualbasic/System.Net/WebClient/UploadData/webclient_uploaddata2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadFile/VB/webclient_uploadfile.vb b/snippets/visualbasic/System.Net/WebClient/UploadFile/webclient_uploadfile.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadFile/VB/webclient_uploadfile.vb
rename to snippets/visualbasic/System.Net/WebClient/UploadFile/webclient_uploadfile.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadFile2/VB/webclient_uploadfile2.vb b/snippets/visualbasic/System.Net/WebClient/UploadFile/webclient_uploadfile2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadFile2/VB/webclient_uploadfile2.vb
rename to snippets/visualbasic/System.Net/WebClient/UploadFile/webclient_uploadfile2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UploadValues/VB/webclient_uploadvalues.vb b/snippets/visualbasic/System.Net/WebClient/UploadValues/webclient_uploadvalues.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_UploadValues/VB/webclient_uploadvalues.vb
rename to snippets/visualbasic/System.Net/WebClient/UploadValues/webclient_uploadvalues.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UploadValues2/VB/webclient_uploadvalues2.vb b/snippets/visualbasic/System.Net/WebClient/UploadValues/webclient_uploadvalues2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebClient_UploadValues2/VB/webclient_uploadvalues2.vb
rename to snippets/visualbasic/System.Net/WebClient/UploadValues/webclient_uploadvalues2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor1/VB/webexception_constructor1.vb b/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor1/VB/webexception_constructor1.vb
rename to snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor2/VB/webexception_constructor2.vb b/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor2/VB/webexception_constructor2.vb
rename to snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor3/VB/webexception_constructor3.vb b/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor3/VB/webexception_constructor3.vb
rename to snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor4/VB/webexception_constructor4.vb b/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor4/VB/webexception_constructor4.vb
rename to snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor4.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor5/VB/webexception_constructor5.vb b/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor5/VB/webexception_constructor5.vb
rename to snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor5.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebException_Status_Response/VB/webexception_status_response.vb b/snippets/visualbasic/System.Net/WebException/Response/webexception_status_response.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebException_Status_Response/VB/webexception_status_response.vb
rename to snippets/visualbasic/System.Net/WebException/Response/webexception_status_response.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Add/VB/webheadercollection_add.vb b/snippets/visualbasic/System.Net/WebHeaderCollection/Add/webheadercollection_add.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Add/VB/webheadercollection_add.vb
rename to snippets/visualbasic/System.Net/WebHeaderCollection/Add/webheadercollection_add.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_GetValues_1/VB/webheadercollection_getvalues_1.vb b/snippets/visualbasic/System.Net/WebHeaderCollection/GetValues/webheadercollection_getvalues_1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_GetValues_1/VB/webheadercollection_getvalues_1.vb
rename to snippets/visualbasic/System.Net/WebHeaderCollection/GetValues/webheadercollection_getvalues_1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_IsRestricted/VB/webheadercollection_isrestricted.vb b/snippets/visualbasic/System.Net/WebHeaderCollection/IsRestricted/webheadercollection_isrestricted.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_IsRestricted/VB/webheadercollection_isrestricted.vb
rename to snippets/visualbasic/System.Net/WebHeaderCollection/IsRestricted/webheadercollection_isrestricted.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Remove/VB/webheadercollection_remove.vb b/snippets/visualbasic/System.Net/WebHeaderCollection/Remove/webheadercollection_remove.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Remove/VB/webheadercollection_remove.vb
rename to snippets/visualbasic/System.Net/WebHeaderCollection/Remove/webheadercollection_remove.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Set/VB/webheadercollection_set.vb b/snippets/visualbasic/System.Net/WebHeaderCollection/Set/webheadercollection_set.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Set/VB/webheadercollection_set.vb
rename to snippets/visualbasic/System.Net/WebHeaderCollection/Set/webheadercollection_set.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientUserAgent/VB/Project.vbproj b/snippets/visualbasic/System.Net/WebProxy/Overview/Project.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientUserAgent/VB/Project.vbproj
rename to snippets/visualbasic/System.Net/WebProxy/Overview/Project.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic WebProxy Example/VB/source.vb b/snippets/visualbasic/System.Net/WebProxy/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic WebProxy Example/VB/source.vb
rename to snippets/visualbasic/System.Net/WebProxy/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic WebRequest.WebRequest Example/VB/source.vb b/snippets/visualbasic/System.Net/WebRequest/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic WebRequest.WebRequest Example/VB/source.vb
rename to snippets/visualbasic/System.Net/WebRequest/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_BeginGetRequest/VB/webrequest_begingetrequest.vb b/snippets/visualbasic/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebRequest_BeginGetRequest/VB/webrequest_begingetrequest.vb
rename to snippets/visualbasic/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_ContentType/VB/webrequest_contenttype.vb b/snippets/visualbasic/System.Net/WebRequest/ContentLength/webrequest_contenttype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebRequest_ContentType/VB/webrequest_contenttype.vb
rename to snippets/visualbasic/System.Net/WebRequest/ContentLength/webrequest_contenttype.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Create/VB/webrequest_create.vb b/snippets/visualbasic/System.Net/WebRequest/Create/webrequest_create.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Create/VB/webrequest_create.vb
rename to snippets/visualbasic/System.Net/WebRequest/Create/webrequest_create.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ResponseUri/VB/webresponse_responseuri.vb b/snippets/visualbasic/System.Net/WebRequest/Create/webresponse_responseuri.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ResponseUri/VB/webresponse_responseuri.vb
rename to snippets/visualbasic/System.Net/WebRequest/Create/webresponse_responseuri.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Timeout/VB/webrequest_timeout.vb b/snippets/visualbasic/System.Net/WebRequest/GetResponse/webrequest_timeout.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Timeout/VB/webrequest_timeout.vb
rename to snippets/visualbasic/System.Net/WebRequest/GetResponse/webrequest_timeout.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Headers/VB/webrequest_headers.vb b/snippets/visualbasic/System.Net/WebRequest/Headers/webrequest_headers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Headers/VB/webrequest_headers.vb
rename to snippets/visualbasic/System.Net/WebRequest/Headers/webrequest_headers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLWebRequestSimple/VB/webrequestget.vb b/snippets/visualbasic/System.Net/WebRequest/Overview/webrequestget.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLWebRequestSimple/VB/webrequestget.vb
rename to snippets/visualbasic/System.Net/WebRequest/Overview/webrequestget.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Proxy/VB/webrequest_proxy.vb b/snippets/visualbasic/System.Net/WebRequest/Proxy/webrequest_proxy.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Proxy/VB/webrequest_proxy.vb
rename to snippets/visualbasic/System.Net/WebRequest/Proxy/webrequest_proxy.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_RequestUri1/VB/webrequest_requesturi.vb b/snippets/visualbasic/System.Net/WebRequest/RequestUri/webrequest_requesturi.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebRequest_RequestUri1/VB/webrequest_requesturi.vb
rename to snippets/visualbasic/System.Net/WebRequest/RequestUri/webrequest_requesturi.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_Close/VB/webresponse_close.vb b/snippets/visualbasic/System.Net/WebResponse/Close/webresponse_close.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebResponse_Close/VB/webresponse_close.vb
rename to snippets/visualbasic/System.Net/WebResponse/Close/webresponse_close.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ContentLength_Type/VB/webresponse_contentlength_type.vb b/snippets/visualbasic/System.Net/WebResponse/ContentLength/webresponse_contentlength_type.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ContentLength_Type/VB/webresponse_contentlength_type.vb
rename to snippets/visualbasic/System.Net/WebResponse/ContentLength/webresponse_contentlength_type.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_GetResponseStream/VB/Project.vbproj b/snippets/visualbasic/System.Net/WebResponse/GetResponseStream/Project.vbproj
similarity index 95%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebResponse_GetResponseStream/VB/Project.vbproj
rename to snippets/visualbasic/System.Net/WebResponse/GetResponseStream/Project.vbproj
index ddb344e65f4..41f1d5ad4b2 100644
--- a/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_GetResponseStream/VB/Project.vbproj
+++ b/snippets/visualbasic/System.Net/WebResponse/GetResponseStream/Project.vbproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_GetResponseStream/VB/webresponse_getresponsestream.vb b/snippets/visualbasic/System.Net/WebResponse/GetResponseStream/webresponse_getresponsestream.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebResponse_GetResponseStream/VB/webresponse_getresponsestream.vb
rename to snippets/visualbasic/System.Net/WebResponse/GetResponseStream/webresponse_getresponsestream.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_Headers/VB/webresponse_headers.vb b/snippets/visualbasic/System.Net/WebResponse/Headers/webresponse_headers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebResponse_Headers/VB/webresponse_headers.vb
rename to snippets/visualbasic/System.Net/WebResponse/Headers/webresponse_headers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic WebRequest Example/VB/source.vb b/snippets/visualbasic/System.Net/WebResponse/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic WebRequest Example/VB/source.vb
rename to snippets/visualbasic/System.Net/WebResponse/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.GetUrlsFromUri/VB/class1.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels.Http/HttpServerChannel/GetUrlsForUri/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.GetUrlsFromUri/VB/class1.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels.Http/HttpServerChannel/GetUrlsForUri/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/.ctor/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/.ctor/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation/VB/server.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/.ctor/server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation/VB/server.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/.ctor/server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TcpChannel.GetUrlsForUri/VB/class1.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/GetUrlsForUri/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TcpChannel.GetUrlsForUri/VB/class1.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/GetUrlsForUri/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TcpChannel.GetUrlsForUri/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/GetUrlsForUri/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TcpChannel.GetUrlsForUri/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/GetUrlsForUri/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TcpServerChannel.GetUrlsForUri/VB/class1.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel/GetUrlsForUri/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TcpServerChannel.GetUrlsForUri/VB/class1.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel/GetUrlsForUri/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TcpServerChannel.GetUrlsForUri/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel/GetUrlsForUri/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TcpServerChannel.GetUrlsForUri/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel/GetUrlsForUri/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/commontransportkeys.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/commontransportkeys.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/VB/soapclientformattersinkprovider_customprovider.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/VB/soapclientformattersinkprovider_customprovider.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_GetChannel/VB/channelservices_getchannel_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/channelservices_getchannel_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_GetChannel/VB/channelservices_getchannel_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/channelservices_getchannel_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_GetChannel/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_GetChannel/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/channelservices_registeredchannels_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/channelservices_registeredchannels_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/channelservices_registeredchannels_server.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/channelservices_registeredchannels_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/RegisterChannel/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpChannel/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/RegisterChannel/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel/VB/server.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/RegisterChannel/server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpChannel/VB/server.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/RegisterChannel/server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/VB/channelservices_syncdispatchmessage_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/VB/channelservices_syncdispatchmessage_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpclientchannel_6_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpclientchannel_6_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpclientchannel_6_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpclientchannel_6_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpserverchannel_9_server.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpserverchannel_9_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpserverchannel_9_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpserverchannel_9_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IChannelDataStore_Item/VB/ichanneldatastore.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelDataStore/Overview/ichanneldatastore.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IChannelDataStore_Item/VB/ichanneldatastore.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelDataStore/Overview/ichanneldatastore.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/VB/ichannelreceiver_channeldata_server.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/VB/ichannelreceiver_channeldata_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.AddHookChannelUri/VB/class1.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/AddHookChannelUri/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.AddHookChannelUri/VB/class1.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/AddHookChannelUri/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.ChannelSinkChain/VB/class1.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/ChannelSinkChain/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.ChannelSinkChain/VB/class1.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/ChannelSinkChain/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiverHook_ChannelScheme/VB/ichannelreceiverhook_channelscheme.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/Overview/ichannelreceiverhook_channelscheme.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiverHook_ChannelScheme/VB/ichannelreceiverhook_channelscheme.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/Overview/ichannelreceiverhook_channelscheme.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IChannelSender/VB/ichannelsender_2_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelSender/Overview/ichannelsender_2_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IChannelSender/VB/ichannelsender_2_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelSender/Overview/ichannelsender_2_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IChannelSender/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelSender/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IChannelSender/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelSender/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_Next_Create/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/CreateSink/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_Next_Create/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/CreateSink/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_Next_Create/VB/soapclientformattersinkprovider_customprovider.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/CreateSink/soapclientformattersinkprovider_customprovider.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_Next_Create/VB/soapclientformattersinkprovider_customprovider.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/CreateSink/soapclientformattersinkprovider_customprovider.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IServerChannelSinkProvider_CreateSink/VB/iserverchannelsinkprovider_3.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/GetChannelData/iserverchannelsinkprovider_3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IServerChannelSinkProvider_CreateSink/VB/iserverchannelsinkprovider_3.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/GetChannelData/iserverchannelsinkprovider_3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SinkProviders/VB/source.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/Next/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SinkProviders/VB/source.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/Next/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ITransportHeaders_Item/VB/itransportheaders_3_server.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ITransportHeaders_Item/VB/itransportheaders_3_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ITransportHeaders_Item/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ITransportHeaders_Item/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServerProcessing_LoggingSinks_Create/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/ServerProcessing/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServerProcessing_LoggingSinks_Create/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ServerProcessing/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServerProcessing_LoggingSinks_Create/VB/serverprocessing_loggingsinks.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/ServerProcessing/Overview/serverprocessing_loggingsinks.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServerProcessing_LoggingSinks_Create/VB/serverprocessing_loggingsinks.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/ServerProcessing/Overview/serverprocessing_loggingsinks.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SinkProviderData/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Channels/SinkProviderData/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SinkProviderData/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/SinkProviderData/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SinkProviderData/VB/sinkproviderdata_ipfiltersink.vb b/snippets/visualbasic/System.Runtime.Remoting.Channels/SinkProviderData/Overview/sinkproviderdata_ipfiltersink.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SinkProviderData/VB/sinkproviderdata_ipfiltersink.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Channels/SinkProviderData/Overview/sinkproviderdata_ipfiltersink.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ISponsor_Client/VB/isponsor_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ISponsor/Overview/isponsor_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ISponsor_Client/VB/isponsor_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/ISponsor/Overview/isponsor_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ISponsor_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ISponsor/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ISponsor_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/ISponsor/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.Lifetime/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.Lifetime/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.Lifetime/VB/server.vb b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/Overview/server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.Lifetime/VB/server.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/Overview/server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ILease_ILease/VB/ilease_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/ilease_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ILease_ILease/VB/ilease_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/ilease_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ILease_ILease/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ILease_ILease/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/callcontext_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/callcontext_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/callcontext_share.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_share.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/callcontext_share.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_share.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/client.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/service.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/service.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/service.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/service.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IMessageSink_Client/VB/imessagesink_client.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMessage/Properties/imessagesink_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IMessageSink_Client/VB/imessagesink_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/IMessage/Properties/imessagesink_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IMessageSink_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMessage/Properties/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IMessageSink_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/IMessage/Properties/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/VB/imethodcallmessage.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/VB/imethodcallmessage.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_LogicalCallContext/VB/imethodmessage_logicalcallcontext.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/LogicalCallContext/imethodmessage_logicalcallcontext.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_LogicalCallContext/VB/imethodmessage_logicalcallcontext.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/LogicalCallContext/imethodmessage_logicalcallcontext.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_MethodName/VB/imethodmessage_methodname.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_MethodName/VB/imethodmessage_methodname.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_Exception/VB/imethodreturnmessage_exception.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Exception/imethodreturnmessage_exception.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_Exception/VB/imethodreturnmessage_exception.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Exception/imethodreturnmessage_exception.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/VB/imethodreturnmessage_returnvalue.vb b/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/VB/imethodreturnmessage_returnvalue.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributes1/VB/s.vb b/snippets/visualbasic/System.Runtime.Remoting.Metadata/SoapFieldAttribute/Overview/s.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapAttributes1/VB/s.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Metadata/SoapFieldAttribute/Overview/s.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertCodeSourceFileToAssemblyFile/VB/source.vb b/snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertCodeSourceFileToAssemblyFile/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertCodeSourceFileToAssemblyFile/VB/source.vb
rename to snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertCodeSourceFileToAssemblyFile/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToFile/VB/source.vb b/snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToFile/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToFile/VB/source.vb
rename to snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToFile/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToStream/VB/source.vb b/snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToStream/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToStream/VB/source.vb
rename to snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToStream/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb b/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RealProxy_Sample/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RealProxy_Sample/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RealProxy_Sample/VB/realproxy_sample.vb b/snippets/visualbasic/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RealProxy_Sample/VB/realproxy_sample.vb
rename to snippets/visualbasic/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_client.vb b/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_server.vb b/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_share.vb b/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_share.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_share.vb
rename to snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_share.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ActivatedServiceTypeEntry_ObjectType_Client/VB/activatedservicetypeentry_objecttype_server.vb b/snippets/visualbasic/System.Runtime.Remoting/ActivatedServiceTypeEntry/Overview/activatedservicetypeentry_objecttype_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ActivatedServiceTypeEntry_ObjectType_Client/VB/activatedservicetypeentry_objecttype_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting/ActivatedServiceTypeEntry/Overview/activatedservicetypeentry_objecttype_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ActivatedServiceTypeEntry_ObjectType_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/ActivatedServiceTypeEntry/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ActivatedServiceTypeEntry_ObjectType_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/ActivatedServiceTypeEntry/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Remoting.ObjRef/VB/client.vb b/snippets/visualbasic/System.Runtime.Remoting/IRemotingTypeInfo/Overview/client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Remoting.ObjRef/VB/client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/IRemotingTypeInfo/Overview/client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Remoting.ObjRef/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/IRemotingTypeInfo/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Remoting.ObjRef/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/IRemotingTypeInfo/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/CreateObjRef2/VB/example.vb b/snippets/visualbasic/System.Runtime.Remoting/ObjRef/Overview/example.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/CreateObjRef2/VB/example.vb
rename to snippets/visualbasic/System.Runtime.Remoting/ObjRef/Overview/example.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ObjectHandle/VB/objecthandleassembly.vb b/snippets/visualbasic/System.Runtime.Remoting/ObjectHandle/Overview/objecthandleassembly.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ObjectHandle/VB/objecthandleassembly.vb
rename to snippets/visualbasic/System.Runtime.Remoting/ObjectHandle/Overview/objecthandleassembly.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/server.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/server.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/service.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/service.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/service.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/service.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/Configure/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/Configure/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/VB/remotingconfiguration_configure_server.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/Configure/remotingconfiguration_configure_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/VB/remotingconfiguration_configure_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/Configure/remotingconfiguration_configure_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/VB/remotingconfiguration_getregisteredactivatedservice_server.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/remotingconfiguration_getregisteredactivatedservice_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/VB/remotingconfiguration_getregisteredactivatedservice_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/remotingconfiguration_getregisteredactivatedservice_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredWellKnownClient_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredWellKnownClientTypes/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredWellKnownClient_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredWellKnownClientTypes/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredWellKnownClient_Client/VB/remotingconfiguration_getregisteredwellknownclient_client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredWellKnownClientTypes/remotingconfiguration_getregisteredwellknownclient_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredWellKnownClient_Client/VB/remotingconfiguration_getregisteredwellknownclient_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredWellKnownClientTypes/remotingconfiguration_getregisteredwellknownclient_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType1_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType1_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType2_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/makefile1
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType2_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/makefile1
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType1_Client/VB/remotingconfiguration_isremotelyactivatedclienttype1_client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype1_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType1_Client/VB/remotingconfiguration_isremotelyactivatedclienttype1_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype1_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType2_Client/VB/remotingconfiguration_isremotelyactivatedclienttype2_client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype2_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType2_Client/VB/remotingconfiguration_isremotelyactivatedclienttype2_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype2_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType1_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType1_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType2_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/makefile1
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType2_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/makefile1
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType1_Client/VB/remotingconfiguration_iswellknownclienttype1_client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype1_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType1_Client/VB/remotingconfiguration_iswellknownclienttype1_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype1_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType2_Client/VB/remotingconfiguration_iswellknownclienttype2_client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype2_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType2_Client/VB/remotingconfiguration_iswellknownclienttype2_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype2_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/server.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/server.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/service.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/service.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/service.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/service.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/basicclient.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/basicclient.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/basicclient.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/basicclient.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/manualserver.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/manualserver.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/manualserver.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/manualserver.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/ExecuteMessage/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/ExecuteMessage/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/VB/serviceclass.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/ExecuteMessage/serviceclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/VB/serviceclass.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/ExecuteMessage/serviceclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerclient.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerclient.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerclient.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerclient.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerserver.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerserver.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerserver.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerserver.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerservice.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerservice.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerservice.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerservice.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.GetObjRefForProxy/VB/client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjRefForProxy/client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.GetObjRefForProxy/VB/client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjRefForProxy/client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.GetObjRefForProxy/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjRefForProxy/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.GetObjRefForProxy/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjRefForProxy/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/VB/remotingservicessample.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/VB/remotingservicessample.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices IsObject Snippets/VB/class1.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsObjectOutOfAppDomain/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices IsObject Snippets/VB/class1.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsObjectOutOfAppDomain/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.Unmarshal/VB/client.vb b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Unmarshal/client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.Unmarshal/VB/client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Unmarshal/client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.Unmarshal/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Unmarshal/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.Unmarshal/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Unmarshal/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WellKnownClientTypeEntry_Client/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/WellKnownClientTypeEntry/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WellKnownClientTypeEntry_Client/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/WellKnownClientTypeEntry/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WellKnownClientTypeEntry_Client/VB/wellknownclienttypeentry_client.vb b/snippets/visualbasic/System.Runtime.Remoting/WellKnownClientTypeEntry/Overview/wellknownclienttypeentry_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WellKnownClientTypeEntry_Client/VB/wellknownclienttypeentry_client.vb
rename to snippets/visualbasic/System.Runtime.Remoting/WellKnownClientTypeEntry/Overview/wellknownclienttypeentry_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WellKnownServiceTypeEntry_Server/VB/makefile b/snippets/visualbasic/System.Runtime.Remoting/WellKnownServiceTypeEntry/Overview/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WellKnownServiceTypeEntry_Server/VB/makefile
rename to snippets/visualbasic/System.Runtime.Remoting/WellKnownServiceTypeEntry/Overview/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WellKnownServiceTypeEntry_Server/VB/wellknownservicetypeentry_server.vb b/snippets/visualbasic/System.Runtime.Remoting/WellKnownServiceTypeEntry/Overview/wellknownservicetypeentry_server.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WellKnownServiceTypeEntry_Server/VB/wellknownservicetypeentry_server.vb
rename to snippets/visualbasic/System.Runtime.Remoting/WellKnownServiceTypeEntry/Overview/wellknownservicetypeentry_server.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapFormatter Example/VB/soapformatter.vb b/snippets/visualbasic/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapFormatter Example/VB/soapformatter.vb
rename to snippets/visualbasic/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SerializationInfo.GetValue Example/VB/source.vb b/snippets/visualbasic/System.Runtime.Serialization/SerializationInfo/GetValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SerializationInfo.GetValue Example/VB/source.vb
rename to snippets/visualbasic/System.Runtime.Serialization/SerializationInfo/GetValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/ScopeWithSQL.vb b/snippets/visualbasic/System.Transactions/TransactionScope/Overview/ScopeWithSQL.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/ScopeWithSQL.vb
rename to snippets/visualbasic/System.Transactions/TransactionScope/Overview/ScopeWithSQL.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb b/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/bindingcollectionsample2.vb b/snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/bindingcollectionsample2.vb
rename to snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/makefile b/snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/makefile
rename to snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample1/VB/bindingcollectionsample1.vb b/snippets/visualbasic/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample1/VB/bindingcollectionsample1.vb
rename to snippets/visualbasic/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample3/VB/bindingcollectionsample3.vb b/snippets/visualbasic/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample3/VB/bindingcollectionsample3.vb
rename to snippets/visualbasic/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DocumentableItemsample/VB/MathService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/DocumentableItem/Documentation/MathService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DocumentableItemsample/VB/MathService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/DocumentableItem/Documentation/MathService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DocumentableItemsample/VB/documentableitemsample.vb b/snippets/visualbasic/System.Web.Services.Description/DocumentableItem/Documentation/documentableitemsample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DocumentableItemsample/VB/documentableitemsample.vb
rename to snippets/visualbasic/System.Web.Services.Description/DocumentableItem/Documentation/documentableitemsample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Add/VB/faultbindingcollection_add.vb b/snippets/visualbasic/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Add/VB/faultbindingcollection_add.vb
rename to snippets/visualbasic/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Remove/VB/faultbindingcollection_remove.vb b/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Remove/VB/faultbindingcollection_remove.vb
rename to snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Item/VB/faultbindingcollection_item.vb b/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Item/faultbindingcollection_item.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Item/VB/faultbindingcollection_item.vb
rename to snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Item/faultbindingcollection_item.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/StockQuoteService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/StockQuoteService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/StockQuoteService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/StockQuoteService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/StockQuote_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/StockQuote_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/StockQuote_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/StockQuote_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/StockQuote_vb.xsd b/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/StockQuote_vb.xsd
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/StockQuote_vb.xsd
rename to snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/StockQuote_vb.xsd
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb b/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb
rename to snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/WebServices_HttpBinding/VB/httpbinding.vb b/snippets/visualbasic/System.Web.Services.Description/HttpAddressBinding/Overview/httpbinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/WebServices_HttpBinding/VB/httpbinding.vb
rename to snippets/visualbasic/System.Web.Services.Description/HttpAddressBinding/Overview/httpbinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/HttpBinding_ctor_Client.vb.aspx b/snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/HttpBinding_ctor_Client.vb.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/HttpBinding_ctor_Client.vb.aspx
rename to snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/HttpBinding_ctor_Client.vb.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/HttpBinding_ctor_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/HttpBinding_ctor_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/HttpBinding_ctor_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/HttpBinding_ctor_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/HttpBinding_ctor_Service.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/HttpBinding_ctor_Service.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/HttpBinding_ctor_Service.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/HttpBinding_ctor_Service.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/httpbinding_ctor.vb b/snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/httpbinding_ctor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/httpbinding_ctor.vb
rename to snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/httpbinding_ctor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/StockQuoteService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/StockQuoteService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/StockQuoteService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/StockQuoteService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb b/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb
rename to snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/MathService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/MathService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/MathService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/MathService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/MathService_input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/MathService_input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/MathService_input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/MathService_input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb b/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb
rename to snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/mathserviceclient.vb.aspx b/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/mathserviceclient.vb.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/mathserviceclient.vb.aspx
rename to snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/mathserviceclient.vb.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Message_Samples3/VB/MathService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/Message/FindPartByName/MathService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Message_Samples3/VB/MathService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Message/FindPartByName/MathService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Message_Samples3/VB/message_samples3.vb b/snippets/visualbasic/System.Web.Services.Description/Message/FindPartByName/message_samples3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Message_Samples3/VB/message_samples3.vb
rename to snippets/visualbasic/System.Web.Services.Description/Message/FindPartByName/message_samples3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageBinding_sample/VB/messagebinding_sample.vb b/snippets/visualbasic/System.Web.Services.Description/MessageBinding/Overview/messagebinding_sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageBinding_sample/VB/messagebinding_sample.vb
rename to snippets/visualbasic/System.Web.Services.Description/MessageBinding/Overview/messagebinding_sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb b/snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb
rename to snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb b/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb
rename to snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeContentBinding_Part_4/VB/MimeContentSample_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimeContentBinding/Overview/MimeContentSample_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeContentBinding_Part_4/VB/MimeContentSample_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimeContentBinding/Overview/MimeContentSample_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeContentBinding_Part_4/VB/mimecontentbinding_part_4.vb b/snippets/visualbasic/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeContentBinding_Part_4/VB/mimecontentbinding_part_4.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeMultiPartRelatedBinding_Parts_2/VB/MimeMultiPartRelatedSample_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimeMultipartRelatedBinding/Overview/MimeMultiPartRelatedSample_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeMultiPartRelatedBinding_Parts_2/VB/MimeMultiPartRelatedSample_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimeMultipartRelatedBinding/Overview/MimeMultiPartRelatedSample_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeMultiPartRelatedBinding_Parts_2/VB/mimemultipartrelatedbinding_parts_2.vb b/snippets/visualbasic/System.Web.Services.Description/MimeMultipartRelatedBinding/Overview/mimemultipartrelatedbinding_parts_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeMultiPartRelatedBinding_Parts_2/VB/mimemultipartrelatedbinding_parts_2.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimeMultipartRelatedBinding/Overview/mimemultipartrelatedbinding_parts_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimePart_3/VB/MimePart_3_Input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimePart/Overview/MimePart_3_Input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimePart_3/VB/MimePart_3_Input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimePart/Overview/MimePart_3_Input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimePart_3/VB/mimepart_3.vb b/snippets/visualbasic/System.Web.Services.Description/MimePart/Overview/mimepart_3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimePart_3/VB/mimepart_3.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimePart/Overview/mimepart_3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/MimePartCollection_8_Input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/MimePartCollection_8_Input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/MimePartCollection_8_Input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/MimePartCollection_8_Input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb b/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_1/VB/MimePartCollection_1_Input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Overview/MimePartCollection_1_Input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_1/VB/MimePartCollection_1_Input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Overview/MimePartCollection_1_Input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_1/VB/mimepartcollection_1.vb b/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Overview/mimepartcollection_1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_1/VB/mimepartcollection_1.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Overview/mimepartcollection_1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/MimeText_Binding_MatchService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/MimeText_Binding_MatchService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/MimeText_Binding_MatchService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/MimeText_Binding_MatchService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/MimeText_Binding_Match_8_Input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/MimeText_Binding_Match_8_Input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/MimeText_Binding_Match_8_Input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/MimeText_Binding_Match_8_Input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb b/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/MimeTextMatchService.VB.asmx b/snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/MimeTextMatchService.VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/MimeTextMatchService.VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/MimeTextMatchService.VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/MimeTextMatch_5_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/MimeTextMatch_5_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/MimeTextMatch_5_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/MimeTextMatch_5_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/mimetextmatch_5.vb b/snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/mimetextmatch_5.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/MimeText_Match_MatchCollService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/MimeText_Match_MatchCollService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/MimeText_Match_MatchCollService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/MimeText_Match_MatchCollService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/MimeText_Match_MatchColl_9_Input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/MimeText_Match_MatchColl_9_Input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/MimeText_Match_MatchColl_9_Input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/MimeText_Match_MatchColl_9_Input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb b/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeXmlBinding_Part_3/VB/MimeXmlBinding_Part_3_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/MimeXmlBinding/Overview/MimeXmlBinding_Part_3_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeXmlBinding_Part_3/VB/MimeXmlBinding_Part_3_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/MimeXmlBinding/Overview/MimeXmlBinding_Part_3_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeXmlBinding_Part_3/VB/MimeXmlBinding_Part_3_Service.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/MimeXmlBinding/Overview/MimeXmlBinding_Part_3_Service.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeXmlBinding_Part_3/VB/MimeXmlBinding_Part_3_Service.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/MimeXmlBinding/Overview/MimeXmlBinding_Part_3_Service.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MimeXmlBinding_Part_3/VB/mimexmlbinding_part_3.vb b/snippets/visualbasic/System.Web.Services.Description/MimeXmlBinding/Overview/mimexmlbinding_part_3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MimeXmlBinding_Part_3/VB/mimexmlbinding_part_3.vb
rename to snippets/visualbasic/System.Web.Services.Description/MimeXmlBinding/Overview/mimexmlbinding_part_3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_Faults/VB/Operation_Faults_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/Operation/Faults/Operation_Faults_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_Faults/VB/Operation_Faults_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Operation/Faults/Operation_Faults_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_Faults/VB/operation_faults.vb b/snippets/visualbasic/System.Web.Services.Description/Operation/Faults/operation_faults.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_Faults/VB/operation_faults.vb
rename to snippets/visualbasic/System.Web.Services.Description/Operation/Faults/operation_faults.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_IsBoundBy/VB/Operation_IsBoundBy_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/Operation/IsBoundBy/Operation_IsBoundBy_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_IsBoundBy/VB/Operation_IsBoundBy_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Operation/IsBoundBy/Operation_IsBoundBy_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_IsBoundBy/VB/Operation_IsBoundBy_Service.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/Operation/IsBoundBy/Operation_IsBoundBy_Service.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_IsBoundBy/VB/Operation_IsBoundBy_Service.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/Operation/IsBoundBy/Operation_IsBoundBy_Service.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_IsBoundBy/VB/operation_isboundby.vb b/snippets/visualbasic/System.Web.Services.Description/Operation/IsBoundBy/operation_isboundby.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_IsBoundBy/VB/operation_isboundby.vb
rename to snippets/visualbasic/System.Web.Services.Description/Operation/IsBoundBy/operation_isboundby.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/Operation_5_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/Operation/Overview/Operation_5_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/Operation_5_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Operation/Overview/Operation_5_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/Operation_5_Service.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/Operation/Overview/Operation_5_Service.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/Operation_5_Service.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/Operation/Overview/Operation_5_Service.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/operation_5.vb b/snippets/visualbasic/System.Web.Services.Description/Operation/Overview/operation_5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/operation_5.vb
rename to snippets/visualbasic/System.Web.Services.Description/Operation/Overview/operation_5.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/Operation_2_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/Operation_2_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/Operation_2_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/Operation_2_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/Operation_2_Service.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/Operation_2_Service.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/Operation_2_Service.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/Operation_2_Service.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/operation_2.vb b/snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/operation_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/operation_2.vb
rename to snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/operation_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/MathService_input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/MathService_input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/MathService_input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/MathService_input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/operationbinding_operationbinding.vb b/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/operationbinding_operationbinding.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/MathService_input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/MathService_input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/MathService_input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/MathService_input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb b/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/MathService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/MathService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/MathService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/MathService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/MathService_input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/MathService_input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/MathService_input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/MathService_input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb b/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFault_OperationFault/VB/operationfault_operationfault.vb b/snippets/visualbasic/System.Web.Services.Description/OperationFault/Overview/operationfault_operationfault.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFault_OperationFault/VB/operationfault_operationfault.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationFault/Overview/operationfault_operationfault.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Add/VB/stockquote_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationFault/Overview/stockquote_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Add/VB/stockquote_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationFault/Overview/stockquote_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Add/VB/operationfaultcollection_add.vb b/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Add/operationfaultcollection_add.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Add/VB/operationfaultcollection_add.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Add/operationfaultcollection_add.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFault_OperationFault/VB/stockquote_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Add/stockquote_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFault_OperationFault/VB/stockquote_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Add/stockquote_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Item/VB/operationfaultcollection_item.vb b/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Item/operationfaultcollection_item.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Item/VB/operationfaultcollection_item.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Item/operationfaultcollection_item.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Item/VB/stockquote_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Item/stockquote_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Item/VB/stockquote_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Item/stockquote_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb b/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/stockquote_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/stockquote_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/stockquote_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/stockquote_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFlow_Enum/VB/MathService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationFlow/Overview/MathService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFlow_Enum/VB/MathService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationFlow/Overview/MathService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFlow_Enum/VB/MathService_input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationFlow/Overview/MathService_input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFlow_Enum/VB/MathService_input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationFlow/Overview/MathService_input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationFlow_Enum/VB/operationflow_enum.vb b/snippets/visualbasic/System.Web.Services.Description/OperationFlow/Overview/operationflow_enum.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationFlow_Enum/VB/operationflow_enum.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationFlow/Overview/operationflow_enum.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationInput_OperationInput/VB/AddNumbersIn_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationInput/Overview/AddNumbersIn_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationInput_OperationInput/VB/AddNumbersIn_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationInput/Overview/AddNumbersIn_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationInput_OperationInput/VB/Service.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationInput/Overview/Service.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationInput_OperationInput/VB/Service.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationInput/Overview/Service.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationInput_OperationInput/VB/operationinput_operationinput.vb b/snippets/visualbasic/System.Web.Services.Description/OperationInput/Overview/operationinput_operationinput.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationInput_OperationInput/VB/operationinput_operationinput.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationInput/Overview/operationinput_operationinput.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/MathService_input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/MathService_input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/MathService_input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/MathService_input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/operationmessage_properties.vb b/snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/operationmessage_properties.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/operationmessage_properties.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/operationmessage_properties.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/MathService_input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/MathService_input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/MathService_input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/MathService_input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb b/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationOutput_OperationOutput/VB/AddNumbersIn_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/OperationOutput/Overview/AddNumbersIn_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationOutput_OperationOutput/VB/AddNumbersIn_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/OperationOutput/Overview/AddNumbersIn_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationOutput_OperationOutput/VB/Service_vb.asmx b/snippets/visualbasic/System.Web.Services.Description/OperationOutput/Overview/Service_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationOutput_OperationOutput/VB/Service_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/OperationOutput/Overview/Service_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/OperationOutput_OperationOutput/VB/operationoutput_operationoutput.vb b/snippets/visualbasic/System.Web.Services.Description/OperationOutput/Overview/operationoutput_operationoutput.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/OperationOutput_OperationOutput/VB/operationoutput_operationoutput.vb
rename to snippets/visualbasic/System.Web.Services.Description/OperationOutput/Overview/operationoutput_operationoutput.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortClass/VB/AddNumbers.vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/Port/Overview/AddNumbers.vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortClass/VB/AddNumbers.vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Port/Overview/AddNumbers.vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortClass/VB/portclass.vb b/snippets/visualbasic/System.Web.Services.Description/Port/Overview/portclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortClass/VB/portclass.vb
rename to snippets/visualbasic/System.Web.Services.Description/Port/Overview/portclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Add/VB/MathServiceAdd_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortCollection/Add/MathServiceAdd_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Add/VB/MathServiceAdd_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortCollection/Add/MathServiceAdd_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Add/VB/portcollection_add.vb b/snippets/visualbasic/System.Web.Services.Description/PortCollection/Add/portcollection_add.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Add/VB/portcollection_add.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortCollection/Add/portcollection_add.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_CopyTo/VB/MathServiceCopyTo_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortCollection/CopyTo/MathServiceCopyTo_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortCollection_CopyTo/VB/MathServiceCopyTo_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortCollection/CopyTo/MathServiceCopyTo_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_CopyTo/VB/portcollection_copyto.vb b/snippets/visualbasic/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortCollection_CopyTo/VB/portcollection_copyto.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/MathServiceItem_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/MathServiceItem_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/MathServiceItem_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/MathServiceItem_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/portcollection_item.vb b/snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/portcollection_item.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/portcollection_item.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/portcollection_item.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortType/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortType/Operations/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortType/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortType/Operations/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortType/VB/porttype.vb b/snippets/visualbasic/System.Web.Services.Description/PortType/Operations/porttype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortType/VB/porttype.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortType/Operations/porttype.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortType_Class/VB/MathService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortType/Overview/MathService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortType_Class/VB/MathService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortType/Overview/MathService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortType_Class/VB/porttype_class.vb b/snippets/visualbasic/System.Web.Services.Description/PortType/Overview/porttype_class.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortType_Class/VB/porttype_class.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortType/Overview/porttype_class.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_1/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Add/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_1/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Add/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_1/VB/porttypecollection_1.vb b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_1/VB/porttypecollection_1.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/porttypecollection_2.vb b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/porttypecollection_2.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/MathService.VB.asmx b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/MathService.VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/MathService.VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/MathService.VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/mathserviceclient.vb.aspx b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/mathserviceclient.vb.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/mathserviceclient.vb.aspx
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/mathserviceclient.vb.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/porttypecollection_copyto.vb b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/porttypecollection_copyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/porttypecollection_copyto.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/porttypecollection_copyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_Class/VB/MathService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Overview/MathService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_Class/VB/MathService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Overview/MathService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_Class/VB/MathService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Overview/MathService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_Class/VB/MathService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Overview/MathService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_Class/VB/porttypecollection_class.vb b/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Overview/porttypecollection_class.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_Class/VB/porttypecollection_class.vb
rename to snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Overview/porttypecollection_class.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/MathService_VB.asmx b/snippets/visualbasic/System.Web.Services.Description/Service/Extensions/MathService_VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/MathService_VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/Service/Extensions/MathService_VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/Service/Extensions/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Service/Extensions/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/service_class.vb b/snippets/visualbasic/System.Web.Services.Description/Service/Extensions/service_class.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/service_class.vb
rename to snippets/visualbasic/System.Web.Services.Description/Service/Extensions/service_class.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceClass/VB/MathService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/Service/Overview/MathService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceClass/VB/MathService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/Service/Overview/MathService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceClass/VB/MathService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/Service/Overview/MathService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceClass/VB/MathService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/Service/Overview/MathService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceClass/VB/serviceclass.vb b/snippets/visualbasic/System.Web.Services.Description/Service/Overview/serviceclass.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceClass/VB/serviceclass.vb
rename to snippets/visualbasic/System.Web.Services.Description/Service/Overview/serviceclass.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/AddSub.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/AddSub.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/AddSub.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/AddSub.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/Input.vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/Input.vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/Input.vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/Input.vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/AddService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/AddService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/AddService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/AddService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/AddService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/AddService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/AddService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/AddService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/AddSubtractService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/AddSubtractService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/AddSubtractService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/AddSubtractService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/SubtractService.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/SubtractService.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/SubtractService.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/SubtractService.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/SubtractService_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/SubtractService_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/SubtractService_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/SubtractService_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/servicecollection_copyto.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/servicecollection_copyto.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/AddService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/AddService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/AddService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/AddService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/All_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/All_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/All_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/All_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/SubtractService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/SubtractService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/SubtractService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/SubtractService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/servicedescription_read.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/servicedescription_read.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Bindings/VB/MyWsdl_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Bindings/MyWsdl_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Bindings/VB/MyWsdl_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Bindings/MyWsdl_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription/VB/Service1_VB.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Bindings/Service1_VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription/VB/Service1_VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Bindings/Service1_VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Bindings/VB/servicedescription_bindings.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Bindings/servicedescription_bindings.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Bindings/VB/servicedescription_bindings.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Bindings/servicedescription_bindings.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/MyWsdl_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/MyWsdl_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/MyWsdl_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/MyWsdl_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/Service1_VB.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/Service1_VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/Service1_VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/Service1_VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/servicedescription_porttypes_2.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/servicedescription_porttypes_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/servicedescription_porttypes_2.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/servicedescription_porttypes_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/ServiceDescription_Extensions_Input_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/ServiceDescription_Extensions_Input_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/ServiceDescription_Extensions_Input_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/ServiceDescription_Extensions_Input_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/ServiceDescription_Extensions_VB.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/ServiceDescription_Extensions_VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/ServiceDescription_Extensions_VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/ServiceDescription_Extensions_VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/servicedescription_extensions_2.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/servicedescription_extensions_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/servicedescription_extensions_2.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/servicedescription_extensions_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Imports_Service/VB/ServiceDescription_Imports_Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Imports/ServiceDescription_Imports_Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Imports_Service/VB/ServiceDescription_Imports_Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Imports/ServiceDescription_Imports_Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Imports_Service/VB/ServiceDescription_Imports_Service.vb.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Imports/ServiceDescription_Imports_Service.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Imports_Service/VB/ServiceDescription_Imports_Service.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Imports/ServiceDescription_Imports_Service.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Imports_Service/VB/servicedescription_imports.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Imports/servicedescription_imports.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Imports_Service/VB/servicedescription_imports.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Imports/servicedescription_imports.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/MyWsdl_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/MyWsdl_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/MyWsdl_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/MyWsdl_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/Service1_VB.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/Service1_VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/Service1_VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/Service1_VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/servicedescription_constructor_4.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/servicedescription_constructor_4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/servicedescription_constructor_4.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/servicedescription_constructor_4.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Namespace/VB/MyWsdl_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Namespace/MyWsdl_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Namespace/VB/MyWsdl_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Namespace/MyWsdl_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Namespace/VB/servicedescription_namespace.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Namespace/servicedescription_namespace.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Namespace/VB/servicedescription_namespace.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Namespace/servicedescription_namespace.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription/VB/MyWsdl_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Overview/MyWsdl_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription/VB/MyWsdl_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Overview/MyWsdl_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Bindings/VB/Service1_VB.asmx b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Overview/Service1_VB.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Bindings/VB/Service1_VB.asmx
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Overview/Service1_VB.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription/VB/servicedescription.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Overview/servicedescription.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription/VB/servicedescription.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Overview/servicedescription.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read1/VB/servicedescription_read1.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read1/VB/servicedescription_read1.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read2/VB/servicedescription_read2.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read2/VB/servicedescription_read2.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Types/VB/Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Types/Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Types/VB/Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Types/Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Types/VB/servicedescription_types.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Types/servicedescription_types.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Types/VB/servicedescription_types.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Types/servicedescription_types.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionBaseCollection/VB/Input_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionBaseCollection/Overview/Input_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionBaseCollection/VB/Input_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionBaseCollection/Overview/Input_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionBaseCollection/VB/servicedescriptionbasecollection.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionBaseCollection/Overview/servicedescriptionbasecollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionBaseCollection/VB/servicedescriptionbasecollection.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionBaseCollection/Overview/servicedescriptionbasecollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/servicedescriptioncollection_constructor_add_item.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/servicedescriptioncollection_constructor_add_item.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/servicedescriptioncollection_contains_indexof_remove.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/servicedescriptioncollection_contains_indexof_remove.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/servicedescriptioncollection_insert_item_copyto.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/servicedescriptioncollection_insert_item_copyto.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/VB/servicedescriptioncollection_getbinding.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/servicedescriptioncollection_getbinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/VB/servicedescriptioncollection_getbinding.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/servicedescriptioncollection_getbinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/VB/servicedescriptioncollection_getmessage.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/servicedescriptioncollection_getmessage.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/VB/servicedescriptioncollection_getmessage.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/servicedescriptioncollection_getmessage.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/VB/servicedescriptioncollection_getporttype.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/servicedescriptioncollection_getporttype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/VB/servicedescriptioncollection_getporttype.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/servicedescriptioncollection_getporttype.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetService/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetService/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetService/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetService/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/VB/servicedescriptioncollection_getservice.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetService/servicedescriptioncollection_getservice.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/VB/servicedescriptioncollection_getservice.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetService/servicedescriptioncollection_getservice.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/DataTypes_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Overview/DataTypes_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/DataTypes_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Overview/DataTypes_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/MathService_VB.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Overview/MathService_VB.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/MathService_VB.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Overview/MathService_VB.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection/VB/servicedescriptioncollection.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Overview/servicedescriptioncollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection/VB/servicedescriptioncollection.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Overview/servicedescriptioncollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/Sample_VB.WSDL b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/Sample_VB.WSDL
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/Sample_VB.WSDL
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/Sample_VB.WSDL
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportStyle_Client/VB/Sample_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportStyle/Overview/Sample_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportStyle_Client/VB/Sample_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportStyle/Overview/Sample_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportStyle_Client/VB/servicedescriptionimportstyle_client.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportStyle/Overview/servicedescriptionimportstyle_client.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportStyle_Client/VB/servicedescriptionimportstyle_client.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportStyle/Overview/servicedescriptionimportstyle_client.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportWarnings_Enum/VB/servicedescriptionimportwarnings_enum.vb b/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportWarnings/Overview/servicedescriptionimportwarnings_enum.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportWarnings_Enum/VB/servicedescriptionimportwarnings_enum.vb
rename to snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportWarnings/Overview/servicedescriptionimportwarnings_enum.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/AddNumbersInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/AddNumbersInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/AddNumbersInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/AddNumbersInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/soapoperationbinding.vb b/snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/soapoperationbinding.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/AddNumbersInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/AddNumbersInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/AddNumbersInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/AddNumbersInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/Service1_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/Service1_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/makefile b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/makefile
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/soapbodybinding_parts.vb b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/soapbodybinding_parts.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/soapbodybinding_parts.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/soapbodybinding_parts.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/AddNumbersInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/AddNumbersInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/AddNumbersInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/AddNumbersInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/Service1_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/Service1_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/makefile b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/makefile
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/soapprotocol.vb b/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/soapprotocol.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/soapprotocol.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/soapprotocol.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBindingStyle_Rpc/VB/SoapBindingStyleInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/Encoding/SoapBindingStyleInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBindingStyle_Rpc/VB/SoapBindingStyleInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/Encoding/SoapBindingStyleInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapBindingStyle_Rpc/VB/soapbindingstyle_rpc.vb b/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/Encoding/soapbindingstyle_rpc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapBindingStyle_Rpc/VB/soapbindingstyle_rpc.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/Encoding/soapbindingstyle_rpc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/SoapFaultInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/SoapFaultInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/SoapFaultInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/SoapFaultInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/soapfaultbinding_ctor.vb b/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/soapfaultbinding_ctor.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding/VB/SoapFaultBindingInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapFaultBinding/Overview/SoapFaultBindingInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding/VB/SoapFaultBindingInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapFaultBinding/Overview/SoapFaultBindingInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding/VB/soapfaultbinding.vb b/snippets/visualbasic/System.Web.Services.Description/SoapFaultBinding/Overview/soapfaultbinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding/VB/soapfaultbinding.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapFaultBinding/Overview/soapfaultbinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_MapToProperty/VB/MapToProperty_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/MapToProperty/MapToProperty_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_MapToProperty/VB/MapToProperty_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/MapToProperty/MapToProperty_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_MapToProperty/VB/soapheaderbinding_maptoproperty.vb b/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/MapToProperty/soapheaderbinding_maptoproperty.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_MapToProperty/VB/soapheaderbinding_maptoproperty.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/MapToProperty/soapheaderbinding_maptoproperty.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding/VB/SoapHeaderBindingInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Message/SoapHeaderBindingInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding/VB/SoapHeaderBindingInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Message/SoapHeaderBindingInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_Use/VB/soapheaderbinding_use.vb b/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Message/soapheaderbinding_use.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_Use/VB/soapheaderbinding_use.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Message/soapheaderbinding_use.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_Use/VB/SoapHeaderBindingInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Overview/SoapHeaderBindingInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_Use/VB/SoapHeaderBindingInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Overview/SoapHeaderBindingInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding/VB/soapheaderbinding.vb b/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Overview/soapheaderbinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding/VB/soapheaderbinding.vb
rename to snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Overview/soapheaderbinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ctor1/VB/contractreference_ctor1.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ctor1/VB/contractreference_ctor1.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ctor2/VB/contractreference_ctor2.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ctor2/VB/contractreference_ctor2.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Reference/VB/contractreference_ref.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Reference/VB/contractreference_ref.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Contract/VB/Service1_VB.disco b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Contract/Service1_VB.disco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Contract/VB/Service1_VB.disco
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Contract/Service1_VB.disco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Contract/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Contract/Service1_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Contract/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Contract/Service1_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Contract/VB/contractreference_contract.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Contract/contractreference_contract.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Contract/VB/contractreference_contract.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Contract/contractreference_contract.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/Service1_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/Service1_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/Test_vb.disco b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/Test_vb.disco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/Test_vb.disco
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/Test_vb.disco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/contractreference_defaultfilename.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/contractreference_defaultfilename.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/contractreference_defaultfilename.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/contractreference_defaultfilename.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference/VB/contractreference.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Overview/contractreference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference/VB/contractreference.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Overview/contractreference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ReadDocument/VB/MyService1_vb.wsdl b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/ReadDocument/MyService1_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ReadDocument/VB/MyService1_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/ReadDocument/MyService1_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ReadDocument/VB/contractreference_readdocument.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/ReadDocument/contractreference_readdocument.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ReadDocument/VB/contractreference_readdocument.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/ReadDocument/contractreference_readdocument.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_WriteDocument/VB/TestInput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/WriteDocument/TestInput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_WriteDocument/VB/TestInput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/WriteDocument/TestInput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_WriteDocument/VB/TestOutput_vb.wsdl b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/WriteDocument/TestOutput_vb.wsdl
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_WriteDocument/VB/TestOutput_vb.wsdl
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/WriteDocument/TestOutput_vb.wsdl
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_WriteDocument/VB/contractreference_writedocument.vb b/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/WriteDocument/contractreference_writedocument.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/ContractReference_WriteDocument/VB/contractreference_writedocument.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/ContractReference/WriteDocument/contractreference_writedocument.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/VB/discoveryclientdocumentcollection_ctor.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/VB/discoveryclientdocumentcollection_ctor.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/VB/discoveryclientdocumentcollection_keys.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/VB/discoveryclientdocumentcollection_keys.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection2/VB/discoveryclientdocumentcollection.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Overview/discoveryclientdocumentcollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection2/VB/discoveryclientdocumentcollection.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Overview/discoveryclientdocumentcollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/VB/MathService_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/MathService_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/VB/MathService_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/MathService_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/VB/discoveryclientresultsfile_results.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/discoveryclientresultsfile_results.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/VB/discoveryclientresultsfile_results.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/discoveryclientresultsfile_results.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_AdditionalInformation/VB/discoveryclientprotocol_additionalinformation.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/AdditionalInformation/discoveryclientprotocol_additionalinformation.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_AdditionalInformation/VB/discoveryclientprotocol_additionalinformation.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/AdditionalInformation/discoveryclientprotocol_additionalinformation.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/VB/MathService_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/MathService_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/VB/MathService_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/MathService_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download/VB/discoveryclientprotocol_download.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download/VB/discoveryclientprotocol_download.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/VB/discoveryclientprotocol_download.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/VB/discoveryclientprotocol_download.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/VB/MathService_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/MathService_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/VB/MathService_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/MathService_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/VB/discoveryclientprotocol_errors.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/discoveryclientprotocol_errors.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/VB/discoveryclientprotocol_errors.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/discoveryclientprotocol_errors.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/VB/discoveryclientreferencecollection_items.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/VB/discoveryclientreferencecollection_items.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Keys/VB/discoveryclientreferencecollection_keys.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Contains/discoveryclientreferencecollection_keys.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Keys/VB/discoveryclientreferencecollection_keys.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Contains/discoveryclientreferencecollection_keys.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection/VB/discoveryclientreferencecollection.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Overview/discoveryclientreferencecollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection/VB/discoveryclientreferencecollection.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Overview/discoveryclientreferencecollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/Service1_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/Service1_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_ctor/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/Service1_vb1.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_ctor/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/Service1_vb1.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_ctor/VB/discoveryclientresult_ctor.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_ctor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_ctor/VB/discoveryclientresult_ctor.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_ctor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/Overview/Service1_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/Overview/Service1_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult/VB/discoveryclientresult.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/Overview/discoveryclientresult.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult/VB/discoveryclientresult.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/Overview/discoveryclientresult.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultCollection/VB/Service1_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResultCollection/Overview/Service1_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultCollection/VB/Service1_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResultCollection/Overview/Service1_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultCollection/VB/discoveryclientresultcollection.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResultCollection/Overview/discoveryclientresultcollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultCollection/VB/discoveryclientresultcollection.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResultCollection/Overview/discoveryclientresultcollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/VB/discoverydocument_discoverydocument.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/VB/discoverydocument_discoverydocument.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument/VB/Example_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Overview/Example_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument/VB/Example_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Overview/Example_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument/VB/discoverydocument.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Overview/discoverydocument.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument/VB/discoverydocument.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Overview/discoverydocument.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write2/VB/Example_Write2_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Read/Example_Write2_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write2/VB/Example_Write2_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Read/Example_Write2_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write2/VB/discoverydocument_write2.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write2/VB/discoverydocument_write2.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write1/VB/Example_Write1_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Write/Example_Write1_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write1/VB/Example_Write1_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Write/Example_Write1_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write1/VB/discoverydocument_write1.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Write/discoverydocument_write1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write1/VB/discoverydocument_write1.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Write/discoverydocument_write1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/Sample_vb.disco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/Sample_vb.disco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/Sample_vb.disco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/Sample_vb.disco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/discoverydocumentreference_ctor_properties.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/discoverydocumentreference_ctor_properties.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_Document_ResolveAll/VB/Sample_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/Sample_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_Document_ResolveAll/VB/Sample_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/Sample_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_Document_ResolveAll/VB/ddreference_document_resolveall.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/ddreference_document_resolveall.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_Document_ResolveAll/VB/ddreference_document_resolveall.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/ddreference_document_resolveall.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ReadDocument/VB/Sample_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/Sample_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ReadDocument/VB/Sample_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/Sample_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/VB/discoverydocumentreference_ctor_writedocument.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/VB/discoverydocumentreference_ctor_writedocument.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/VB/Sample_vb.vsdisco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/ReadDocument/Sample_vb.vsdisco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/VB/Sample_vb.vsdisco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/ReadDocument/Sample_vb.vsdisco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ReadDocument/VB/discoverydocumentreference_readdocument.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/ReadDocument/discoverydocumentreference_readdocument.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ReadDocument/VB/discoverydocumentreference_readdocument.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/ReadDocument/discoverydocumentreference_readdocument.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/MathService_vb.asmx b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/MathService_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/MathService_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/MathService_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/MathService_vb.disco b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/MathService_vb.disco
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/MathService_vb.disco
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/MathService_vb.disco
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference/VB/discoveryreference.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference/VB/discoveryreference.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference1/VB/discoveryreference.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/Overview/discoveryreference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference1/VB/discoveryreference.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/Overview/discoveryreference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReferenceCollection/VB/discoveryreferencecollection.vb b/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReferenceCollection/VB/discoveryreferencecollection.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb b/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Discovery_SoapBinding1/VB/discovery_soapbinding.vb b/snippets/visualbasic/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Discovery_SoapBinding1/VB/discovery_soapbinding.vb
rename to snippets/visualbasic/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpGetClientProtocol_Constructor/VB/MyMath.Vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/.ctor/MyMath.Vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpGetClientProtocol_Constructor/VB/MyMath.Vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/.ctor/MyMath.Vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpGetClientProtocol_Constructor/VB/httpgetclientprotocol_constructor.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/.ctor/httpgetclientprotocol_constructor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpGetClientProtocol_Constructor/VB/httpgetclientprotocol_constructor.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/.ctor/httpgetclientprotocol_constructor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpMethodAttribute Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpMethodAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpMethodAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpMethodAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpMethodAttribute.ReturnFormatter Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpMethodAttribute/ParameterFormatter/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpMethodAttribute.ReturnFormatter Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpMethodAttribute/ParameterFormatter/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpPostClientProtocol_Constructor/VB/MyMath.Vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/.ctor/MyMath.Vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpPostClientProtocol_Constructor/VB/MyMath.Vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/.ctor/MyMath.Vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpPostClientProtocol_Constructor/VB/httppostclientprotocol_constructor.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/.ctor/httppostclientprotocol_constructor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpPostClientProtocol_Constructor/VB/httppostclientprotocol_constructor.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/.ctor/httppostclientprotocol_constructor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpPostClientProtocol Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpPostClientProtocol Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpPostClientProtocol Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpPostClientProtocol Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/makefile b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/makefile
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.aspx b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.aspx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/sourcevb.aspx b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcevb.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/sourcevb.aspx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcevb.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebClientProtocol.Proxy Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/Proxy/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebClientProtocol.Proxy Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/Proxy/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebClientProtocol_UserAgent/VB/MyMath.Vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/UserAgent/MyMath.Vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebClientProtocol_UserAgent/VB/MyMath.Vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/UserAgent/MyMath.Vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HttpWebClientProtocol_UserAgent/VB/httpwebclientprotocol_useragent.vb b/snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/UserAgent/httpwebclientprotocol_useragent.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HttpWebClientProtocol_UserAgent/VB/httpwebclientprotocol_useragent.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/UserAgent/httpwebclientprotocol_useragent.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/VB/logicalmethodinfo_begininvoke.vb b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/logicalmethodinfo_begininvoke.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/VB/logicalmethodinfo_begininvoke.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/logicalmethodinfo_begininvoke.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/VB/math.vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/math.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/VB/math.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/math.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create1/VB/logicalmethodinfo_create1.vb b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create1/VB/logicalmethodinfo_create1.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/VB/logicalmethodinfo_isbeginmethod.vb b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/logicalmethodinfo_isbeginmethod.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/VB/logicalmethodinfo_isbeginmethod.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/logicalmethodinfo_isbeginmethod.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/VB/math.vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/math.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/VB/math.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/math.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb b/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/MathSvc_SoapClientMessage_vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/MathSvc_SoapClientMessage_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/MathSvc_SoapClientMessage_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/MathSvc_SoapClientMessage_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.ChainStream Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/ChainStream/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.ChainStream Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/ChainStream/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.GetInitializer Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/GetInitializer/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.GetInitializer Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/GetInitializer/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapExtension.GetInitializer-Type/VB/traceextension.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/GetInitializer/traceextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapExtension.GetInitializer-Type/VB/traceextension.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/GetInitializer/traceextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.Initialize Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/Initialize/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.Initialize Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/Initialize/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapExtensionAttribute/VB/MathSvc_SoapExtensionAttribute_vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/ExtensionType/MathSvc_SoapExtensionAttribute_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapExtensionAttribute/VB/MathSvc_SoapExtensionAttribute_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/ExtensionType/MathSvc_SoapExtensionAttribute_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapExtensionAttribute/VB/soapextensionattribute.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/ExtensionType/soapextensionattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapExtensionAttribute/VB/soapextensionattribute.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/ExtensionType/soapextensionattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtensionAttribute Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtensionAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeader.Actor Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/Actor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeader.Actor Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/Actor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeader_EncodedMustUnderstand/VB/WebService_SoapHeader_EncodedMustUnderstand.vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/EncodedMustUnderstand/WebService_SoapHeader_EncodedMustUnderstand.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeader_EncodedMustUnderstand/VB/WebService_SoapHeader_EncodedMustUnderstand.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/EncodedMustUnderstand/WebService_SoapHeader_EncodedMustUnderstand.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeader_EncodedMustUnderstand/VB/soapheader_encodedmustunderstand.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/EncodedMustUnderstand/soapheader_encodedmustunderstand.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeader_EncodedMustUnderstand/VB/soapheader_encodedmustunderstand.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/EncodedMustUnderstand/soapheader_encodedmustunderstand.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeader.MustUnderstand Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/MustUnderstand/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeader.MustUnderstand Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/MustUnderstand/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/MathService_SoapHeaderCollection.vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/MathService_SoapHeaderCollection.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/MathService_SoapHeaderCollection.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/MathService_SoapHeaderCollection.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/soapheadercollection_contains.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/soapheadercollection_contains.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/MathSvc_SoapHeaderCollection.vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/MathSvc_SoapHeaderCollection.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/MathSvc_SoapHeaderCollection.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/MathSvc_SoapHeaderCollection.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/soapheadercollection.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/soapheadercollection.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderDirection Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderDirection/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderDirection Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderDirection/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/makefile b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/makefile
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/makefile
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/makefile
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/sourcevb.aspx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/sourcevb.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/sourcevb.aspx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/sourcevb.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.BeginInvoke Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.BeginInvoke Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.BeginInvoke Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.BeginInvoke Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.EndInvoke Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.EndInvoke Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.EndInvoke Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.EndInvoke Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.Invoke Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.Invoke Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.Invoke Example/VB/sourcevb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/sourcevb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.Invoke Example/VB/sourcevb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/sourcevb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapMessage.EnsureStage Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/EnsureStage/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapMessage.EnsureStage Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/EnsureStage/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/MathSvc_SoapMessage.vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/MathSvc_SoapMessage.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/MathSvc_SoapMessage.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/MathSvc_SoapMessage.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.ProcessMessage Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stage/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.ProcessMessage Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stage/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage_Headers/VB/SoapMessage_Headers.vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stream/SoapMessage_Headers.vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapMessage_Headers/VB/SoapMessage_Headers.vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stream/SoapMessage_Headers.vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage_Headers/VB/soapmessage_headers.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stream/soapmessage_headers.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapMessage_Headers/VB/soapmessage_headers.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stream/soapmessage_headers.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapMessageState/VB/MathSvc_SoapMessageState_vb.asmx b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessageStage/Overview/MathSvc_SoapMessageState_vb.asmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapMessageState/VB/MathSvc_SoapMessageState_vb.asmx
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessageStage/Overview/MathSvc_SoapMessageState_vb.asmx
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapMessageState/VB/soapmessagestate.vb b/snippets/visualbasic/System.Web.Services.Protocols/SoapMessageStage/Overview/soapmessagestate.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapMessageState/VB/soapmessagestate.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/SoapMessageStage/Overview/soapmessagestate.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Web.Services.Protocols.WebClientProtocol constructor/VB/class1.vb b/snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/.ctor/class1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Web.Services.Protocols.WebClientProtocol constructor/VB/class1.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/.ctor/class1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic WebClientProtocol.Timeout Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/Timeout/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic WebClientProtocol.Timeout Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/Timeout/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic WebClientProtocol.Url Example/VB/source.vb b/snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/Url/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic WebClientProtocol.Url Example/VB/source.vb
rename to snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/Url/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SchemaImporterExtensionExample/VB/SchemaImporterExtensionExample.vb b/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SchemaImporterExtensionExample/VB/SchemaImporterExtensionExample.vb
rename to snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeAttributeEx2/VB/soapattributeex2.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/.ctor/soapattributeex2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeAttributeEx2/VB/soapattributeex2.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/.ctor/soapattributeex2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribute/VB/soapattribute.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapAttribute/VB/soapattribute.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeOverrides.Item property 1/VB/attadd.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeOverrides.Item property 1/VB/attadd.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeOverrides.Item property 2/VB/attadd2.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeOverrides.Item property 2/VB/attadd2.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribues.SoapDefaultValue/VB/defvalue.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapDefaultValue/defvalue.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapAttribues.SoapDefaultValue/VB/defvalue.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapDefaultValue/defvalue.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapEnumOverrides/VB/soapenumoverrides.vb b/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapEnumOverrides/VB/soapenumoverrides.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb b/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb
rename to snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb b/snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb
rename to snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlAnyAttributeAttribute_ctor Example/VB/anyattover.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAnyAttributeAttribute/.ctor/anyattover.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlAnyAttributeAttribute_ctor Example/VB/anyattover.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAnyAttributeAttribute/.ctor/anyattover.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlAnyAttributeAttribute Example/VB/anyattribute.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAnyAttributeAttribute/Overview/anyattribute.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlAnyAttributeAttribute Example/VB/anyattribute.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAnyAttributeAttribute/Overview/anyattribute.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlAnyElementAttribute Example/VB/anyelement.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttribute/Name/anyelement.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlAnyElementAttribute Example/VB/anyelement.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttribute/Name/anyelement.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAnyElementAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAnyElementAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.XmlAnyElements/VB/xmlanyover.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.XmlAnyElements/VB/xmlanyover.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.XmlArrayAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.XmlArrayAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.XmlArrayAttribute1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.XmlArrayAttribute1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.ElementName Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/ElementName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.ElementName Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/ElementName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.Form Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Form/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.Form Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Form/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.IsNullable Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/IsNullable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.IsNullable Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/IsNullable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.Namespace Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Namespace/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.Namespace Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Namespace/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute2 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute2 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute3 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute3 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlArrayItemAttribute Example/VB/arrayitem.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/DataType/arrayitem.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlArrayItemAttribute Example/VB/arrayitem.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/DataType/arrayitem.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.ElementName Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/ElementName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.ElementName Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/ElementName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Form Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Form/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Form Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Form/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.IsNullable Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/IsNullable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.IsNullable Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/IsNullable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Namespace Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Namespace/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Namespace Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Namespace/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Type Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Type/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Type Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Type/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XMLAttributeAttribute_ctr1_2/VB/xmlattributeattribute_ctr1_2.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/.ctor/xmlattributeattribute_ctr1_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XMLAttributeAttribute_ctr1_2/VB/xmlattributeattribute_ctr1_2.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/.ctor/xmlattributeattribute_ctr1_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.AttributeName Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/AttributeName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.AttributeName Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/AttributeName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.DataType Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/DataType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.DataType Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/DataType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.Form Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Form/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.Form Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Form/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.Namespace Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Namespace/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.Namespace Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Namespace/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeEventArgs.ObjectBeingDeserialized Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/ObjectBeingDeserialized/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeEventArgs.ObjectBeingDeserialized Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/ObjectBeingDeserialized/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.Add Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.Add1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Add/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.Add1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Add/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.this Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Item/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.this Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Item/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.this1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Item/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.this1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Item/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlAttributes Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlAttributes Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlArray Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlArray/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlArray Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlArray/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlArrayItems Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlArrayItems/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlArrayItems Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlArrayItems/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlAttribute/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlAttribute/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlDefaultValue Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlDefaultValue/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlDefaultValue Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlDefaultValue/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlElements Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlElements/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlElements Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlElements/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlEnum Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlEnum/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlEnum Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlEnum/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlIgnore Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlIgnore/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlIgnore Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlIgnore/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlRoot Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlRoot/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlRoot Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlRoot/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlText Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlText/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlText Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlText/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlType Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlType Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.Xmlns property example/VB/xmlns.vb b/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/Xmlns/xmlns.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.Xmlns property example/VB/xmlns.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlAttributes/Xmlns/xmlns.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlChoiceIdentifierAttribute Example/VB/choice.vb b/snippets/visualbasic/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlChoiceIdentifierAttribute Example/VB/choice.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute2 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute2 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.DataType Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/DataType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.DataType Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/DataType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.ElementName Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/ElementName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.ElementName Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/ElementName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.Form Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Form/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.Form Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Form/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.IsNullable Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/IsNullable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.IsNullable Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/IsNullable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.Type Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Type/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.Type Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Type/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttributes.Add Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttributes/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttributes.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttributes/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttributes Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementAttributes/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttributes Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementAttributes/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb b/snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute.Name Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute.Name Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute.XmlEnumAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute.XmlEnumAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIgnoreAttribute.XmlIgnoreAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlIgnoreAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIgnoreAttribute.XmlIgnoreAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlIgnoreAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIncludeAttribute.XmlIncludeAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlIncludeAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIncludeAttribute.XmlIncludeAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlIncludeAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIncludeAttribute.Type Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlIncludeAttribute/Type/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIncludeAttribute.Type Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlIncludeAttribute/Type/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.LocalName Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/LocalName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.LocalName Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/LocalName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.Name Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Name/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.Name Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Name/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.NamespaceURI Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/NamespaceURI/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.NamespaceURI Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/NamespaceURI/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.NodeType Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/NodeType/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.NodeType Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/NodeType/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.ObjectBeingDeserialized Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/ObjectBeingDeserialized/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.ObjectBeingDeserialized Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/ObjectBeingDeserialized/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownNode Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownNode Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.Text Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Text/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.Text Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Text/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventHandler Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventHandler/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventHandler Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlNodeEventHandler/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.XmlRootAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.XmlRootAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XMLRootAttribute_Constructor/VB/xmlrootattribute_constructor.vb b/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/.ctor/xmlrootattribute_constructor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XMLRootAttribute_Constructor/VB/xmlrootattribute_constructor.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/.ctor/xmlrootattribute_constructor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XMLRootAttribute_ElementName/VB/xmlrootattribute_elementname.vb b/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/ElementName/xmlrootattribute_elementname.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XMLRootAttribute_ElementName/VB/xmlrootattribute_elementname.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/ElementName/xmlrootattribute_elementname.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.IsNullable Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/IsNullable/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.IsNullable Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/IsNullable/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.Namespace Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/Namespace/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.Namespace Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/Namespace/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/HowToChunkSerializedData/VB/SerializationChunk.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSchemaProviderAttribute/Overview/SerializationChunk.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/HowToChunkSerializedData/VB/SerializationChunk.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSchemaProviderAttribute/Overview/SerializationChunk.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer2 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer2 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer3 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer3 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer4 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer4 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer6 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer6 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source5.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.CanDeserialize Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/CanDeserialize/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.CanDeserialize Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/CanDeserialize/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize2 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize2 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.FromTypes Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/FromTypes/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.FromTypes Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/FromTypes/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize2 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize2 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize3 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize3 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize4 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source4.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize4 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source4.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize5 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source5.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize5 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source5.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.XmlSerializerNamespaces1 Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.XmlSerializerNamespaces1 Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializerNameSpaces_Constructor/VB/xmlserializernamespaces_constructor.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/xmlserializernamespaces_constructor.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlSerializerNameSpaces_Constructor/VB/xmlserializernamespaces_constructor.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/xmlserializernamespaces_constructor.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.Add Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Add/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.Add Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Add/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.ToArray Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/ToArray/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.ToArray Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/ToArray/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute.XmlTextAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute.XmlTextAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlTextAttribute/vb/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlTextAttribute/vb/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XMLTypeAttribute1_2/VB/xmltypeattribute1_2.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/.ctor/xmltypeattribute1_2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XMLTypeAttribute1_2/VB/xmltypeattribute1_2.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/.ctor/xmltypeattribute1_2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.IncludeInSchema Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/IncludeInSchema/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.IncludeInSchema Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/IncludeInSchema/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.Namespace Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/Namespace/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.Namespace Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/Namespace/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.TypeName Example/VB/source.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/TypeName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.TypeName Example/VB/source.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/TypeName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/XmlTypeMapping Example/VB/mapping.vb b/snippets/visualbasic/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/XmlTypeMapping Example/VB/mapping.vb
rename to snippets/visualbasic/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/SerializationAttributes/VB/s.vb b/snippets/visualbasic/System/NonSerializedAttribute/Overview/s.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/SerializationAttributes/VB/s.vb
rename to snippets/visualbasic/System/NonSerializedAttribute/Overview/s.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb b/snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb
rename to snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri Example/VB/source.vb b/snippets/visualbasic/System/Uri/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri1 Example/VB/source.vb b/snippets/visualbasic/System/Uri/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri1 Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri3 Example/VB/source.vb b/snippets/visualbasic/System/Uri/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri3 Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri4 Example/VB/source.vb b/snippets/visualbasic/System/Uri/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri4 Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.AbsolutePath Example/VB/source.vb b/snippets/visualbasic/System/Uri/AbsolutePath/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.AbsolutePath Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/AbsolutePath/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.AbsoluteUri Example/VB/source.vb b/snippets/visualbasic/System/Uri/AbsoluteUri/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.AbsoluteUri Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/AbsoluteUri/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Authority Example/VB/source.vb b/snippets/visualbasic/System/Uri/Authority/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Authority Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/Authority/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.CheckHostName Example/VB/source.vb b/snippets/visualbasic/System/Uri/CheckHostName/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.CheckHostName Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/CheckHostName/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb b/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb
rename to snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Host Example/VB/source.vb b/snippets/visualbasic/System/Uri/Host/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Host Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/Host/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/Project.vbproj b/snippets/visualbasic/System/Uri/Overview/Project.vbproj
similarity index 95%
rename from snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/Project.vbproj
rename to snippets/visualbasic/System/Uri/Overview/Project.vbproj
index e87b87cc0cd..adbde6e0619 100644
--- a/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/Project.vbproj
+++ b/snippets/visualbasic/System/Uri/Overview/Project.vbproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
 </Project>
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri Example/VB/source.vb b/snippets/visualbasic/System/Uri/Overview/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/Overview/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.PathAndQuery Example/VB/source.vb b/snippets/visualbasic/System/Uri/PathAndQuery/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.PathAndQuery Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/PathAndQuery/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Port Example/VB/source.vb b/snippets/visualbasic/System/Uri/Port/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Port Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/Port/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Scheme Example/VB/source.vb b/snippets/visualbasic/System/Uri/Scheme/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Scheme Example/VB/source.vb
rename to snippets/visualbasic/System/Uri/Scheme/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder3 Example/VB/source.vb b/snippets/visualbasic/System/UriBuilder/.ctor/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder3 Example/VB/source.vb
rename to snippets/visualbasic/System/UriBuilder/.ctor/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder4 Example/VB/source.vb b/snippets/visualbasic/System/UriBuilder/.ctor/source1.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder4 Example/VB/source.vb
rename to snippets/visualbasic/System/UriBuilder/.ctor/source1.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder5 Example/VB/source.vb b/snippets/visualbasic/System/UriBuilder/.ctor/source2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder5 Example/VB/source.vb
rename to snippets/visualbasic/System/UriBuilder/.ctor/source2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder6 Example/VB/source.vb b/snippets/visualbasic/System/UriBuilder/.ctor/source3.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder6 Example/VB/source.vb
rename to snippets/visualbasic/System/UriBuilder/.ctor/source3.vb
diff --git a/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.Fragment Example/VB/source.vb b/snippets/visualbasic/System/UriBuilder/Fragment/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.Fragment Example/VB/source.vb
rename to snippets/visualbasic/System/UriBuilder/Fragment/source.vb
diff --git a/xml/System.EnterpriseServices.CompensatingResourceManager/ApplicationCrmEnabledAttribute.xml b/xml/System.EnterpriseServices.CompensatingResourceManager/ApplicationCrmEnabledAttribute.xml
index 89b89c9cfc3..9aa2cd9adc9 100644
--- a/xml/System.EnterpriseServices.CompensatingResourceManager/ApplicationCrmEnabledAttribute.xml
+++ b/xml/System.EnterpriseServices.CompensatingResourceManager/ApplicationCrmEnabledAttribute.xml
@@ -39,7 +39,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices.CompensatingResourceManager/Clerk.xml b/xml/System.EnterpriseServices.CompensatingResourceManager/Clerk.xml
index b6fdf2b66af..a51f0b4fc6b 100644
--- a/xml/System.EnterpriseServices.CompensatingResourceManager/Clerk.xml
+++ b/xml/System.EnterpriseServices.CompensatingResourceManager/Clerk.xml
@@ -30,13 +30,13 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet10":::  
   
  The following code example demonstrates the corresponding <xref:System.EnterpriseServices.CompensatingResourceManager.Compensator> class.  
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmclient.cpp" id="Snippet30":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmclient.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmclient.vb" id="Snippet30":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmclient.vb" id="Snippet30":::  
   
  ]]></format>
     </remarks>
@@ -110,7 +110,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -172,7 +172,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet12":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet12":::  
   
  ]]></format>
         </remarks>
@@ -308,7 +308,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices.CompensatingResourceManager/Compensator.xml b/xml/System.EnterpriseServices.CompensatingResourceManager/Compensator.xml
index 27db0df9b6c..b17dce5e40f 100644
--- a/xml/System.EnterpriseServices.CompensatingResourceManager/Compensator.xml
+++ b/xml/System.EnterpriseServices.CompensatingResourceManager/Compensator.xml
@@ -34,19 +34,19 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet20":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet20":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet20":::  
   
  This compensator is used by the following worker class.  
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet10":::  
   
  The following code example demonstrates a client that exercises this compensator and worker.  
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmclient.cpp" id="Snippet30":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmclient.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmclient.vb" id="Snippet30":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmclient.vb" id="Snippet30":::  
   
  ]]></format>
     </remarks>
@@ -104,7 +104,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet28":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet28":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet28":::  
   
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet27":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet27":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet27":::  
   
  ]]></format>
         </remarks>
@@ -180,7 +180,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet24":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet24":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet24":::  
   
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet21":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet21":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet21":::  
   
  ]]></format>
         </remarks>
@@ -276,7 +276,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet25":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet25":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet25":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet25":::  
   
  ]]></format>
         </remarks>
@@ -310,7 +310,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet29":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet29":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet29":::  
   
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet26":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet26":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet26":::  
   
  ]]></format>
         </remarks>
@@ -380,7 +380,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet23":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet23":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet23":::  
   
  ]]></format>
         </remarks>
@@ -419,7 +419,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet22":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet22":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet22":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.xml b/xml/System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.xml
index 18804252da6..ff1bb56013b 100644
--- a/xml/System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.xml
+++ b/xml/System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.xml
@@ -34,7 +34,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet11":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices.CompensatingResourceManager/LogRecord.xml b/xml/System.EnterpriseServices.CompensatingResourceManager/LogRecord.xml
index 3a99753cd30..84cb490846e 100644
--- a/xml/System.EnterpriseServices.CompensatingResourceManager/LogRecord.xml
+++ b/xml/System.EnterpriseServices.CompensatingResourceManager/LogRecord.xml
@@ -30,7 +30,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet28":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet28":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet28":::  
   
  ]]></format>
     </remarks>
@@ -87,7 +87,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet28":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet28":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet28":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/AccessChecksLevelOption.xml b/xml/System.EnterpriseServices/AccessChecksLevelOption.xml
index 280fabf24eb..ea3a2055316 100644
--- a/xml/System.EnterpriseServices/AccessChecksLevelOption.xml
+++ b/xml/System.EnterpriseServices/AccessChecksLevelOption.xml
@@ -30,7 +30,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/ApplicationAccessControlAttribute.xml b/xml/System.EnterpriseServices/ApplicationAccessControlAttribute.xml
index 1b47265fd65..5c0e0b67d44 100644
--- a/xml/System.EnterpriseServices/ApplicationAccessControlAttribute.xml
+++ b/xml/System.EnterpriseServices/ApplicationAccessControlAttribute.xml
@@ -40,7 +40,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -176,7 +176,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -215,7 +215,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/ApplicationIDAttribute.xml b/xml/System.EnterpriseServices/ApplicationIDAttribute.xml
index 07d766a588c..8b27f577687 100644
--- a/xml/System.EnterpriseServices/ApplicationIDAttribute.xml
+++ b/xml/System.EnterpriseServices/ApplicationIDAttribute.xml
@@ -39,7 +39,7 @@
  The following code example demonstrates the use of the <xref:System.EnterpriseServices.ApplicationIDAttribute> type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices.ApplicationIDAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -72,7 +72,7 @@
  The following code example demonstrates how to create a new <xref:System.EnterpriseServices.ApplicationIDAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices.ApplicationIDAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -110,7 +110,7 @@
  The following code example demonstrates how to get the value of an `ApplicationID` attribute's <xref:System.EnterpriseServices.ApplicationIDAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices.ApplicationIDAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationIDAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/ApplicationQueuingAttribute.xml b/xml/System.EnterpriseServices/ApplicationQueuingAttribute.xml
index 9d5be1edf03..3d131f66ae6 100644
--- a/xml/System.EnterpriseServices/ApplicationQueuingAttribute.xml
+++ b/xml/System.EnterpriseServices/ApplicationQueuingAttribute.xml
@@ -41,7 +41,7 @@
  The following code example demonstrates the use of the <xref:System.EnterpriseServices.ApplicationQueuingAttribute> type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesApplicationQueuingAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.ApplicationQueuingAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesApplicationQueuingAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -120,7 +120,7 @@
  The following code example gets and sets the value of an `ApplicationQueuing` attribute's <xref:System.EnterpriseServices.ApplicationQueuingAttribute.Enabled%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesApplicationQueuingAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -160,7 +160,7 @@
  The following code example gets and sets the value of an `ApplicationQueuing` attribute's <xref:System.EnterpriseServices.ApplicationQueuingAttribute.MaxListenerThreads%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesApplicationQueuingAttribute/VB/class1.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
  The following code example gets and sets the value of an `ApplicationQueuing` attribute's <xref:System.EnterpriseServices.ApplicationQueuingAttribute.QueueListenerEnabled%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesApplicationQueuingAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ApplicationQueuingAttribute/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/AuthenticationOption.xml b/xml/System.EnterpriseServices/AuthenticationOption.xml
index cb9ae3e9fc4..09f242343f6 100644
--- a/xml/System.EnterpriseServices/AuthenticationOption.xml
+++ b/xml/System.EnterpriseServices/AuthenticationOption.xml
@@ -30,7 +30,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/AutoCompleteAttribute.xml b/xml/System.EnterpriseServices/AutoCompleteAttribute.xml
index 009837a2c18..f9b2a6efcc6 100644
--- a/xml/System.EnterpriseServices/AutoCompleteAttribute.xml
+++ b/xml/System.EnterpriseServices/AutoCompleteAttribute.xml
@@ -41,7 +41,7 @@
  The following code example demonstrates the use of the <xref:System.EnterpriseServices.AutoCompleteAttribute> type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesAutoCompleteAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.AutoCompleteAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesAutoCompleteAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -118,7 +118,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.AutoCompleteAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesAutoCompleteAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -152,7 +152,7 @@
  The following code example gets the value of an `AutoComplete` attribute's <xref:System.EnterpriseServices.AutoCompleteAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesAutoCompleteAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AutoCompleteAttribute/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/ConstructionEnabledAttribute.xml b/xml/System.EnterpriseServices/ConstructionEnabledAttribute.xml
index 5509c7f0025..1e9fca7d91d 100644
--- a/xml/System.EnterpriseServices/ConstructionEnabledAttribute.xml
+++ b/xml/System.EnterpriseServices/ConstructionEnabledAttribute.xml
@@ -42,7 +42,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/ContextUtil.xml b/xml/System.EnterpriseServices/ContextUtil.xml
index 6cd06524cb2..33babdf4c90 100644
--- a/xml/System.EnterpriseServices/ContextUtil.xml
+++ b/xml/System.EnterpriseServices/ContextUtil.xml
@@ -30,7 +30,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Transaction/CPP/transaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/Overview/transaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/transaction.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/transaction.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -64,7 +64,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesContextUtil/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ActivityId/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -99,7 +99,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -135,7 +135,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesContextUtil/CPP/class1.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ActivityId/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -171,7 +171,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -212,7 +212,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Transaction/CPP/transaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/Overview/transaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/transaction.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/transaction.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesContextUtil/CPP/class1.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ActivityId/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -292,7 +292,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesContextUtil/CPP/class1.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ActivityId/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -417,7 +417,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesContextUtil/CPP/class1.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ActivityId/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -453,7 +453,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesContextUtil/CPP/class1.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ActivityId/class1.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -495,7 +495,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Transaction/CPP/transaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/Overview/transaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/transaction.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/transaction.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -560,7 +560,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet13":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet13":::  
   
  ]]></format>
         </remarks>
@@ -600,7 +600,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet13":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet13":::  
   
  ]]></format>
         </remarks>
@@ -732,7 +732,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesContextUtil/CPP/class1.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ActivityId/class1.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesContextUtil/VB/class1.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ActivityId/class1.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/DescriptionAttribute.xml b/xml/System.EnterpriseServices/DescriptionAttribute.xml
index ff35524c5a3..5dda2cc236c 100644
--- a/xml/System.EnterpriseServices/DescriptionAttribute.xml
+++ b/xml/System.EnterpriseServices/DescriptionAttribute.xml
@@ -40,7 +40,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -74,7 +74,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Crm/cpp/crmserver.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Crm/VB/crmserver.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/SetAbort/crmserver.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/EventTrackingEnabledAttribute.xml b/xml/System.EnterpriseServices/EventTrackingEnabledAttribute.xml
index fd44b98db91..175a1409aa6 100644
--- a/xml/System.EnterpriseServices/EventTrackingEnabledAttribute.xml
+++ b/xml/System.EnterpriseServices/EventTrackingEnabledAttribute.xml
@@ -39,7 +39,7 @@
  The following code example demonstrates the use of the <xref:System.EnterpriseServices.EventTrackingEnabledAttribute> type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesEventTrackingEnabledAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.EventTrackingEnabledAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesEventTrackingEnabledAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -116,7 +116,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.EventTrackingEnabledAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesEventTrackingEnabledAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -150,7 +150,7 @@
  The following code example gets the value of an `EventTrackingEnabled` attribute's <xref:System.EnterpriseServices.EventTrackingEnabledAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesEventTrackingEnabledAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/EventTrackingEnabledAttribute/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/ImpersonationLevelOption.xml b/xml/System.EnterpriseServices/ImpersonationLevelOption.xml
index 009e0c21627..8cfe0558eed 100644
--- a/xml/System.EnterpriseServices/ImpersonationLevelOption.xml
+++ b/xml/System.EnterpriseServices/ImpersonationLevelOption.xml
@@ -37,7 +37,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/InterfaceQueuingAttribute.xml b/xml/System.EnterpriseServices/InterfaceQueuingAttribute.xml
index 4687e976007..d2faf5523b0 100644
--- a/xml/System.EnterpriseServices/InterfaceQueuingAttribute.xml
+++ b/xml/System.EnterpriseServices/InterfaceQueuingAttribute.xml
@@ -104,7 +104,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesInterfaceQueuingAttribute/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/InterfaceQueuingAttribute/.ctor/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesInterfaceQueuingAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/InterfaceQueuingAttribute/.ctor/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -139,7 +139,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesInterfaceQueuingAttribute/CPP/class1.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/InterfaceQueuingAttribute/.ctor/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesInterfaceQueuingAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/InterfaceQueuingAttribute/.ctor/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/JustInTimeActivationAttribute.xml b/xml/System.EnterpriseServices/JustInTimeActivationAttribute.xml
index d042175c958..651a8f73834 100644
--- a/xml/System.EnterpriseServices/JustInTimeActivationAttribute.xml
+++ b/xml/System.EnterpriseServices/JustInTimeActivationAttribute.xml
@@ -44,7 +44,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.JustInTimeActivationAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesJustInTimeActivationAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -121,7 +121,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.JustInTimeActivationAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesJustInTimeActivationAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -155,7 +155,7 @@
  The following code example gets the value of a `JustInTimeActivation` attribute's <xref:System.EnterpriseServices.JustInTimeActivationAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesJustInTimeActivationAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/JustInTimeActivationAttribute/.ctor/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/LoadBalancingSupportedAttribute.xml b/xml/System.EnterpriseServices/LoadBalancingSupportedAttribute.xml
index 91918e64a26..8b0e3664595 100644
--- a/xml/System.EnterpriseServices/LoadBalancingSupportedAttribute.xml
+++ b/xml/System.EnterpriseServices/LoadBalancingSupportedAttribute.xml
@@ -34,7 +34,7 @@
  The following code example demonstrates the use of the <xref:System.EnterpriseServices.LoadBalancingSupportedAttribute> type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesLoadBalancingSupportedAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -72,7 +72,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.LoadBalancingSupportedAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesLoadBalancingSupportedAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -106,7 +106,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.LoadBalancingSupportedAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesLoadBalancingSupportedAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -140,7 +140,7 @@
  The following code example gets the value of a `LoadBalancingSupported` attribute's <xref:System.EnterpriseServices.LoadBalancingSupportedAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesLoadBalancingSupportedAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/LoadBalancingSupportedAttribute/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/MustRunInClientContextAttribute.xml b/xml/System.EnterpriseServices/MustRunInClientContextAttribute.xml
index 1608cc5bd1b..bf7876cecaa 100644
--- a/xml/System.EnterpriseServices/MustRunInClientContextAttribute.xml
+++ b/xml/System.EnterpriseServices/MustRunInClientContextAttribute.xml
@@ -41,7 +41,7 @@
  The following code example demonstrates the use of the <xref:System.EnterpriseServices.MustRunInClientContextAttribute> type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesMustRunInClientContextAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.MustRunInClientContextAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesMustRunInClientContextAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -113,7 +113,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.MustRunInClientContextAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesMustRunInClientContextAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -147,7 +147,7 @@
  The following code example gets the value of a `MustRunInClientContext` attribute's <xref:System.EnterpriseServices.MustRunInClientContextAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesMustRunInClientContextAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/MustRunInClientContextAttribute/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/ObjectPoolingAttribute.xml b/xml/System.EnterpriseServices/ObjectPoolingAttribute.xml
index c6b2fa4d7e7..d29b1d5cd13 100644
--- a/xml/System.EnterpriseServices/ObjectPoolingAttribute.xml
+++ b/xml/System.EnterpriseServices/ObjectPoolingAttribute.xml
@@ -44,7 +44,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -95,7 +95,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet0":::  
   
  ]]></format>
         </remarks>
@@ -130,7 +130,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/cpp/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/cpp/class1.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -205,7 +205,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/cpp/class1.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -314,7 +314,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -349,7 +349,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/cpp/class1.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesObjectPoolingAttribute/VB/class1.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ObjectPoolingAttribute/.ctor/class1.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -423,7 +423,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -462,7 +462,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/PrivateComponentAttribute.xml b/xml/System.EnterpriseServices/PrivateComponentAttribute.xml
index 15011b26454..ce98a764e74 100644
--- a/xml/System.EnterpriseServices/PrivateComponentAttribute.xml
+++ b/xml/System.EnterpriseServices/PrivateComponentAttribute.xml
@@ -40,7 +40,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesPrivateComponentAttribute/cpp/class1.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/PrivateComponentAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesPrivateComponentAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/PrivateComponentAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -70,7 +70,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesPrivateComponentAttribute/cpp/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/PrivateComponentAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesPrivateComponentAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/PrivateComponentAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/RegistrationErrorInfo.xml b/xml/System.EnterpriseServices/RegistrationErrorInfo.xml
index a1a1ee568d6..52326dee5b0 100644
--- a/xml/System.EnterpriseServices/RegistrationErrorInfo.xml
+++ b/xml/System.EnterpriseServices/RegistrationErrorInfo.xml
@@ -31,7 +31,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices Registration/CPP/deployservicedcomponent.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices Registration/VB/deployservicedcomponent.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -88,7 +88,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices Registration/CPP/deployservicedcomponent.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices Registration/VB/deployservicedcomponent.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/RegistrationException.xml b/xml/System.EnterpriseServices/RegistrationException.xml
index 701323b86b1..2b3ef53d1ef 100644
--- a/xml/System.EnterpriseServices/RegistrationException.xml
+++ b/xml/System.EnterpriseServices/RegistrationException.xml
@@ -31,7 +31,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices Registration/CPP/deployservicedcomponent.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices Registration/VB/deployservicedcomponent.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/RegistrationHelper.xml b/xml/System.EnterpriseServices/RegistrationHelper.xml
index 45d0c343ea1..71ffb633124 100644
--- a/xml/System.EnterpriseServices/RegistrationHelper.xml
+++ b/xml/System.EnterpriseServices/RegistrationHelper.xml
@@ -112,7 +112,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices Registration/CPP/deployservicedcomponent.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices Registration/VB/deployservicedcomponent.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -199,7 +199,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices Registration/CPP/deployservicedcomponent.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices Registration/VB/deployservicedcomponent.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/RegistrationErrorInfo/Overview/deployservicedcomponent.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/SecurityCallContext.xml b/xml/System.EnterpriseServices/SecurityCallContext.xml
index f52dab42495..9714178bce2 100644
--- a/xml/System.EnterpriseServices/SecurityCallContext.xml
+++ b/xml/System.EnterpriseServices/SecurityCallContext.xml
@@ -25,7 +25,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -95,7 +95,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -129,7 +129,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -168,7 +168,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/SecurityRoleAttribute.xml b/xml/System.EnterpriseServices/SecurityRoleAttribute.xml
index e191c8cafa4..b3cf6f6d16b 100644
--- a/xml/System.EnterpriseServices/SecurityRoleAttribute.xml
+++ b/xml/System.EnterpriseServices/SecurityRoleAttribute.xml
@@ -46,7 +46,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
@@ -89,7 +89,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Security/CPP/employeeinformation.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Security/VB/employeeinformation.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/AccessChecksLevelOption/Overview/employeeinformation.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/ServicedComponent.xml b/xml/System.EnterpriseServices/ServicedComponent.xml
index bf1aa4ffd84..72dea59b19e 100644
--- a/xml/System.EnterpriseServices/ServicedComponent.xml
+++ b/xml/System.EnterpriseServices/ServicedComponent.xml
@@ -116,7 +116,7 @@ regsvcs Calculator.dll
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -152,7 +152,7 @@ regsvcs Calculator.dll
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -212,7 +212,7 @@ regsvcs Calculator.dll
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Pooling/CPP/inspector.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Pooling/VB/inspector.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/ApplicationId/inspector.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/SharedProperty.xml b/xml/System.EnterpriseServices/SharedProperty.xml
index 0d9ad92b7f7..37e03f763ff 100644
--- a/xml/System.EnterpriseServices/SharedProperty.xml
+++ b/xml/System.EnterpriseServices/SharedProperty.xml
@@ -31,7 +31,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/CPP/receiptcounterclass.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -65,7 +65,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/CPP/receiptcounterclass.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/SharedPropertyGroup.xml b/xml/System.EnterpriseServices/SharedPropertyGroup.xml
index 298d8082bf3..5a4dc2c35d2 100644
--- a/xml/System.EnterpriseServices/SharedPropertyGroup.xml
+++ b/xml/System.EnterpriseServices/SharedPropertyGroup.xml
@@ -36,7 +36,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/CPP/receiptcounterclass.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -76,7 +76,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/CPP/receiptcounterclass.cpp" id="Snippet21":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb" id="Snippet21":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb" id="Snippet21":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/SharedPropertyGroupManager.xml b/xml/System.EnterpriseServices/SharedPropertyGroupManager.xml
index b78a156bc51..b9c645bbf07 100644
--- a/xml/System.EnterpriseServices/SharedPropertyGroupManager.xml
+++ b/xml/System.EnterpriseServices/SharedPropertyGroupManager.xml
@@ -35,7 +35,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/CPP/receiptcounterclass.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -65,7 +65,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/CPP/receiptcounterclass.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -119,7 +119,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/CPP/receiptcounterclass.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_SharedProperties/VB/receiptcounterclass.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SharedProperty/Overview/receiptcounterclass.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/SynchronizationAttribute.xml b/xml/System.EnterpriseServices/SynchronizationAttribute.xml
index 74641d8e3fe..85586808b03 100644
--- a/xml/System.EnterpriseServices/SynchronizationAttribute.xml
+++ b/xml/System.EnterpriseServices/SynchronizationAttribute.xml
@@ -43,7 +43,7 @@
  The following code example demonstrates the use of the <xref:System.EnterpriseServices.SynchronizationAttribute> type.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationAttribute/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
@@ -86,7 +86,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.SynchronizationAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -119,7 +119,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.SynchronizationAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -152,7 +152,7 @@
  The following code example gets the value of a `Synchronization` attribute's <xref:System.EnterpriseServices.SynchronizationAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SynchronizationAttribute/Overview/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/SynchronizationOption.xml b/xml/System.EnterpriseServices/SynchronizationOption.xml
index 2f4438265a0..120d508c658 100644
--- a/xml/System.EnterpriseServices/SynchronizationOption.xml
+++ b/xml/System.EnterpriseServices/SynchronizationOption.xml
@@ -30,7 +30,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesSynchronizationOption/cpp/class1.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/SynchronizationOption/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesSynchronizationOption/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/SynchronizationOption/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/TransactionAttribute.xml b/xml/System.EnterpriseServices/TransactionAttribute.xml
index b88d3d02489..700b75cf754 100644
--- a/xml/System.EnterpriseServices/TransactionAttribute.xml
+++ b/xml/System.EnterpriseServices/TransactionAttribute.xml
@@ -42,7 +42,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Transaction/CPP/transaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/Overview/transaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/transaction.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/transaction.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -80,7 +80,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.TransactionAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/TransactionAttribute/.ctor/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionAttribute/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/TransactionAttribute/.ctor/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -113,7 +113,7 @@
  The following code example creates a new <xref:System.EnterpriseServices.TransactionAttribute>.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/TransactionAttribute/.ctor/class1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionAttribute/VB/class1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/TransactionAttribute/.ctor/class1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -146,7 +146,7 @@
  The following code example gets and sets the value of a `Transaction` attribute's <xref:System.EnterpriseServices.TransactionAttribute.Isolation%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/TransactionAttribute/.ctor/class1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionAttribute/VB/class1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/TransactionAttribute/.ctor/class1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -179,7 +179,7 @@
  The following code example gets and sets the value of a `Transaction` attribute's <xref:System.EnterpriseServices.TransactionAttribute.Timeout%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/TransactionAttribute/.ctor/class1.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionAttribute/VB/class1.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/TransactionAttribute/.ctor/class1.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -212,7 +212,7 @@
  The following code example gets the value of a `Transaction` attribute's <xref:System.EnterpriseServices.TransactionAttribute.Value%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/TransactionAttribute/.ctor/class1.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionAttribute/VB/class1.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/TransactionAttribute/.ctor/class1.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.EnterpriseServices/TransactionIsolationLevel.xml b/xml/System.EnterpriseServices/TransactionIsolationLevel.xml
index 4794f7b88e9..e47308987ce 100644
--- a/xml/System.EnterpriseServices/TransactionIsolationLevel.xml
+++ b/xml/System.EnterpriseServices/TransactionIsolationLevel.xml
@@ -30,7 +30,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesTransactionIsolationLevel/cpp/class1.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/TransactionIsolationLevel/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionIsolationLevel/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/TransactionIsolationLevel/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/TransactionOption.xml b/xml/System.EnterpriseServices/TransactionOption.xml
index 564eee3fd57..2fa55170569 100644
--- a/xml/System.EnterpriseServices/TransactionOption.xml
+++ b/xml/System.EnterpriseServices/TransactionOption.xml
@@ -35,7 +35,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServicesTransactionOption/cpp/class1.cpp" id="Snippet0":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/TransactionOption/Overview/class1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServicesTransactionOption/VB/class1.vb" id="Snippet0":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/TransactionOption/Overview/class1.vb" id="Snippet0":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.EnterpriseServices/TransactionVote.xml b/xml/System.EnterpriseServices/TransactionVote.xml
index 9b10b76ba1b..6b617cd9b83 100644
--- a/xml/System.EnterpriseServices/TransactionVote.xml
+++ b/xml/System.EnterpriseServices/TransactionVote.xml
@@ -39,7 +39,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/EnterpriseServices_Transaction/CPP/transaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.EnterpriseServices/ContextUtil/Overview/transaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/EnterpriseServices_Transaction/VB/transaction.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.EnterpriseServices/ContextUtil/Overview/transaction.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/AcknowledgeTypes.xml b/xml/System.Messaging/AcknowledgeTypes.xml
index 3d35d0ff529..975bc85133d 100644
--- a/xml/System.Messaging/AcknowledgeTypes.xml
+++ b/xml/System.Messaging/AcknowledgeTypes.xml
@@ -41,7 +41,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/Acknowledgment.xml b/xml/System.Messaging/Acknowledgment.xml
index 14ed5736692..1d65d88e274 100644
--- a/xml/System.Messaging/Acknowledgment.xml
+++ b/xml/System.Messaging/Acknowledgment.xml
@@ -35,7 +35,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/BinaryMessageFormatter.xml b/xml/System.Messaging/BinaryMessageFormatter.xml
index c50514d23f3..8b4feae8012 100644
--- a/xml/System.Messaging/BinaryMessageFormatter.xml
+++ b/xml/System.Messaging/BinaryMessageFormatter.xml
@@ -40,7 +40,7 @@
 ## Examples  
 
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagingBinaryFormatter/VB/message_binaryformatter.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/DefaultPropertiesToSend.xml b/xml/System.Messaging/DefaultPropertiesToSend.xml
index 59fb0e24e29..4f1a1b7e56d 100644
--- a/xml/System.Messaging/DefaultPropertiesToSend.xml
+++ b/xml/System.Messaging/DefaultPropertiesToSend.xml
@@ -40,7 +40,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.DefaultPropertiesToSend/CPP/mqdefaultpropertiestosend.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/DefaultPropertiesToSend/Overview/mqdefaultpropertiestosend.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.DefaultPropertiesToSend/VB/mqdefaultpropertiestosend.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/DefaultPropertiesToSend/Overview/mqdefaultpropertiestosend.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/Message.xml b/xml/System.Messaging/Message.xml
index 414f7b111e3..b15325c78aa 100644
--- a/xml/System.Messaging/Message.xml
+++ b/xml/System.Messaging/Message.xml
@@ -53,13 +53,13 @@
  The following code example demonstrates formatting a message body using <xref:System.Messaging.BinaryMessageFormatter>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagingBinaryFormatter/VB/message_binaryformatter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.vb" id="Snippet1":::
 
  The following code example demonstrates formatting a message body using <xref:System.Messaging.XmlMessageFormatter>.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Body/CPP/message_sendreceive.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/Overview/message_sendreceive.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -149,7 +149,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/CPP/message_defaultandpriority.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/.ctor/message_defaultandpriority.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -232,7 +232,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Body/CPP/message_sendreceive.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/Overview/message_sendreceive.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@
 ## Examples
 
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagingBinaryFormatter/VB/message_binaryformatter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -375,7 +375,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -495,7 +495,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -906,7 +906,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/CPP/message_defaultandpriority.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/.ctor/message_defaultandpriority.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1190,7 +1190,7 @@ if (myObject is float) {
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1522,13 +1522,13 @@ if (myObject is float) {
  The following code example demonstrates formatting a message body using <xref:System.Messaging.BinaryMessageFormatter>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagingBinaryFormatter/VB/message_binaryformatter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.vb" id="Snippet1":::
 
  The following code example demonstrates formatting a message body using <xref:System.Messaging.XmlMessageFormatter>.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Body/CPP/message_sendreceive.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/Overview/message_sendreceive.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1643,7 +1643,7 @@ if (myObject is float) {
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2030,7 +2030,7 @@ if (myObject is float) {
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/CPP/message_defaultandpriority.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/.ctor/message_defaultandpriority.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Messaging/MessageEnumerator.xml b/xml/System.Messaging/MessageEnumerator.xml
index 7cb3cfec586..2f61d40ef5e 100644
--- a/xml/System.Messaging/MessageEnumerator.xml
+++ b/xml/System.Messaging/MessageEnumerator.xml
@@ -50,7 +50,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetMessageEnumerator/CPP/mqgetmessageenumerator.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageEnumerator/Overview/mqgetmessageenumerator.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageEnumerator/VB/mqgetmessageenumerator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageEnumerator/Overview/mqgetmessageenumerator.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/MessagePriority.xml b/xml/System.Messaging/MessagePriority.xml
index 6a9c77ade57..461e3aa0940 100644
--- a/xml/System.Messaging/MessagePriority.xml
+++ b/xml/System.Messaging/MessagePriority.xml
@@ -35,7 +35,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/CPP/message_defaultandpriority.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/.ctor/message_defaultandpriority.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/MessagePropertyFilter.xml b/xml/System.Messaging/MessagePropertyFilter.xml
index a56e0022c38..4efbb388c2b 100644
--- a/xml/System.Messaging/MessagePropertyFilter.xml
+++ b/xml/System.Messaging/MessagePropertyFilter.xml
@@ -53,7 +53,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/CPP/message_defaultandpriority.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/.ctor/message_defaultandpriority.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -204,7 +204,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -799,7 +799,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1622,7 +1622,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/CPP/message_defaultandpriority.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/.ctor/message_defaultandpriority.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.DefaultPropertiesToSend/VB/message_defaultandpriority.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/.ctor/message_defaultandpriority.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Messaging/MessageQueue.xml b/xml/System.Messaging/MessageQueue.xml
index f53c89c3686..9bc06a61f4a 100644
--- a/xml/System.Messaging/MessageQueue.xml
+++ b/xml/System.Messaging/MessageQueue.xml
@@ -81,13 +81,13 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Path/CPP/mqpath.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Overview/mqpath.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Path/VB/mqpath.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqpath.vb" id="Snippet1":::
 
  The following code example sends a message to a queue, and receives a message from a queue, using an application-specific class called `Order`.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Receive_noparms/CPP/mqreceive_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Overview/mqreceive_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_noparms/VB/mqreceive_noparms.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqreceive_noparms.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -239,7 +239,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Path/CPP/mqpath.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Overview/mqpath.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Path/VB/mqpath.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqpath.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -332,7 +332,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ctor_PathSharedModeDenyReceive/CPP/mqctor_denysharedreceive.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/.ctor/mqctor_denysharedreceive.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ctor_PathSharedModeDenyReceive/VB/mqctor_denysharedreceive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/.ctor/mqctor_denysharedreceive.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -659,7 +659,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/CPP/mqbeginpeek_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/VB/mqbeginpeek_noparms.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -733,7 +733,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginPeek_timeout/CPP/mqbeginpeek_timeout.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_timeout/VB/mqbeginpeek_timeout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -817,7 +817,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginPeek_TimeSpanStateObject/CPP/mqbeginpeek_timeoutstateobject.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeoutstateobject.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_TimeSpanStateObject/VB/mqbeginpeek_timeoutstateobject.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_timeoutstateobject.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1055,13 +1055,13 @@ myMessageQueue.BeginTransaction();
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/CPP/mqbeginreceive_noparms_mre.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_mre.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/mqbeginreceive_noparms_mre.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_mre.vb" id="Snippet1":::
 
  The following code example queues asynchronous requests. The call to <xref:System.Messaging.MessageQueue.BeginReceive%2A> uses the <xref:System.IAsyncResult.AsyncWaitHandle%2A> in its return value. The `Main` routine waits for all asynchronous operations to be completed before exiting.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/CPP/mqbeginreceive_noparms_wh.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_wh.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/mqbeginreceive_noparms_wh.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_wh.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1719,7 +1719,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Close/CPP/mqclose.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Close/mqclose.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Close/VB/mqclose.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Close/mqclose.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1789,7 +1789,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Create_path/CPP/mqcreate.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Create/mqcreate.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Create_path/VB/mqcreate.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Create/mqcreate.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1861,7 +1861,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Create_PathTransactional/CPP/mqcreate_transactional.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Create/mqcreate_transactional.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Create_PathTransactional/VB/mqcreate_transactional.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Create/mqcreate_transactional.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2042,7 +2042,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.DefaultPropertiesToSend/CPP/mqdefaultpropertiestosend.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/DefaultPropertiesToSend/Overview/mqdefaultpropertiestosend.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.DefaultPropertiesToSend/VB/mqdefaultpropertiestosend.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/DefaultPropertiesToSend/Overview/mqdefaultpropertiestosend.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2113,7 +2113,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ExistsDelete/CPP/mqexistsdelete.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Delete/mqexistsdelete.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ExistsDelete/VB/mqexistsdelete.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Delete/mqexistsdelete.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2400,7 +2400,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/CPP/mqbeginpeek_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/VB/mqbeginpeek_noparms.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2463,7 +2463,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/CPP/mqbeginreceive_noparms_mre.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_mre.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginReceive_noparms_combined/VB/mqbeginreceive_noparms_mre.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginReceive/mqbeginreceive_noparms_mre.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2542,7 +2542,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ExistsDelete/CPP/mqexistsdelete.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Delete/mqexistsdelete.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ExistsDelete/VB/mqexistsdelete.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Delete/mqexistsdelete.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2689,13 +2689,13 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
  The following code example demonstrates formatting a message body using <xref:System.Messaging.BinaryMessageFormatter>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagingBinaryFormatter/VB/message_binaryformatter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/BinaryMessageFormatter/Overview/message_binaryformatter.vb" id="Snippet1":::
 
  The following code example demonstrates formatting a message body using <xref:System.Messaging.XmlMessageFormatter>.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Body/CPP/message_sendreceive.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/Overview/message_sendreceive.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2932,7 +2932,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetMessageEnumerator/CPP/mqgetmessageenumerator.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageEnumerator/Overview/mqgetmessageenumerator.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageEnumerator/VB/mqgetmessageenumerator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageEnumerator/Overview/mqgetmessageenumerator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3046,7 +3046,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_noparms/CPP/mqgetmessagequeueenumerator.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_noparms/VB/mqgetmessagequeueenumerator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3106,7 +3106,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_criteria/CPP/mqgetmessagequeueenumerator_criteria.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator_criteria.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_criteria/VB/mqgetmessagequeueenumerator_criteria.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator_criteria.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3160,7 +3160,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetQueueLists/CPP/mqgetqueuelists.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3225,7 +3225,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetQueueLists/CPP/mqgetqueuelists.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3281,7 +3281,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetQueueLists/CPP/mqgetqueuelists.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3338,7 +3338,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetQueueLists/CPP/mqgetqueuelists.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3396,7 +3396,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetQueueLists/CPP/mqgetqueuelists.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3455,7 +3455,7 @@ myMessageQueue.Send("Text 2."); //Resources are re-acquired.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetQueueLists/CPP/mqgetqueuelists.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetQueueLists/VB/mqgetqueuelists.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetPrivateQueuesByMachine/mqgetqueuelists.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4075,7 +4075,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.MessageReadPropertyFilter/CPP/mqmessagereadpropertyfilter.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/MessageReadPropertyFilter/mqmessagereadpropertyfilter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.MessageReadPropertyFilter/VB/mqmessagereadpropertyfilter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/MessageReadPropertyFilter/mqmessagereadpropertyfilter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4266,7 +4266,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Path/CPP/mqpath.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Overview/mqpath.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Path/VB/mqpath.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqpath.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4342,7 +4342,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Peek_noparms/CPP/mqpeek_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Peek/mqpeek_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Peek_noparms/VB/mqpeek_noparms.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Peek/mqpeek_noparms.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4404,7 +4404,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Peek_timeout/CPP/mqpeek_timeout.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Peek/mqpeek_timeout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Peek_timeout/VB/mqpeek_timeout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Peek/mqpeek_timeout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4535,7 +4535,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4917,7 +4917,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/CPP/mqbeginpeek_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/VB/mqbeginpeek_noparms.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5166,7 +5166,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Receive_noparms/CPP/mqreceive_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Overview/mqreceive_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_noparms/VB/mqreceive_noparms.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Overview/mqreceive_noparms.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5229,7 +5229,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Receive_transaction/CPP/mqreceive_transaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Receive/mqreceive_transaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_transaction/VB/mqreceive_transaction.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_transaction.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5365,7 +5365,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Receive_timeout/CPP/mqreceive_timeout.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Receive/mqreceive_timeout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_timeout/VB/mqreceive_timeout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_timeout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5474,7 +5474,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Receive_TimeoutTransaction/CPP/mqreceive_timeouttransaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Receive/mqreceive_timeouttransaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Receive_TimeoutTransaction/VB/mqreceive_timeouttransaction.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Receive/mqreceive_timeouttransaction.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5778,7 +5778,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Acknowledgment/CPP/message_acknowledgment.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Acknowledgment/VB/message_acknowledgment.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/AcknowledgeTypes/Overview/message_acknowledgment.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6889,7 +6889,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/CPP/mqreceivecompletedeventhandler.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/VB/mqreceivecompletedeventhandler.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7063,7 +7063,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Send_obj/CPP/mqsend_generic.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Send/mqsend_generic.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Send_obj/VB/mqsend_generic.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Send/mqsend_generic.vb" id="Snippet1":::
 
  The following code example sends an application-defined `Order` class to a queue and then receives a message from that queue.
 
@@ -7143,7 +7143,7 @@ The name of the computer is not valid, possibly because the syntax is incorrect.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.Send_ObjectTransaction/CPP/mqsend_objtransaction.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Send/mqsend_objtransaction.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.Send_ObjectTransaction/VB/mqsend_objtransaction.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Send/mqsend_objtransaction.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Messaging/MessageQueueCriteria.xml b/xml/System.Messaging/MessageQueueCriteria.xml
index 9d82cb2b490..3888a85d3ef 100644
--- a/xml/System.Messaging/MessageQueueCriteria.xml
+++ b/xml/System.Messaging/MessageQueueCriteria.xml
@@ -38,7 +38,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_criteria/CPP/mqgetmessagequeueenumerator_criteria.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator_criteria.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_criteria/VB/mqgetmessagequeueenumerator_criteria.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator_criteria.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/MessageQueueEnumerator.xml b/xml/System.Messaging/MessageQueueEnumerator.xml
index 8d5004ed6fe..cbd667b2704 100644
--- a/xml/System.Messaging/MessageQueueEnumerator.xml
+++ b/xml/System.Messaging/MessageQueueEnumerator.xml
@@ -41,7 +41,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_noparms/CPP/mqgetmessagequeueenumerator.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.GetMessageQueueEnumerator_noparms/VB/mqgetmessagequeueenumerator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/GetMessageQueueEnumerator/mqgetmessagequeueenumerator.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/MessageQueueErrorCode.xml b/xml/System.Messaging/MessageQueueErrorCode.xml
index 19d15dacf65..55fe37b6351 100644
--- a/xml/System.Messaging/MessageQueueErrorCode.xml
+++ b/xml/System.Messaging/MessageQueueErrorCode.xml
@@ -29,7 +29,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ExistsDelete/CPP/mqexistsdelete.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Delete/mqexistsdelete.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ExistsDelete/VB/mqexistsdelete.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Delete/mqexistsdelete.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/MessageQueueException.xml b/xml/System.Messaging/MessageQueueException.xml
index 3f05e202512..051dc718064 100644
--- a/xml/System.Messaging/MessageQueueException.xml
+++ b/xml/System.Messaging/MessageQueueException.xml
@@ -45,7 +45,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ExistsDelete/CPP/mqexistsdelete.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/Delete/mqexistsdelete.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ExistsDelete/VB/mqexistsdelete.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/Delete/mqexistsdelete.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/PeekCompletedEventArgs.xml b/xml/System.Messaging/PeekCompletedEventArgs.xml
index 98305689331..6880fb409b4 100644
--- a/xml/System.Messaging/PeekCompletedEventArgs.xml
+++ b/xml/System.Messaging/PeekCompletedEventArgs.xml
@@ -34,7 +34,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/CPP/mqbeginpeek_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/VB/mqbeginpeek_noparms.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/PeekCompletedEventHandler.xml b/xml/System.Messaging/PeekCompletedEventHandler.xml
index bb718f62b0d..22604b0fcbb 100644
--- a/xml/System.Messaging/PeekCompletedEventHandler.xml
+++ b/xml/System.Messaging/PeekCompletedEventHandler.xml
@@ -38,7 +38,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/CPP/mqbeginpeek_noparms.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.BeginPeek_noparms/VB/mqbeginpeek_noparms.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/BeginPeek/mqbeginpeek_noparms.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/ReceiveCompletedEventArgs.xml b/xml/System.Messaging/ReceiveCompletedEventArgs.xml
index 59942cf8eaf..69923643393 100644
--- a/xml/System.Messaging/ReceiveCompletedEventArgs.xml
+++ b/xml/System.Messaging/ReceiveCompletedEventArgs.xml
@@ -34,7 +34,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/CPP/mqreceivecompletedeventhandler.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/VB/mqreceivecompletedeventhandler.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/ReceiveCompletedEventHandler.xml b/xml/System.Messaging/ReceiveCompletedEventHandler.xml
index b045c9c6e87..b4082767a37 100644
--- a/xml/System.Messaging/ReceiveCompletedEventHandler.xml
+++ b/xml/System.Messaging/ReceiveCompletedEventHandler.xml
@@ -38,7 +38,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/CPP/mqreceivecompletedeventhandler.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageQueue.ReceiveCompleted/VB/mqreceivecompletedeventhandler.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/MessageQueue/ReceiveCompleted/mqreceivecompletedeventhandler.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Messaging/XmlMessageFormatter.xml b/xml/System.Messaging/XmlMessageFormatter.xml
index a42ef711ec6..690676d3259 100644
--- a/xml/System.Messaging/XmlMessageFormatter.xml
+++ b/xml/System.Messaging/XmlMessageFormatter.xml
@@ -53,13 +53,13 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/XmlMessageFormatter/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source.vb" id="Snippet1":::
 
  The following code example represents the order class that provides a schema for the order objects that the application on the server receives and deserializes.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/CPP/source2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/XmlMessageFormatter/Overview/source2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source2.vb" id="Snippet2":::
 
  Any client application that interacts with the application on the server must send messages to the server by serializing information in a locally defined order class into the message body. The locally defined order class must have the same schema as the server-defined order class into which the application on the server will attempt to deserialize the message body. The XSD.exe utility lets the manager of the application on the server create and distribute the schema the client must use to serialize messages going to the server.
 
@@ -69,7 +69,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/CPP/source3.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/XmlMessageFormatter/Overview/source3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlMessageFormatter Example/VB/source3.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/XmlMessageFormatter/Overview/source3.vb" id="Snippet3":::
 
  After the schema is generated from the order class on the server, you can modify the class. Unless the schema changes, you do not need to redistribute the schema. After you have distributed the schema and generated a client-side order class, that client class can also be modified independently of the server's order class, as long as the schema itself is not modified. The two classes have become loosely coupled.
 
@@ -159,7 +159,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Body/CPP/message_sendreceive.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/Overview/message_sendreceive.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -455,7 +455,7 @@ TargetTypes = new Type[]{typeof(MyClass)}
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message.Body/CPP/message_sendreceive.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Messaging/Message/Overview/message_sendreceive.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message.Body/VB/message_sendreceive.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Messaging/Message/Overview/message_sendreceive.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Mail/MailAddress.xml b/xml/System.Net.Mail/MailAddress.xml
index e2fada79d42..344f47d5854 100644
--- a/xml/System.Net.Mail/MailAddress.xml
+++ b/xml/System.Net.Mail/MailAddress.xml
@@ -351,7 +351,7 @@ The following code example demonstrates sending an email message by using the <x
  The following code example uses this constructor to create <xref:System.Net.Mail.MailAddress> instances for the sender of an email message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Mail/MailMessage.xml b/xml/System.Net.Mail/MailMessage.xml
index b9803064ad1..4df91fa9db4 100644
--- a/xml/System.Net.Mail/MailMessage.xml
+++ b/xml/System.Net.Mail/MailMessage.xml
@@ -110,7 +110,7 @@
  The following code example demonstrates creating and sending an email message that includes an attachment.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet6":::
 
  ]]></format>
     </remarks>
@@ -218,7 +218,7 @@
  The following code example demonstrates calling this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -283,7 +283,7 @@
  The following code example demonstrates calling this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
  The following code example demonstrates calling this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -453,7 +453,7 @@
  The following code example demonstrates creating and sending an email message with a plain text and an HTML alternate view.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -510,7 +510,7 @@
  The following code example demonstrates creating and sending an email message with an attachment.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -567,7 +567,7 @@
  The following code example demonstrates adding an address to the <xref:System.Net.Mail.MailMessage.Bcc%2A> address collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -624,7 +624,7 @@
  The following code example demonstrates setting the <xref:System.Net.Mail.MailMessage.Body%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -696,7 +696,7 @@
  The following code example demonstrates creating a mail message that uses UTF8 encoding.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -794,7 +794,7 @@
  The following code example demonstrates adding an address to the <xref:System.Net.Mail.MailMessage.CC%2A> address collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1035,7 +1035,7 @@
  The following code example demonstrates setting a value for the <xref:System.Net.Mail.MailMessage.From%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1142,7 +1142,7 @@
  The following code example demonstrates displaying the headers for a mail message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet24":::
 
  ]]></format>
         </remarks>
@@ -1515,7 +1515,7 @@
  The following code example demonstrates setting the <xref:System.Net.Mail.MailMessage.Subject%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1577,7 +1577,7 @@
  The following code example demonstrates setting the <xref:System.Net.Mail.MailMessage.SubjectEncoding%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1636,7 +1636,7 @@
  The following code example demonstrates setting the <xref:System.Net.Mail.MailMessage.To%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/Attachment/Overview/mail.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLMailSync/vb/mail.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailMessage/Overview/mail.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Mail/SendCompletedEventHandler.xml b/xml/System.Net.Mail/SendCompletedEventHandler.xml
index b297ef22eaa..a743d77b7ae 100644
--- a/xml/System.Net.Mail/SendCompletedEventHandler.xml
+++ b/xml/System.Net.Mail/SendCompletedEventHandler.xml
@@ -62,7 +62,7 @@
  The following code example demonstrates sending an email message asynchronously. It uses a <xref:System.Net.Mail.SendCompletedEventHandler> to invoke the `SendCompletedCallback` method to handle <xref:System.Net.Mail.SmtpClient.SendCompleted> events.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.Mail/SmtpClient.xml b/xml/System.Net.Mail/SmtpClient.xml
index 4623bea8dc6..dedd7429a9e 100644
--- a/xml/System.Net.Mail/SmtpClient.xml
+++ b/xml/System.Net.Mail/SmtpClient.xml
@@ -115,7 +115,7 @@ To include an attachment with an email message, first create the attachment by u
 The following code example demonstrates sending an email message asynchronously.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -1368,7 +1368,7 @@ The following code example demonstrates sending an email message asynchronously.
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1611,7 +1611,7 @@ The following code example demonstrates sending an email message asynchronously.
  The following code example demonstrates sending an email message asynchronously. The user has the option to cancel the mail if it has not been sent.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1670,7 +1670,7 @@ The following code example demonstrates sending an email message asynchronously.
  The following code example demonstrates sending an email message asynchronously.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Mail/MailAddress/.ctor/mailasync.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclMailASync/vb/mailasync.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Mail/MailAddress/.ctor/mailasync.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/DuplicateAddressDetectionState.xml b/xml/System.Net.NetworkInformation/DuplicateAddressDetectionState.xml
index bf6aba9bab5..a2ffcc8adae 100644
--- a/xml/System.Net.NetworkInformation/DuplicateAddressDetectionState.xml
+++ b/xml/System.Net.NetworkInformation/DuplicateAddressDetectionState.xml
@@ -56,7 +56,7 @@
  The following code example determines unicast address information.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet45":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet45":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet45":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.NetworkInformation/IPAddressInformation.xml b/xml/System.Net.NetworkInformation/IPAddressInformation.xml
index de763f31e0d..0a1f758d6d9 100644
--- a/xml/System.Net.NetworkInformation/IPAddressInformation.xml
+++ b/xml/System.Net.NetworkInformation/IPAddressInformation.xml
@@ -61,7 +61,7 @@
  The following code example displays the Domain Name Service (DNS) addresses for the network interfaces on the local computer.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet42":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet42":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet42":::
 
  ]]></format>
     </remarks>
@@ -167,7 +167,7 @@
  The following code example displays the multicast addresses for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet44":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet44":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet44":::
 
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
  The following code example displays the anycast addresses for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet43":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet43":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet43":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/IPGlobalProperties.xml b/xml/System.Net.NetworkInformation/IPGlobalProperties.xml
index b33df8c1977..7b4ae87f909 100644
--- a/xml/System.Net.NetworkInformation/IPGlobalProperties.xml
+++ b/xml/System.Net.NetworkInformation/IPGlobalProperties.xml
@@ -61,7 +61,7 @@
  The following code example displays information about the local computer using an instance of this class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet15":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.NetworkInformation/IPGlobalStatistics.xml b/xml/System.Net.NetworkInformation/IPGlobalStatistics.xml
index 57dd4a535de..25ea7514f2e 100644
--- a/xml/System.Net.NetworkInformation/IPGlobalStatistics.xml
+++ b/xml/System.Net.NetworkInformation/IPGlobalStatistics.xml
@@ -170,7 +170,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -232,7 +232,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -441,7 +441,7 @@
  The following code example displays statistics for outbound IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -503,7 +503,7 @@
  The following code example displays statistics for outbound IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -565,7 +565,7 @@
  The following code example displays statistics for outbound IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -627,7 +627,7 @@
  The following code example displays statistics for outbound IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -689,7 +689,7 @@
  The following code example displays reassembly statistics for IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -751,7 +751,7 @@
  The following code example displays reassembly statistics for IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -813,7 +813,7 @@
  The following code example displays reassembly statistics for IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -875,7 +875,7 @@
  The following code example displays reassembly statistics for IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -937,7 +937,7 @@
  The following code example displays reassembly statistics for IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -999,7 +999,7 @@
  The following code example displays reassembly statistics for IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -1061,7 +1061,7 @@
  The following code example displays statistics for received IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1123,7 +1123,7 @@
  The following code example displays statistics for received IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1185,7 +1185,7 @@
  The following code example displays statistics for received IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1247,7 +1247,7 @@
  The following code example displays statistics for received IP packets.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1309,7 +1309,7 @@
  The following code example displays statistics for received IP packets with errors.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -1371,7 +1371,7 @@
  The following code example displays statistics for received IP packets with errors.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -1433,7 +1433,7 @@
  The following code example displays statistics for received IP packets with errors.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/IPInterfaceProperties.xml b/xml/System.Net.NetworkInformation/IPInterfaceProperties.xml
index 76beac4f75e..f206192ea5f 100644
--- a/xml/System.Net.NetworkInformation/IPInterfaceProperties.xml
+++ b/xml/System.Net.NetworkInformation/IPInterfaceProperties.xml
@@ -174,7 +174,7 @@
  The following code example displays the anycast addresses for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet43":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet43":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet43":::
 
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
  The following code example displays the DHCP address information for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet46":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet46":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet46":::
 
  ]]></format>
         </remarks>
@@ -314,7 +314,7 @@
  The following code example displays the DNS addresses for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet42":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet42":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet42":::
 
  ]]></format>
         </remarks>
@@ -376,7 +376,7 @@
  The following code example displays the DNS suffix.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet41":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet41":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet41":::
 
  ]]></format>
         </remarks>
@@ -438,7 +438,7 @@
  The following code example displays the gateway addresses for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet47":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet47":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet47":::
 
  ]]></format>
         </remarks>
@@ -619,7 +619,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet41":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet41":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet41":::
 
  ]]></format>
         </remarks>
@@ -682,7 +682,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet41":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet41":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet41":::
 
  ]]></format>
         </remarks>
@@ -738,7 +738,7 @@
  The following code example displays the multicast addresses for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet44":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet44":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet44":::
 
  ]]></format>
         </remarks>
@@ -794,7 +794,7 @@
  The following code example displays the unicast addresses for the network interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet45":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet45":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet45":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/IPv4InterfaceProperties.xml b/xml/System.Net.NetworkInformation/IPv4InterfaceProperties.xml
index 54dd3029ea4..03dbca2448c 100644
--- a/xml/System.Net.NetworkInformation/IPv4InterfaceProperties.xml
+++ b/xml/System.Net.NetworkInformation/IPv4InterfaceProperties.xml
@@ -57,7 +57,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPInterfaceProperties.GetIPv4Properties%2A> object and displays its data.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
     </remarks>
@@ -163,7 +163,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -226,7 +226,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -289,7 +289,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -352,7 +352,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -419,7 +419,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -475,7 +475,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -542,7 +542,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/IPv6InterfaceProperties.xml b/xml/System.Net.NetworkInformation/IPv6InterfaceProperties.xml
index 74d16e7de5c..23ce8f65011 100644
--- a/xml/System.Net.NetworkInformation/IPv6InterfaceProperties.xml
+++ b/xml/System.Net.NetworkInformation/IPv6InterfaceProperties.xml
@@ -57,7 +57,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPInterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet49":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet49":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet49":::
 
  ]]></format>
     </remarks>
@@ -225,7 +225,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv6InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet49":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet49":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet49":::
 
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The following code example gets an <xref:System.Net.NetworkInformation.IPv6InterfaceProperties> object and displays its data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet49":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet49":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet49":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/IcmpV4Statistics.xml b/xml/System.Net.NetworkInformation/IcmpV4Statistics.xml
index 4a4358c1d81..76d27af0289 100644
--- a/xml/System.Net.NetworkInformation/IcmpV4Statistics.xml
+++ b/xml/System.Net.NetworkInformation/IcmpV4Statistics.xml
@@ -162,7 +162,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
@@ -218,7 +218,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
@@ -330,7 +330,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
@@ -394,7 +394,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -456,7 +456,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -512,7 +512,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -568,7 +568,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -624,7 +624,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -680,7 +680,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -749,7 +749,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -818,7 +818,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
@@ -892,7 +892,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -966,7 +966,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -1022,7 +1022,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet27":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet27":::
 
  ]]></format>
         </remarks>
@@ -1078,7 +1078,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet27":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet27":::
 
  ]]></format>
         </remarks>
@@ -1134,7 +1134,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet25":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet25":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet25":::
 
  ]]></format>
         </remarks>
@@ -1190,7 +1190,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet25":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet25":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet25":::
 
  ]]></format>
         </remarks>
@@ -1246,7 +1246,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet24":::
 
  ]]></format>
         </remarks>
@@ -1302,7 +1302,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet24":::
 
  ]]></format>
         </remarks>
@@ -1358,7 +1358,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet26":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet26":::
 
  ]]></format>
         </remarks>
@@ -1414,7 +1414,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet26":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet26":::
 
  ]]></format>
         </remarks>
@@ -1470,7 +1470,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -1526,7 +1526,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -1582,7 +1582,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -1638,7 +1638,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/IcmpV6Statistics.xml b/xml/System.Net.NetworkInformation/IcmpV6Statistics.xml
index a799f4363c9..c436244c49c 100644
--- a/xml/System.Net.NetworkInformation/IcmpV6Statistics.xml
+++ b/xml/System.Net.NetworkInformation/IcmpV6Statistics.xml
@@ -170,7 +170,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet32":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet32":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet32":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet32":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet32":::
 
  ]]></format>
         </remarks>
@@ -290,7 +290,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet30":::
 
  ]]></format>
         </remarks>
@@ -346,7 +346,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet30":::
 
  ]]></format>
         </remarks>
@@ -402,7 +402,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet30":::
 
  ]]></format>
         </remarks>
@@ -458,7 +458,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet30":::
 
  ]]></format>
         </remarks>
@@ -527,7 +527,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet31":::
 
  ]]></format>
         </remarks>
@@ -596,7 +596,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet31":::
 
  ]]></format>
         </remarks>
@@ -652,7 +652,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -708,7 +708,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -764,7 +764,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -820,7 +820,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -876,7 +876,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -932,7 +932,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet34":::
 
  ]]></format>
         </remarks>
@@ -1006,7 +1006,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet33":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet33":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet33":::
 
  ]]></format>
         </remarks>
@@ -1080,7 +1080,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet33":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet33":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet33":::
 
  ]]></format>
         </remarks>
@@ -1136,7 +1136,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -1192,7 +1192,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -1248,7 +1248,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -1304,7 +1304,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet35":::
 
  ]]></format>
         </remarks>
@@ -1360,7 +1360,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet36":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet36":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet36":::
 
  ]]></format>
         </remarks>
@@ -1416,7 +1416,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet36":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet36":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet36":::
 
  ]]></format>
         </remarks>
@@ -1472,7 +1472,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet39":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet39":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet39":::
 
  ]]></format>
         </remarks>
@@ -1528,7 +1528,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet39":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet39":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet39":::
 
  ]]></format>
         </remarks>
@@ -1584,7 +1584,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet37":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet37":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet37":::
 
  ]]></format>
         </remarks>
@@ -1640,7 +1640,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet37":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet37":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet37":::
 
  ]]></format>
         </remarks>
@@ -1696,7 +1696,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet40":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet40":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet40":::
 
  ]]></format>
         </remarks>
@@ -1752,7 +1752,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet40":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet40":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet40":::
 
  ]]></format>
         </remarks>
@@ -1808,7 +1808,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet40":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet40":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet40":::
 
  ]]></format>
         </remarks>
@@ -1864,7 +1864,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet40":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet40":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet40":::
 
  ]]></format>
         </remarks>
@@ -1920,7 +1920,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet38":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet38":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet38":::
 
  ]]></format>
         </remarks>
@@ -1976,7 +1976,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet38":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet38":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet38":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/NetworkChange.xml b/xml/System.Net.NetworkInformation/NetworkChange.xml
index 644b5592ef3..46243d2b12d 100644
--- a/xml/System.Net.NetworkInformation/NetworkChange.xml
+++ b/xml/System.Net.NetworkInformation/NetworkChange.xml
@@ -77,7 +77,7 @@
  The following code example listens for address changes and displays the status of network interfaces when a <xref:System.Net.NetworkInformation.NetworkChange.NetworkAddressChanged> event occurs.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/NetworkChange/Overview/changed.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNetAddressChanged1/VB/changed.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/NetworkChange/Overview/changed.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -193,7 +193,7 @@
  The following code example listens for address changes and displays the status of network interfaces when a <xref:System.Net.NetworkInformation.NetworkChange.NetworkAddressChanged> event occurs.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/NetworkChange/Overview/changed.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNetAddressChanged1/VB/changed.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/NetworkChange/Overview/changed.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/NetworkInformationAccess.xml b/xml/System.Net.NetworkInformation/NetworkInformationAccess.xml
index 9ed99aff52d..44ac2a0fd38 100644
--- a/xml/System.Net.NetworkInformation/NetworkInformationAccess.xml
+++ b/xml/System.Net.NetworkInformation/NetworkInformationAccess.xml
@@ -49,7 +49,7 @@
  The following code example creates a permission that controls Read access to network information.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/NetworkInformationAccess/Overview/permissionexample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNetworkInfoPerms/VB/permissionexample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/NetworkInformationAccess/Overview/permissionexample.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.NetworkInformation/NetworkInterface.xml b/xml/System.Net.NetworkInformation/NetworkInterface.xml
index bffc6dfc1fd..11bd39ab0cc 100644
--- a/xml/System.Net.NetworkInformation/NetworkInterface.xml
+++ b/xml/System.Net.NetworkInformation/NetworkInterface.xml
@@ -255,7 +255,7 @@
  The following code example displays Domain Name Service (DNS) configuration information for the local computer's network adapters.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet41":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet41":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet41":::
 
  ]]></format>
         </remarks>
@@ -320,7 +320,7 @@
  The following code example displays information for the local computer's network adapters that support IPv4.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -552,7 +552,7 @@
  The following code example displays the physical addresses of all interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet51":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet51":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet51":::
 
  ]]></format>
         </remarks>
@@ -718,7 +718,7 @@
  The following code example displays a summary for all interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet51":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet51":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet51":::
 
  ]]></format>
         </remarks>
@@ -906,7 +906,7 @@
  The following example displays type information for all interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet51":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet51":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet51":::
 
  ]]></format>
         </remarks>
@@ -1029,7 +1029,7 @@
  The following code example demonstrates displaying the speed of interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -1092,7 +1092,7 @@
  The following code example displays statistics for IPV4 interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
         </remarks>
@@ -1155,7 +1155,7 @@
  The following code example displays a summary for all interfaces on the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet51":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet51":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet51":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/NetworkInterfaceComponent.xml b/xml/System.Net.NetworkInformation/NetworkInterfaceComponent.xml
index 874cb069e08..43dd3f96df6 100644
--- a/xml/System.Net.NetworkInformation/NetworkInterfaceComponent.xml
+++ b/xml/System.Net.NetworkInformation/NetworkInterfaceComponent.xml
@@ -54,7 +54,7 @@
  The following code example checks whether a network interface supports IPv4.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet48":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet48":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet48":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.NetworkInformation/PrefixOrigin.xml b/xml/System.Net.NetworkInformation/PrefixOrigin.xml
index bcba9bb5455..98f67be21c7 100644
--- a/xml/System.Net.NetworkInformation/PrefixOrigin.xml
+++ b/xml/System.Net.NetworkInformation/PrefixOrigin.xml
@@ -56,7 +56,7 @@
  The following code example displays prefix and suffix information for unicast addresses.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet45":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet45":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet45":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.NetworkInformation/SuffixOrigin.xml b/xml/System.Net.NetworkInformation/SuffixOrigin.xml
index 029adada13a..5b8a8eb349a 100644
--- a/xml/System.Net.NetworkInformation/SuffixOrigin.xml
+++ b/xml/System.Net.NetworkInformation/SuffixOrigin.xml
@@ -56,7 +56,7 @@
  The following code example displays prefix and suffix information for unicast addresses.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet45":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet45":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet45":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.NetworkInformation/TcpConnectionInformation.xml b/xml/System.Net.NetworkInformation/TcpConnectionInformation.xml
index 58c0123612a..584f22daf41 100644
--- a/xml/System.Net.NetworkInformation/TcpConnectionInformation.xml
+++ b/xml/System.Net.NetworkInformation/TcpConnectionInformation.xml
@@ -61,7 +61,7 @@
  The following example displays endpoint information for active TCP connections.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -162,7 +162,7 @@
  The following example displays endpoint information for active TCP connections.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.NetworkInformation/TcpState.xml b/xml/System.Net.NetworkInformation/TcpState.xml
index 9b1b0f3a044..7c179b7e0dd 100644
--- a/xml/System.Net.NetworkInformation/TcpState.xml
+++ b/xml/System.Net.NetworkInformation/TcpState.xml
@@ -54,7 +54,7 @@
  The following code example counts the established TCP connections.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.NetworkInformation/TcpStatistics.xml b/xml/System.Net.NetworkInformation/TcpStatistics.xml
index b8eabbd36de..39b05d61a05 100644
--- a/xml/System.Net.NetworkInformation/TcpStatistics.xml
+++ b/xml/System.Net.NetworkInformation/TcpStatistics.xml
@@ -162,7 +162,7 @@
  The following code example displays connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -218,7 +218,7 @@
  The following code example displays connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -269,7 +269,7 @@
  The following code example displays connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -325,7 +325,7 @@
  The following code example displays connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -376,7 +376,7 @@
  The following code example displays connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -432,7 +432,7 @@
  The following code example displays connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -488,7 +488,7 @@
  The following code example displays time-out and maximum connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -544,7 +544,7 @@
  The following code example displays time-out and maximum connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -600,7 +600,7 @@
  The following code example displays time-out and maximum connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -656,7 +656,7 @@
  The following code example displays connection information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -712,7 +712,7 @@
  The following code example displays segment information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -768,7 +768,7 @@
  The following code example displays segment information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -824,7 +824,7 @@
  The following code example displays segment information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -880,7 +880,7 @@
  The following code example displays segment information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLNetInfo2/VB/networkexamples.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.NetworkInformation/DuplicateAddressDetectionState/Overview/networkexamples.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Security/AuthenticatedStream.xml b/xml/System.Net.Security/AuthenticatedStream.xml
index 78a5daa35b3..e4a0888dbad 100644
--- a/xml/System.Net.Security/AuthenticatedStream.xml
+++ b/xml/System.Net.Security/AuthenticatedStream.xml
@@ -63,7 +63,7 @@
 The following example demonstrates displaying the properties of an authenticated stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb" id="Snippet6":::
 
  ]]></format>
     </remarks>
@@ -337,7 +337,7 @@ The following example demonstrates displaying the properties of an authenticated
 The following example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -392,7 +392,7 @@ The following example demonstrates displaying the value of this property.
 The following example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -447,7 +447,7 @@ The following example demonstrates displaying the value of this property.
 The following example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -502,7 +502,7 @@ The following example demonstrates displaying the value of this property.
 The following example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -557,7 +557,7 @@ The following example demonstrates displaying the value of this property.
  The following example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Security/NegotiateStream.xml b/xml/System.Net.Security/NegotiateStream.xml
index c33c59a773c..b3490bd0bae 100644
--- a/xml/System.Net.Security/NegotiateStream.xml
+++ b/xml/System.Net.Security/NegotiateStream.xml
@@ -78,7 +78,7 @@
 The following example demonstrates the client side of a client-server connection that uses the <xref:System.Net.Security.NegotiateStream>. The client authenticates and sends a message to the server asynchronously.
 
 [!code-csharp[NclNegoAsyncClient#0](~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs#0)]
-[!code-vb[NclNegoAsyncClient#0](~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb#0)]
+[!code-vb[NclNegoAsyncClient#0](~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb#0)]
 
 The following code example demonstrates the server side of a client-server connection that uses the <xref:System.Net.Security.NegotiateStream> to authenticate the client and read a message sent by the client.
 
@@ -215,7 +215,7 @@ The following code example demonstrates the server side of a client-server conne
 The following example demonstrates calling this constructor. This code example is part of a larger example provided for the <xref:System.Net.Security.NegotiateStream> class.
 
 [!code-csharp[NclNegoAsyncClient#1](~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs#1)]
-[!code-vb[NclNegoAsyncClient#1](~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb#1)]
+[!code-vb[NclNegoAsyncClient#1](~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb#1)]
 
  ]]></format>
         </remarks>
@@ -1700,7 +1700,7 @@ The following example demonstrates calling this constructor. This code example i
 The following example demonstrates calling this method to begin an asynchronous authentication for the client.
 
 [!code-csharp[NclNegoAsyncClient#2](~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs#2)]
-[!code-vb[NclNegoAsyncClient#2](~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb#2)]
+[!code-vb[NclNegoAsyncClient#2](~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb#2)]
 
  ]]></format>
         </remarks>
@@ -2682,12 +2682,12 @@ The following example demonstrates calling this method to begin an asynchronous
 The following example demonstrates beginning an asynchronous write operation.
 
 [!code-csharp[NclNegoAsyncClient#3](~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs#3)]
-[!code-vb[NclNegoAsyncClient#3](~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb#3)]
+[!code-vb[NclNegoAsyncClient#3](~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb#3)]
 
 The following method is called when the operation completes.
 
 [!code-csharp[NclNegoAsyncClient#4](~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs#4)]
-[!code-vb[NclNegoAsyncClient#4](~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb#4)]
+[!code-vb[NclNegoAsyncClient#4](~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb#4)]
 
  ]]></format>
         </remarks>
@@ -3289,7 +3289,7 @@ Authentication has not occurred.</exception>
 The following example demonstrates a method that is called to complete the asynchronous write operation. For an example that demonstrates starting the operation, see <xref:System.Net.Security.NegotiateStream.BeginWrite%2A>.
 
 [!code-csharp[NclNegoAsyncClient#4](~/snippets/csharp/System.Net.Security/AuthenticatedStream/Overview/client.cs#4)]
-[!code-vb[NclNegoAsyncClient#4](~/snippets/visualbasic/VS_Snippets_Remoting/NclNegoasyncClient/VB/client.vb#4)]
+[!code-vb[NclNegoAsyncClient#4](~/snippets/visualbasic/System.Net.Security/AuthenticatedStream/Overview/client.vb#4)]
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Security/SslStream.xml b/xml/System.Net.Security/SslStream.xml
index e9a91abd28a..84ad42d7f42 100644
--- a/xml/System.Net.Security/SslStream.xml
+++ b/xml/System.Net.Security/SslStream.xml
@@ -99,12 +99,12 @@
  The following code example demonstrates creating an <xref:System.Net.Sockets.TcpListener> that uses the <xref:System.Net.Security.SslStream> class to communicate with clients.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet0":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet0":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet0":::
 
  The following code example demonstrates creating a <xref:System.Net.Sockets.TcpClient> that uses the <xref:System.Net.Security.SslStream> class to communicate with a server.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/RemoteCertificateValidationCallback/Overview/clientsync.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/clientsync.vb" id="Snippet0":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/clientsync.vb" id="Snippet0":::
 
  ]]></format>
     </remarks>
@@ -261,7 +261,7 @@
  The following code example demonstrates calling this constructor.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -361,7 +361,7 @@
  The following code example creates an <xref:System.Net.Security.SslStream> and initiates the client portion of the authentication.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/RemoteCertificateValidationCallback/Overview/clientsync.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/clientsync.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/clientsync.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -461,7 +461,7 @@
  The following code example demonstrates calling this constructor. This example is part of a larger example provided for the <xref:System.Net.Security.SslStream> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/LocalCertificateSelectionCallback/Overview/clientasync.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/.ctor/clientasync.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -2483,16 +2483,16 @@
  The following code example demonstrates starting an asynchronous read operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/LocalCertificateSelectionCallback/Overview/clientasync.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/.ctor/clientasync.vb" id="Snippet8":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/LocalCertificateSelectionCallback/Overview/clientasync.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/.ctor/clientasync.vb" id="Snippet4":::
 
 
  The following method is called when the read completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/LocalCertificateSelectionCallback/Overview/clientasync.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/.ctor/clientasync.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2663,7 +2663,7 @@
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2774,7 +2774,7 @@
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2833,7 +2833,7 @@
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2890,7 +2890,7 @@
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet5":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet5":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2954,7 +2954,7 @@
  The following code example displays the cryptography settings for the specified stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3035,7 +3035,7 @@
  The following code example displays the cryptography settings for the specified stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3321,7 +3321,7 @@
  The following code example demonstrates ending an asynchronous read operation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/LocalCertificateSelectionCallback/Overview/clientasync.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientAsync/VB/clientasync.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/.ctor/clientasync.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -3496,7 +3496,7 @@ Authentication has not occurred.</exception>
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/RemoteCertificateValidationCallback/Overview/clientsync.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/clientsync.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/clientsync.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -3605,7 +3605,7 @@ Authentication has not occurred.</exception>
  The following code example displays the cryptography settings for the specified stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3668,7 +3668,7 @@ Authentication has not occurred.</exception>
  The following code example displays the cryptography settings for the specified stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3725,7 +3725,7 @@ Authentication has not occurred.</exception>
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3782,7 +3782,7 @@ Authentication has not occurred.</exception>
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3839,7 +3839,7 @@ Authentication has not occurred.</exception>
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3900,7 +3900,7 @@ Authentication has not occurred.</exception>
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3957,7 +3957,7 @@ Authentication has not occurred.</exception>
  The following code example demonstrates displaying the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet4":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet4":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -4021,7 +4021,7 @@ Authentication has not occurred.</exception>
  The following code example displays the cryptography settings for the specified stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -4093,7 +4093,7 @@ Authentication has not occurred.</exception>
  The following code example displays the cryptography settings for the specified stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -4200,7 +4200,7 @@ Authentication has not occurred.</exception>
  The following code example demonstrates displaying the certificate returned by this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -4446,7 +4446,7 @@ This property gets the cipher suite that is going to be used in the communicatio
  The following code example demonstrates reading from an <xref:System.Net.Security.SslStream>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Security/RemoteCertificateValidationCallback/Overview/clientsync.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslClientSync/VB/clientsync.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/clientsync.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -4691,7 +4691,7 @@ This property gets the cipher suite that is going to be used in the communicatio
  The following code example demonstrates setting the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4750,7 +4750,7 @@ If the property is accessed, the remote certificate will not be disposed when th
  The following code example demonstrates displaying the certificate returned by this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -4952,7 +4952,7 @@ If the property is accessed, the remote certificate will not be disposed when th
  The following example displays the security properties of the specified stream.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -5097,7 +5097,7 @@ If the property is accessed, the remote certificate will not be disposed when th
  The following code example demonstrates writing to an authenticated <xref:System.Net.Security.SslStream>.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5357,7 +5357,7 @@ The <xref:System.Net.Security.SslStream> class does not support multiple simulta
  The following code example demonstrates setting the value of this property.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Security/SslStream/Overview/serversync.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NclSslServerSync/VB/serversync.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Security/SslStream/Overview/serversync.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/AddressFamily.xml b/xml/System.Net.Sockets/AddressFamily.xml
index b67cdb2bf89..a3203edae45 100644
--- a/xml/System.Net.Sockets/AddressFamily.xml
+++ b/xml/System.Net.Sockets/AddressFamily.xml
@@ -59,7 +59,7 @@
  The following example creates a <xref:System.Net.Sockets.Socket> using the InterNetwork <xref:System.Net.Sockets.AddressFamily>.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/AddressFamily/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Send_Receive/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/AddressFamily/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.Sockets/IPv6MulticastOption.xml b/xml/System.Net.Sockets/IPv6MulticastOption.xml
index d7ee73dad0a..624b9df77dd 100644
--- a/xml/System.Net.Sockets/IPv6MulticastOption.xml
+++ b/xml/System.Net.Sockets/IPv6MulticastOption.xml
@@ -57,7 +57,7 @@
  The following example creates an <xref:System.Net.Sockets.IPv6MulticastOption> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet4":::
 
  ]]></format>
     </remarks>
@@ -119,7 +119,7 @@
  The following example creates an <xref:System.Net.Sockets.IPv6MulticastOption> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -180,7 +180,7 @@
  The following example creates an <xref:System.Net.Sockets.IPv6MulticastOption> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -246,7 +246,7 @@
  The following example creates an <xref:System.Net.Sockets.IPv6MulticastOption> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -311,7 +311,7 @@
  The following example creates an <xref:System.Net.Sockets.IPv6MulticastOption> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/LingerOption.xml b/xml/System.Net.Sockets/LingerOption.xml
index 5fc7c54d04f..12a0a211414 100644
--- a/xml/System.Net.Sockets/LingerOption.xml
+++ b/xml/System.Net.Sockets/LingerOption.xml
@@ -58,7 +58,7 @@
  The following example sets a previously created <xref:System.Net.Sockets.Socket> to linger one second after calling the <xref:System.Net.Sockets.Socket.Close%2A> method.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic LingerOption Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -130,7 +130,7 @@
  The following example sets a previously created <xref:System.Net.Sockets.Socket> to linger one second after calling the <xref:System.Net.Sockets.Socket.Close%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic LingerOption Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -341,7 +341,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/MulticastOption.xml b/xml/System.Net.Sockets/MulticastOption.xml
index 6c542d6192c..56b2b5a34c4 100644
--- a/xml/System.Net.Sockets/MulticastOption.xml
+++ b/xml/System.Net.Sockets/MulticastOption.xml
@@ -68,10 +68,10 @@
  The following examples join the default IP interface to an IP multicast group. They assume the IP multicast group address in the range 224.0.0.0 to 239.255.255.255.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/MulticastOption/Overview/listener.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionListener/VB/listener.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/listener.vb" id="Snippet1":::
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/MulticastOption/Overview/sender.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionSender/VB/sender.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/sender.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -232,7 +232,7 @@
  The following example creates a <xref:System.Net.Sockets.MulticastOption> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/MulticastOption/Overview/listener.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionListener/VB/listener.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/listener.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -303,7 +303,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/MulticastOption/Overview/listener.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionListener/VB/listener.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/listener.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -418,7 +418,7 @@
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/MulticastOption/Overview/listener.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.MulticastOptionListener/VB/listener.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/MulticastOption/Overview/listener.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/NetworkStream.xml b/xml/System.Net.Sockets/NetworkStream.xml
index 33bee7908ed..848cb324e6c 100644
--- a/xml/System.Net.Sockets/NetworkStream.xml
+++ b/xml/System.Net.Sockets/NetworkStream.xml
@@ -1675,7 +1675,7 @@ There is a failure reading from the network.</exception>
  In the following code example, the `CanCommunicate` property checks the <xref:System.Net.Sockets.NetworkStream.Readable%2A> property to determine if the <xref:System.Net.Sockets.NetworkStream> is readable.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/NetworkStream/Readable/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Protected_Members/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/NetworkStream/Readable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2083,7 +2083,7 @@ There is a failure reading from the network.</exception>
  The following code example retrieves the underlying <xref:System.Net.Sockets.Socket> to verify an active connection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/NetworkStream/Readable/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Protected_Members/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/NetworkStream/Readable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2255,7 +2255,7 @@ This method starts at the specified `offset` and sends `count` bytes from the co
  The following code example checks to see whether the <xref:System.Net.Sockets.NetworkStream> is writable. If it is, then <xref:System.Net.Sockets.NetworkStream.Write%2A> is used to write a small message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/NetworkStream/Overview/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Synch_SendAndReceive/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/NetworkStream/Write/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2347,7 +2347,7 @@ There was a failure while writing to the network.</exception>
  In the following code example, the `CanCommunicate` property checks the <xref:System.Net.Sockets.NetworkStream.Writeable%2A> property to determine if the <xref:System.Net.Sockets.NetworkStream> is writable.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/NetworkStream/Readable/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkStream_Protected_Members/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/NetworkStream/Readable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/SelectMode.xml b/xml/System.Net.Sockets/SelectMode.xml
index 45e01bd067e..f74fb0f7fc4 100644
--- a/xml/System.Net.Sockets/SelectMode.xml
+++ b/xml/System.Net.Sockets/SelectMode.xml
@@ -55,7 +55,7 @@
  The following example checks the status of a <xref:System.Net.Sockets.Socket> using all three <xref:System.Net.Sockets.SelectMode> enumeration values. A call to <xref:System.Net.Sockets.Socket.Poll%2A?displayProperty=nameWithType> using the SelectWrite enumerated value should return `true`.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/SelectMode/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SelectModeExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/SelectMode/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.Sockets/Socket.xml b/xml/System.Net.Sockets/Socket.xml
index 877de1afa98..1ce7b71904f 100644
--- a/xml/System.Net.Sockets/Socket.xml
+++ b/xml/System.Net.Sockets/Socket.xml
@@ -335,7 +335,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example demonstrates how to create an instance of the <xref:System.Net.Sockets.Socket> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/AddressFamily/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Send_Receive/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/AddressFamily/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -411,7 +411,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example accepts a simple <xref:System.Net.Sockets.Socket> connection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Accept/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Accept Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Accept/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -770,7 +770,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example displays the <xref:System.Net.Sockets.AddressFamily>, <xref:System.Net.Sockets.SocketType>, and <xref:System.Net.Sockets.ProtocolType> to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3334,7 +3334,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example binds a <xref:System.Net.Sockets.Socket> using the specified local endpoint.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Bind/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Bind Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Bind/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3550,7 +3550,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example closes a <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Close/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3623,7 +3623,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example demonstrates how to close a <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Close/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3711,7 +3711,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example connects to a remote endpoint and then verifies the connection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Connect/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Connect Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Connect/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4656,7 +4656,7 @@ This method populates the <xref:System.Net.Sockets.Socket> instance with data ga
  The following code example connects to a remote endpoint, checks the <xref:System.Net.Sockets.Socket.Connected%2A> property, and checks the current state of the connection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Connect/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Connect Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Connect/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -6613,7 +6613,7 @@ In general, the `GetSocketOption` method should be used whenever getting a <xref
  The following code example retrieves the <xref:System.Net.Sockets.LingerOption> and <xref:System.Net.Sockets.Socket.Send%2A> time-out values and displays them to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -6694,7 +6694,7 @@ In general, the `GetSocketOption` method should be used whenever getting a <xref
  The following code example retrieves the <xref:System.Net.Sockets.LingerOption> and <xref:System.Net.Sockets.Socket.Send%2A> time-out values and displays them to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -6777,7 +6777,7 @@ In general, the `GetSocketOption` method should be used whenever getting a <xref
  The following code example retrieves the <xref:System.Net.Sockets.LingerOption> and <xref:System.Net.Sockets.Socket.Send%2A> time-out values and displays them to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -7260,7 +7260,7 @@ The maximum length of the pending connections queue is determined automatically.
  The following code example uses <xref:System.Net.Sockets.Socket> to listen for incoming connections.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Listen/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Listen Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Listen/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7341,7 +7341,7 @@ The maximum length of the pending connections queue is determined automatically.
  The following code example retrieves and displays the local and remote endpoints.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -7691,7 +7691,7 @@ The maximum length of the pending connections queue is determined automatically.
  The following code example creates a socket, connects to a server, and uses <xref:System.Net.Sockets.Socket.Poll%2A> to check the status of the socket.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/SelectMode/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SelectModeExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/SelectMode/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -7807,7 +7807,7 @@ The maximum length of the pending connections queue is determined automatically.
  The following code example displays the <xref:System.Net.Sockets.AddressFamily>, <xref:System.Net.Sockets.SocketType>, and <xref:System.Net.Sockets.ProtocolType> to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -7897,7 +7897,7 @@ The maximum length of the pending connections queue is determined automatically.
  The following code example receives data on a connected <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -8148,7 +8148,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example specifies a data buffer, and <xref:System.Net.Sockets.SocketFlags> for receiving data on a connected <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -8423,7 +8423,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following receives the data found into `buffer`, and specifies <xref:System.Net.Sockets.SocketFlags.None> for <xref:System.Net.Sockets.SocketFlags>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/AddressFamily/Overview/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Send_Receive/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/AddressFamily/Overview/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -8692,7 +8692,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
  The following code example specifies a data buffer, an offset, a size, and a socket flag before receiving data on a connected <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -9351,7 +9351,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
  The following code example receives a connectionless datagram from a remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -9506,7 +9506,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
  The following code example receives a connectionless datagram from a remote host. <xref:System.Net.Sockets.SocketFlags> are passed to the <xref:System.Net.Sockets.Socket.ReceiveFrom%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -9720,7 +9720,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
  The following code example receives a connectionless datagram from a remote host. The buffer size, and <xref:System.Net.Sockets.SocketFlags> are passed to the <xref:System.Net.Sockets.Socket.ReceiveFrom%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -9839,7 +9839,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
  The following code example receives a connectionless datagram from a remote host. The offset, buffer size, and <xref:System.Net.Sockets.SocketFlags> are passed to the <xref:System.Net.Sockets.Socket.ReceiveFrom%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -10848,7 +10848,7 @@ You must call the Bind method before performing this operation.</exception>
  The following code example retrieves and displays the local and remote endpoints.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -10984,7 +10984,7 @@ You must call the Bind method before performing this operation.</exception>
  The following code example uses <xref:System.Net.Sockets.Socket.Select%2A> to determine which listening sockets have a connection request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Select/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Select/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Select/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11130,7 +11130,7 @@ You must call the Bind method before performing this operation.</exception>
  The following code example demonstrates sending data on a connected <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -11385,7 +11385,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example demonstrates sending data on a connected <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -11624,7 +11624,7 @@ This member outputs trace information when you enable network tracing in your ap
 The following code example sends the data found in buffer, and specifies <xref:System.Net.Sockets.SocketFlags.None> for <xref:System.Net.Sockets.SocketFlags>.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -11891,7 +11891,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example specifies the data buffer, an offset, a size, and <xref:System.Net.Sockets.SocketFlags> for sending data to a connected <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -12008,7 +12008,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example specifies the data buffer, an offset, a size, and <xref:System.Net.Sockets.SocketFlags> for sending data to a connected <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -13037,7 +13037,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example sends a connectionless datagram to the specified remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -13182,7 +13182,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example sends a connectionless datagram to the specified remote host. <xref:System.Net.Sockets.SocketFlags> are passed to the <xref:System.Net.Sockets.Socket.SendTo%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -13388,7 +13388,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example sends a connectionless datagram to the specified remote host. The size and <xref:System.Net.Sockets.SocketFlags> are passed to the <xref:System.Net.Sockets.Socket.SendTo%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -13487,7 +13487,7 @@ This member outputs trace information when you enable network tracing in your ap
  The following code example sends a connectionless datagram to the specified remote host. The offset, size, and <xref:System.Net.Sockets.SocketFlags> are passed to the <xref:System.Net.Sockets.Socket.SendTo%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -14198,7 +14198,7 @@ The <xref:System.Net.Sockets.Socket.SetRawSocketOption(System.Int32,System.Int32
  The following code example sets the <xref:System.Net.Sockets.LingerOption> and <xref:System.Net.Sockets.Socket.Send%2A> time-out values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14340,7 +14340,7 @@ The <xref:System.Net.Sockets.Socket.SetRawSocketOption(System.Int32,System.Int32
  The following code example sets the <xref:System.Net.Sockets.LingerOption> and <xref:System.Net.Sockets.Socket.Send%2A> time-out values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet0":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet0":::
 
  ]]></format>
         </remarks>
@@ -14413,7 +14413,7 @@ The <xref:System.Net.Sockets.Socket.SetRawSocketOption(System.Int32,System.Int32
  The following code example sets the <xref:System.Net.Sockets.LingerOption> and <xref:System.Net.Sockets.Socket.Send%2A> time out values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14510,7 +14510,7 @@ The <xref:System.Net.Sockets.Socket.SetRawSocketOption(System.Int32,System.Int32
  The following code example uses <xref:System.Net.Sockets.Socket.Shutdown%2A> to disable the <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Close/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Socket.Close Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Close/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -14578,7 +14578,7 @@ The <xref:System.Net.Sockets.Socket.SetRawSocketOption(System.Int32,System.Int32
  The following code example displays the <xref:System.Net.Sockets.AddressFamily>, <xref:System.Net.Sockets.SocketType>, and <xref:System.Net.Sockets.ProtocolType> to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/SocketFlags.xml b/xml/System.Net.Sockets/SocketFlags.xml
index 67205df41c8..a70709f6b56 100644
--- a/xml/System.Net.Sockets/SocketFlags.xml
+++ b/xml/System.Net.Sockets/SocketFlags.xml
@@ -56,7 +56,7 @@
  The following example sends data and specifies `SocketFlags.None`.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/Socket/Receive/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Sync_Send_Receive/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/Socket/Receive/source.vb" id="Snippet3":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.Sockets/SocketOptionLevel.xml b/xml/System.Net.Sockets/SocketOptionLevel.xml
index 79c48091ec8..a86cfa7a026 100644
--- a/xml/System.Net.Sockets/SocketOptionLevel.xml
+++ b/xml/System.Net.Sockets/SocketOptionLevel.xml
@@ -57,7 +57,7 @@
  The following example uses this enumeration to set socket options.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.Sockets/SocketOptionName.xml b/xml/System.Net.Sockets/SocketOptionName.xml
index 31bf4944d3c..4787449b83d 100644
--- a/xml/System.Net.Sockets/SocketOptionName.xml
+++ b/xml/System.Net.Sockets/SocketOptionName.xml
@@ -55,7 +55,7 @@
  The following code example uses this enumeration to set socket options.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/LingerOption/LingerTime/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Socket_Socket_Options/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/LingerOption/LingerTime/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.Sockets/SocketType.xml b/xml/System.Net.Sockets/SocketType.xml
index b63ac46cc65..a0077d7409c 100644
--- a/xml/System.Net.Sockets/SocketType.xml
+++ b/xml/System.Net.Sockets/SocketType.xml
@@ -63,7 +63,7 @@
  The following example uses <xref:System.Net.Sockets.SocketType.Stream?displayProperty=nameWithType> as a parameter to the <xref:System.Net.Sockets.Socket> constructor.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/SelectMode/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SelectModeExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/SelectMode/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net.Sockets/TcpClient.xml b/xml/System.Net.Sockets/TcpClient.xml
index 4544f9cad20..13701dc4a8e 100644
--- a/xml/System.Net.Sockets/TcpClient.xml
+++ b/xml/System.Net.Sockets/TcpClient.xml
@@ -75,7 +75,7 @@
  The following code example establishes a `TcpClient` connection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/Overview/tcpclient.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpClient/VB/tcpclient.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/Overview/tcpclient.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -156,7 +156,7 @@
  The following code example demonstrates how to use the parameterless constructor to create a new <xref:System.Net.Sockets.TcpClient>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -218,7 +218,7 @@
  The following code example demonstrates how to create an instance of the <xref:System.Net.Sockets.TcpClient> class using a local endpoint.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -280,7 +280,7 @@
  The following code example demonstrates how to create an instance of the <xref:System.Net.Sockets.TcpClient> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -351,7 +351,7 @@
  The following code example demonstrates how to create an instance of the <xref:System.Net.Sockets.TcpClient> class using a host name and port number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -809,7 +809,7 @@ The `Available` property is a way to determine whether data is queued for readin
  The following code example demonstrates the use of the `Client` property. In this example, the receive buffer size of the underlying <xref:System.Net.Sockets.Socket> is changed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/Client/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TcpClientProtectedMethodsAndPropertiesExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/Client/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -946,7 +946,7 @@ The `Available` property is a way to determine whether data is queued for readin
  The following code example uses an <xref:System.Net.IPEndPoint> to connect with a remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1020,7 +1020,7 @@ The `Available` property is a way to determine whether data is queued for readin
  The following code example uses an IP Address and port number to connect with a remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1169,7 +1169,7 @@ The `Available` property is a way to determine whether data is queued for readin
  The following code example uses the host name and port number to connect with a remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2106,7 +2106,7 @@ The `GetStream` method returns a <xref:System.Net.Sockets.NetworkStream> that yo
  The following code example uses `GetStream` to obtain the underlying <xref:System.Net.Sockets.NetworkStream>. After obtaining the <xref:System.Net.Sockets.NetworkStream>, it sends and receives using its <xref:System.Net.Sockets.NetworkStream.Write%2A> and <xref:System.Net.Sockets.NetworkStream.Read%2A> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -2194,7 +2194,7 @@ The `GetStream` method returns a <xref:System.Net.Sockets.NetworkStream> that yo
  The following code example sets and gets the sockets linger time.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -2255,7 +2255,7 @@ The `GetStream` method returns a <xref:System.Net.Sockets.NetworkStream> that yo
  The following code example disables the delay. It then checks the value of `NoDelay` to verify that the property was successfully set.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -2322,7 +2322,7 @@ The `GetStream` method returns a <xref:System.Net.Sockets.NetworkStream> that yo
  The following code example sets and gets the receive buffer size.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -2392,7 +2392,7 @@ The `GetStream` method returns a <xref:System.Net.Sockets.NetworkStream> that yo
  The following code example sets and gets the receive time out.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -2461,7 +2461,7 @@ The `GetStream` method returns a <xref:System.Net.Sockets.NetworkStream> that yo
  The following code example sets and gets the send buffer size.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -2528,7 +2528,7 @@ The `GetStream` method returns a <xref:System.Net.Sockets.NetworkStream> that yo
  The following code example sets and gets the `SendTimeout` value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpClient/.ctor/source.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClassicTcpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpClient/.ctor/source.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/TcpListener.xml b/xml/System.Net.Sockets/TcpListener.xml
index c5a1c8549d9..32d25b642e5 100644
--- a/xml/System.Net.Sockets/TcpListener.xml
+++ b/xml/System.Net.Sockets/TcpListener.xml
@@ -78,7 +78,7 @@
  The following code example creates a <xref:System.Net.Sockets.TcpListener>.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/Overview/tcpserver.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener/VB/tcpserver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/Overview/tcpserver.vb" id="Snippet1":::
 
  See <xref:System.Net.Sockets.TcpClient> for a client example.
 
@@ -169,7 +169,7 @@
  The following code example creates a <xref:System.Net.Sockets.TcpListener> using a local port number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/.ctor/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListener.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/.ctor/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -236,7 +236,7 @@
  The following code example creates an instance of the <xref:System.Net.Sockets.TcpListener> class using the local endpoint.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListener.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -304,7 +304,7 @@
  The following code example creates an instance of the <xref:System.Net.Sockets.TcpListener> class using a local IP address and port number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/.ctor/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListener.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/.ctor/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -372,7 +372,7 @@
  In the following code example, the <xref:System.Net.Sockets.TcpListener.AcceptSocket%2A> method is used to return a <xref:System.Net.Sockets.Socket>. This <xref:System.Net.Sockets.Socket> is used to communicate with the newly connected client.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/.ctor/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListener.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/.ctor/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -550,7 +550,7 @@
  In the following code example, the <xref:System.Net.Sockets.TcpListener.AcceptTcpClient%2A> method is used to return a <xref:System.Net.Sockets.TcpClient>. This <xref:System.Net.Sockets.TcpClient> is used to communicate with the newly connected client.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/AcceptTcpClient/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic TcpListenerExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/AcceptTcpClient/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1204,7 +1204,7 @@
  The following code example gets and sets the <xref:System.Net.Sockets.TcpListener.ExclusiveAddressUse%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/BeginAcceptSocket/tcpserver.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener1/VB/tcpserver.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/ExclusiveAddressUse/tcpserver.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1298,7 +1298,7 @@ The <xref:System.Net.Sockets.TcpListener> class finalizer free resources associa
  The following code example displays the local IP address and port number on which the <xref:System.Net.Sockets.TcpListener> is listening for incoming connection requests.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/LocalEndpoint/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TcpListener_Pending_LocalEndPoint/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/LocalEndpoint/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1359,7 +1359,7 @@ The <xref:System.Net.Sockets.TcpListener> class finalizer free resources associa
  The following code example checks the <xref:System.Net.Sockets.TcpListener.Pending%2A> method. If a connection request is waiting to be accepted, then a call to the <xref:System.Net.Sockets.TcpListener.AcceptTcpClient%2A> method is made.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/LocalEndpoint/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TcpListener_Pending_LocalEndPoint/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/LocalEndpoint/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1432,7 +1432,7 @@ The <xref:System.Net.Sockets.TcpListener> class finalizer free resources associa
  The following code example demonstrates the use of the <xref:System.Net.Sockets.TcpListener.Server%2A> property. The underlying <xref:System.Net.Sockets.Socket> is retrieved and the <xref:System.Net.Sockets.SocketOptionName.Linger><xref:System.Net.Sockets.Socket> option is configured to time out after 10 seconds if data still remains in the network buffer after the connection is closed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/Server/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TcpListenerProtectedMembers1/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/Server/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1515,7 +1515,7 @@ The <xref:System.Net.Sockets.TcpListener> class finalizer free resources associa
  The following code example demonstrates how <xref:System.Net.Sockets.TcpListener.Start%2A> is used to listen for incoming client connection attempts.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/BeginAcceptSocket/tcpserver.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener1/VB/tcpserver.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/ExclusiveAddressUse/tcpserver.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1589,7 +1589,7 @@ The <xref:System.Net.Sockets.TcpListener> class finalizer free resources associa
  The following code example demonstrates how <xref:System.Net.Sockets.TcpListener.Start%2A> is used to listen for incoming client connection attempts.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/BeginAcceptSocket/tcpserver.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener1/VB/tcpserver.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/ExclusiveAddressUse/tcpserver.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1657,7 +1657,7 @@ The <xref:System.Net.Sockets.TcpListener> class finalizer free resources associa
  The following code example demonstrates using the <xref:System.Net.Sockets.TcpListener.Stop%2A> method to close the underlying <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/TcpListener/Overview/tcpserver.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.TcpListener/VB/tcpserver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/TcpListener/Overview/tcpserver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net.Sockets/UdpClient.xml b/xml/System.Net.Sockets/UdpClient.xml
index d1c9a5293be..392fdb67660 100644
--- a/xml/System.Net.Sockets/UdpClient.xml
+++ b/xml/System.Net.Sockets/UdpClient.xml
@@ -77,7 +77,7 @@
  The following example establishes a <xref:System.Net.Sockets.UdpClient> connection using the host name `www.contoso.com` on port 11000. A small string message is sent to two separate remote host machines. The <xref:System.Net.Sockets.UdpClient.Receive%2A> method blocks execution until a message is received. Using the <xref:System.Net.IPEndPoint> passed to <xref:System.Net.Sockets.UdpClient.Receive%2A>, the identity of the responding host is revealed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClientExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -153,7 +153,7 @@
  The following example demonstrates how to use the parameterless constructor to create an instance of the <xref:System.Net.Sockets.UdpClient> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -222,7 +222,7 @@
  The following example demonstrates using a local port number to create an instance of the <xref:System.Net.Sockets.UdpClient> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -286,7 +286,7 @@
  The following example demonstrates how to create an instance of the <xref:System.Net.Sockets.UdpClient> class using a local endpoint.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -415,7 +415,7 @@
  The following code example shows how to create a UDP client to use in a multicast group.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -481,7 +481,7 @@
  The following example demonstrates how to create an instance of the <xref:System.Net.Sockets.UdpClient> class using a host name and port number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1095,7 +1095,7 @@
  The following example demonstrates the use of the <xref:System.Net.Sockets.UdpClient.Client%2A> property. In this example, broadcasting is enabled for the underlying <xref:System.Net.Sockets.Socket>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/Client/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.ProtectedMethodsAndPropertiesExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/Client/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1161,7 +1161,7 @@
  The following example demonstrates closing a <xref:System.Net.Sockets.UdpClient> by calling the <xref:System.Net.Sockets.UdpClient.Close%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1241,7 +1241,7 @@
  The following example uses an <xref:System.Net.IPEndPoint> to establish a default remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1318,7 +1318,7 @@
  The following example uses an IP address and port number to connect with a remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -1400,7 +1400,7 @@
  The following example uses the host name and port number to connect to a remote host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1640,7 +1640,7 @@
  The following example demonstrates how to drop a multicast group by providing a multicast address.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1711,7 +1711,7 @@
  The following code example demonstrates how to drop a multicast group by providing a multicast address.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2062,7 +2062,7 @@
  The following code example demonstrates how to join a multicast group by providing a multicast address.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2134,7 +2134,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.UdpClient.JoinMulticastGroup/VB/joinmulticastgroup.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/IPv6MulticastOption/Overview/joinmulticastgroup.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -2208,7 +2208,7 @@
  The following example demonstrates how to join a multicast group by providing two parameters, a multicast address, and a number that represents the TTL.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -2418,7 +2418,7 @@
  The following example demonstrates the <xref:System.Net.Sockets.UdpClient.Receive%2A> method. The <xref:System.Net.Sockets.UdpClient.Receive%2A> method blocks execution until it receives a message. Using the <xref:System.Net.IPEndPoint> passed to <xref:System.Net.Sockets.UdpClient.Receive%2A>, the identity of the responding host is revealed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -2625,7 +2625,7 @@
  The following example demonstrates the <xref:System.Net.Sockets.UdpClient.Send%2A> method. You must establish a default remote host prior to using this overload.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -2754,7 +2754,7 @@
  The following example demonstrates the <xref:System.Net.Sockets.UdpClient.Send%2A> method. This example uses an <xref:System.Net.IPEndPoint> to specify the target host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -2890,7 +2890,7 @@
  The following example demonstrates the <xref:System.Net.Sockets.UdpClient.Send%2A> method. This example uses a host name and a port number to identify the target host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net.Sockets/UdpClient/.ctor/source.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UdpClient.PublicMethodsAndPropertiesExample/VB/source.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net.Sockets/UdpClient/.ctor/source.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/AuthenticationManager.xml b/xml/System.Net/AuthenticationManager.xml
index f00a7a3c59f..b4f284a8e76 100644
--- a/xml/System.Net/AuthenticationManager.xml
+++ b/xml/System.Net/AuthenticationManager.xml
@@ -65,7 +65,7 @@
 
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -421,7 +421,7 @@
  The following example registers an authentication module with the authentication manager. For a complete example, refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Register/custombasicauthentication.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.Authentication/VB/custombasicauthentication.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Register/custombasicauthentication.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -479,7 +479,7 @@
  The following example uses the <xref:System.Net.AuthenticationManager.RegisteredModules%2A> property to get a list of authentication modules that are registered with the authentication manager. For a complete example, refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -548,7 +548,7 @@
  The following example uses the <xref:System.Net.AuthenticationManager.Unregister%2A> method to remove the specified authentication module from the list of registered modules. For a complete example, refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Register/custombasicauthentication.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Sockets.Authentication/VB/custombasicauthentication.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Register/custombasicauthentication.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -610,7 +610,7 @@
  The following example uses the <xref:System.Net.AuthenticationManager.Unregister%2A> method to remove an authentication module with the specified authentication scheme from the list of registered modules.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Unregister/authenticationmanager_unregister2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/AuthenticationManager_UnRegister2/VB/authenticationmanager_unregister2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Unregister/authenticationmanager_unregister2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/AuthenticationSchemeSelector.xml b/xml/System.Net/AuthenticationSchemeSelector.xml
index 0cbf7ddb831..9656d4c70ce 100644
--- a/xml/System.Net/AuthenticationSchemeSelector.xml
+++ b/xml/System.Net/AuthenticationSchemeSelector.xml
@@ -63,12 +63,12 @@
  The following example uses an instance of this type to set the <xref:System.Net.HttpListener.AuthenticationSchemeSelectorDelegate%2A> property.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet2":::  
   
  The following example shows the implementation of the method invoked by the <xref:System.Net.AuthenticationSchemeSelector> delegate in the previous example.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/AuthenticationSchemes.xml b/xml/System.Net/AuthenticationSchemes.xml
index 29fd57b8883..a3de6d60101 100644
--- a/xml/System.Net/AuthenticationSchemes.xml
+++ b/xml/System.Net/AuthenticationSchemes.xml
@@ -67,7 +67,7 @@ For additional information on basic and digest authentication, see [RFC2617 - HT
  The following code example demonstrates using the Negotiate enumeration value to specify that clients are authenticated using the Negotiate security protocol.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/Authorization.xml b/xml/System.Net/Authorization.xml
index 2238ac0fa81..59dd6f486fe 100644
--- a/xml/System.Net/Authorization.xml
+++ b/xml/System.Net/Authorization.xml
@@ -123,7 +123,7 @@
  The following code example shows how to create an <xref:System.Net.Authorization> object. For a complete example, refer to the <xref:System.Net.AuthenticationManager> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -182,7 +182,7 @@
  The following code example creates a new instance of the <xref:System.Net.Authorization> class with the specified authorization message and completion status.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Authorization/.ctor/authorization_protectionrealm.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Authorization_ProtectionRealm/VB/authorization_protectionrealm.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Authorization/.ctor/authorization_protectionrealm.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@
  The following code example creates a new instance of the <xref:System.Net.Authorization> class with the specified authorization message, completion status, and connection group identifier.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Authorization/.ctor/authorization_constructor3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Authorization_Constructor3/VB/authorization_constructor3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Authorization/.ctor/authorization_constructor3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -307,7 +307,7 @@
  The following code example uses the <xref:System.Net.Authorization.Complete%2A> property to get the completion status of the authorization. For a complete example, refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -371,7 +371,7 @@
  The following code example uses the <xref:System.Net.Authorization.ConnectionGroupId%2A> property to get the group identifier returned by the server. For a complete example, refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@
  The following code example uses the <xref:System.Net.Authorization.Message%2A> property to get the message returned to the server in response to an authentication challenge. For a complete example, refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -558,7 +558,7 @@
  The following code example gets or sets the prefix for URIs that can be authenticated with the <xref:System.Net.Authorization.Message%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Authorization/.ctor/authorization_protectionrealm.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Authorization_ProtectionRealm/VB/authorization_protectionrealm.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Authorization/.ctor/authorization_protectionrealm.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/Cookie.xml b/xml/System.Net/Cookie.xml
index 8cbbd1a0869..86ae4b719bb 100644
--- a/xml/System.Net/Cookie.xml
+++ b/xml/System.Net/Cookie.xml
@@ -77,7 +77,7 @@
  The following example sends a request to a URL and displays the cookies returned in the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -520,7 +520,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -600,7 +600,7 @@
  The following example displays the properties of cookies that are returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -676,7 +676,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -747,7 +747,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -875,7 +875,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -952,7 +952,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1141,7 +1141,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1217,7 +1217,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1288,7 +1288,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1365,7 +1365,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1436,7 +1436,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1502,7 +1502,7 @@
  The following example displays the string value of a cookie returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1572,7 +1572,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1645,7 +1645,7 @@
  The following example displays the properties of cookies returned in a response. For the complete example, see the <xref:System.Net.Cookie> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/CookieCollection.xml b/xml/System.Net/CookieCollection.xml
index eb1c1ceae42..744dc75f886 100644
--- a/xml/System.Net/CookieCollection.xml
+++ b/xml/System.Net/CookieCollection.xml
@@ -833,7 +833,7 @@ The comparison for <xref:System.Net.Cookie.Path%2A> is case-sensitive.
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Net/CookieCollection/Item/cookiecollection_item_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_2/VB/cookiecollection_item_2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CookieCollection/Item/cookiecollection_item_2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -909,7 +909,7 @@ The comparison for <xref:System.Net.Cookie.Path%2A> is case-sensitive.
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Net/CookieCollection/Item/cookiecollection_item_1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CookieCollection_Item_1/VB/cookiecollection_item_1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CookieCollection/Item/cookiecollection_item_1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/CredentialCache.xml b/xml/System.Net/CredentialCache.xml
index fe1a10cd17f..eb9275cbe90 100644
--- a/xml/System.Net/CredentialCache.xml
+++ b/xml/System.Net/CredentialCache.xml
@@ -82,7 +82,7 @@
  The following code example initializes a <xref:System.Net.CredentialCache> with multiple security credentials and uses those credentials with a <xref:System.Net.WebRequest>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic CredentialCache.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -138,7 +138,7 @@
  The following code example initializes a <xref:System.Net.CredentialCache> with multiple security credentials and uses those credentials with a <xref:System.Net.WebRequest>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic CredentialCache.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -212,7 +212,7 @@
  The following code example initializes a <xref:System.Net.CredentialCache> with multiple security credentials and uses those credentials with a <xref:System.Net.WebRequest>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic CredentialCache.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -287,7 +287,7 @@
  The following code example initializes a <xref:System.Net.CredentialCache> with multiple security credentials for use with SMTP and uses one of those credentials with a <xref:System.Net.Mail.SmtpClient>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCL_Credential.Cache.Add_SMTP/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -360,7 +360,7 @@
  The following code example uses the <xref:System.Net.CredentialCache.DefaultCredentials%2A> property to get the system credentials of the application.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/DefaultCredentials/credentialcache_defaultcredentials.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_DefaultCredentials/VB/credentialcache_defaultcredentials.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/DefaultCredentials/credentialcache_defaultcredentials.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -496,7 +496,7 @@
  The following code example uses the <xref:System.Net.CredentialCache.GetCredential%28System.Uri%2CSystem.String%29> method to return the <xref:System.Net.NetworkCredential> instance associated with the specified URI and authentication type.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/GetCredential/credentialcache_getcredential.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_GetCredential/VB/credentialcache_getcredential.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/GetCredential/credentialcache_getcredential.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -632,7 +632,7 @@
  The following code example uses the <xref:System.Net.CredentialCache.GetEnumerator%2A> method to return an enumerator that can iterate through the <xref:System.Net.CredentialCache> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/GetEnumerator/credentialcache_getenumerator.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_GetEnumerator/VB/credentialcache_getenumerator.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/GetEnumerator/credentialcache_getenumerator.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -707,7 +707,7 @@
  The following code example uses this method to delete a <xref:System.Net.NetworkCredential> instance from the cache.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/CredentialCache/Remove/credentialcache_add_remove.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CredentialCache_Add_Remove/VB/credentialcache_add_remove.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/CredentialCache/Remove/credentialcache_add_remove.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/Dns.xml b/xml/System.Net/Dns.xml
index 481f0b11b03..ef43835050c 100644
--- a/xml/System.Net/Dns.xml
+++ b/xml/System.Net/Dns.xml
@@ -68,7 +68,7 @@
  The following example queries the DNS database for information on the host `www.contoso.com`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Dns Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -347,7 +347,7 @@
  The following code example uses the <xref:System.Net.Dns.BeginGetHostEntry%2A> method to resolve an IP address to an <xref:System.Net.IPHostEntry> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Dns/vb/dnsnewmethods.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -438,7 +438,7 @@
  The following code example uses the <xref:System.Net.Dns.BeginGetHostEntry%2A> method to resolve an IP address to an <xref:System.Net.IPHostEntry> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Dns/vb/dnsnewmethods.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -544,7 +544,7 @@
  The following example uses <xref:System.Net.Dns.BeginResolve%2A> to resolve a DNS host name to an <xref:System.Net.IPAddress>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/BeginResolve/dns_begin_endresolve.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Dns_Begin_EndResolve/VB/dns_begin_endresolve.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/BeginResolve/dns_begin_endresolve.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -821,7 +821,7 @@
  The following example ends an asynchronous request for DNS host information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/BeginResolve/dns_begin_endresolve.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Dns_Begin_EndResolve/VB/dns_begin_endresolve.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/BeginResolve/dns_begin_endresolve.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -892,7 +892,7 @@
  The following code example uses the <xref:System.Net.Dns.GetHostAddresses%2A> method to resolve an IP address to an array of type <xref:System.Net.IPAddress>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Dns/vb/dnsnewmethods.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1150,7 +1150,7 @@
  The following example creates a <xref:System.Net.IPHostEntry> from an <xref:System.Net.IPAddress>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/GetHostByAddress/dns_gethostbyaddress_ipaddress.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostByAddress_IPAddress/VB/dns_gethostbyaddress_ipaddress.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/GetHostByAddress/dns_gethostbyaddress_ipaddress.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1307,7 +1307,7 @@
  The following example uses the <xref:System.Net.Dns.GetHostByName%2A> method to get the DNS information for the specified DNS host name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/GetHostByName/dns_gethostbyname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostByName/VB/dns_gethostbyname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/GetHostByName/dns_gethostbyname.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1385,7 +1385,7 @@
  The following code example uses the <xref:System.Net.Dns.GetHostEntry%2A> method to resolve an IP address to an <xref:System.Net.IPHostEntry> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Dns/vb/dnsnewmethods.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1476,7 +1476,7 @@
  The following example uses the <xref:System.Net.Dns.GetHostEntry%2A> method to resolve an IP address to an <xref:System.Net.IPHostEntry> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Dns/vb/dnsnewmethods.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/BeginGetHostEntry/dnsnewmethods.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1803,7 +1803,7 @@
  The following example uses the <xref:System.Net.Dns.GetHostName%2A> method to obtain the host name of the local computer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/GetHostName/dns_gethostname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Dns_GetHostName/VB/dns_gethostname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/GetHostName/dns_gethostname.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1885,7 +1885,7 @@
  The following example uses the <xref:System.Net.Dns.Resolve%2A> method to resolve an IP address to an <xref:System.Net.IPHostEntry> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/Resolve/dns_resolve.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Dns_Resolve/VB/dns_resolve.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/Resolve/dns_resolve.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/DownloadDataCompletedEventArgs.xml b/xml/System.Net/DownloadDataCompletedEventArgs.xml
index 3230f68c07d..bccd2624f40 100644
--- a/xml/System.Net/DownloadDataCompletedEventArgs.xml
+++ b/xml/System.Net/DownloadDataCompletedEventArgs.xml
@@ -60,12 +60,12 @@
  The following code example demonstrates downloading a user-specified resource.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet21":::
 
  The following method is called when the download completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet22":::
 
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet22":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/DownloadDataCompletedEventHandler.xml b/xml/System.Net/DownloadDataCompletedEventHandler.xml
index 9df0fede7ba..4a9f46d49ae 100644
--- a/xml/System.Net/DownloadDataCompletedEventHandler.xml
+++ b/xml/System.Net/DownloadDataCompletedEventHandler.xml
@@ -62,12 +62,12 @@
  The following code example demonstrates downloading a user-specified resource.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet21":::
 
  The following method is called when the download completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet22":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet22":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet22":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/DownloadProgressChangedEventArgs.xml b/xml/System.Net/DownloadProgressChangedEventArgs.xml
index ea50d6d0216..b211fe1628b 100644
--- a/xml/System.Net/DownloadProgressChangedEventArgs.xml
+++ b/xml/System.Net/DownloadProgressChangedEventArgs.xml
@@ -58,7 +58,7 @@ Instances of this class are passed to the <xref:System.Net.DownloadProgressChang
 The following code example demonstrates setting an event handler for the <xref:System.Net.WebClient.DownloadProgressChanged> event.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="SnippetDownloadProgressChanged":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="SnippetDownloadProgressChanged":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="SnippetDownloadProgressChanged":::
 
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@ The following code example demonstrates setting an event handler for the <xref:S
  The following code example shows an implementation of a handler for the <xref:System.Net.WebClient.DownloadProgressChanged> event. The method displays the value of the `BytesReceived` property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet42":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet42":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet42":::
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@ The following code example demonstrates setting an event handler for the <xref:S
  The following code example shows an implementation of a handler for the <xref:System.Net.WebClient.DownloadProgressChanged> event. The method displays the value of the `TotalBytesToReceive` property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet42":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet42":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet42":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/DownloadProgressChangedEventHandler.xml b/xml/System.Net/DownloadProgressChangedEventHandler.xml
index 756d4949fed..15801e341d1 100644
--- a/xml/System.Net/DownloadProgressChangedEventHandler.xml
+++ b/xml/System.Net/DownloadProgressChangedEventHandler.xml
@@ -68,7 +68,7 @@
 The following code example demonstrates setting an event handler for the <xref:System.Net.WebClient.DownloadProgressChanged> event.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="SnippetDownloadProgressChanged":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="SnippetDownloadProgressChanged":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="SnippetDownloadProgressChanged":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/DownloadStringCompletedEventArgs.xml b/xml/System.Net/DownloadStringCompletedEventArgs.xml
index 168208e46fc..4a1c9cff479 100644
--- a/xml/System.Net/DownloadStringCompletedEventArgs.xml
+++ b/xml/System.Net/DownloadStringCompletedEventArgs.xml
@@ -64,12 +64,12 @@
  The following code example demonstrates downloading a string asynchronously.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet28":::
 
  The following method is called when the download completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet29":::
 
  ]]></format>
     </remarks>
@@ -127,7 +127,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet29":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/DownloadStringCompletedEventHandler.xml b/xml/System.Net/DownloadStringCompletedEventHandler.xml
index 3a7542bb799..81ac90f182e 100644
--- a/xml/System.Net/DownloadStringCompletedEventHandler.xml
+++ b/xml/System.Net/DownloadStringCompletedEventHandler.xml
@@ -66,12 +66,12 @@
  The following code example demonstrates downloading a string asynchronously.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet28":::
 
  The following method is called when the download completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet29":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet29":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet29":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/FileWebRequest.xml b/xml/System.Net/FileWebRequest.xml
index 4394eb1cbe9..f9453c7a074 100644
--- a/xml/System.Net/FileWebRequest.xml
+++ b/xml/System.Net/FileWebRequest.xml
@@ -81,7 +81,7 @@
  The following code example uses the <xref:System.Net.FileWebRequest> class to access a file system resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/Overview/getrequeststream.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest/VB/getrequeststream.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/Overview/getrequeststream.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -269,7 +269,7 @@
  The following code example uses <xref:System.Net.FileWebRequest.BeginGetRequestStream%2A> to make an asynchronous request for a <xref:System.IO.Stream> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/BeginGetRequestStream/filewebrequest_reqbeginend.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ReqBeginEnd/VB/filewebrequest_reqbeginend.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/BeginGetRequestStream/filewebrequest_reqbeginend.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -345,7 +345,7 @@
  The following code example uses the <xref:System.Net.FileWebRequest.BeginGetResponse%2A> method to asynchronously access a file system resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/BeginGetResponse/filewebrequest_resbeginend.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ResBeginEnd/VB/filewebrequest_resbeginend.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/BeginGetResponse/filewebrequest_resbeginend.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -470,7 +470,7 @@
  The following code example sets the content length of the data being sent. Refer to the complete example in the <xref:System.Net.FileWebRequest> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/Overview/getrequeststream.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest/VB/getrequeststream.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/Overview/getrequeststream.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -653,7 +653,7 @@
  The following example uses the <xref:System.Net.FileWebRequest.EndGetRequestStream%2A> method to end the asynchronous request for a <xref:System.IO.Stream> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/BeginGetRequestStream/filewebrequest_reqbeginend.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ReqBeginEnd/VB/filewebrequest_reqbeginend.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/BeginGetRequestStream/filewebrequest_reqbeginend.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -718,7 +718,7 @@
  The following code example uses the <xref:System.Net.FileWebRequest.EndGetResponse%2A> method to end an asynchronous request for a file system resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/BeginGetResponse/filewebrequest_resbeginend.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ResBeginEnd/VB/filewebrequest_resbeginend.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/BeginGetResponse/filewebrequest_resbeginend.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -838,7 +838,7 @@
  The following code example uses the <xref:System.Net.FileWebRequest.GetRequestStream%2A> method to obtain a stream instance used to write to the file. Refer to the complete example in the <xref:System.Net.FileWebRequest> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/Overview/getrequeststream.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest/VB/getrequeststream.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/Overview/getrequeststream.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -950,7 +950,7 @@ The stream already received a response previous to your request.</exception>
  The following code example uses the <xref:System.Net.FileWebRequest.GetResponse%2A> method to return a file system request response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/GetResponse/getresponse.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest.GetResponse/VB/getresponse.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/GetResponse/getresponse.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1113,7 +1113,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following code example sets the protocol method used for the request. Refer to the complete example in the <xref:System.Net.FileWebRequest> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/Overview/getrequeststream.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest/VB/getrequeststream.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/Overview/getrequeststream.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1297,7 +1297,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following code example uses the <xref:System.Net.FileWebRequest.RequestUri%2A> property to get the URI of the request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/RequestUri/filewebrequest_contentlength.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebRequest_ContentLength/VB/filewebrequest_contentlength.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/RequestUri/filewebrequest_contentlength.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1414,7 +1414,7 @@ This method stores in the task it returns all non-usage exceptions that the meth
  The following code example sets the <xref:System.Net.FileWebRequest.Timeout%2A> property. Refer to the complete example in the <xref:System.Net.FileWebRequest> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebRequest/Overview/getrequeststream.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.FileWebRequest/VB/getrequeststream.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebRequest/Overview/getrequeststream.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/FileWebResponse.xml b/xml/System.Net/FileWebResponse.xml
index 05c461d51a0..0fb769bc2a1 100644
--- a/xml/System.Net/FileWebResponse.xml
+++ b/xml/System.Net/FileWebResponse.xml
@@ -207,7 +207,7 @@
  The following example uses the <xref:System.Net.FileWebResponse.Close%2A> method to close the response stream.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebResponse/Close/filewebresponse_close.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_Close/VB/filewebresponse_close.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebResponse/Close/filewebresponse_close.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -263,7 +263,7 @@
  The following example uses the <xref:System.Net.FileWebResponse.ContentLength%2A> property to obtain the content length of the file system resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebResponse/ContentLength/filewebresponse_contentlength_contenttype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_ContentLength_ContentType/VB/filewebresponse_contentlength_contenttype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebResponse/ContentLength/filewebresponse_contentlength_contenttype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
  The following example uses the <xref:System.Net.FileWebResponse.ContentType%2A> property to obtain the content type of the file system resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebResponse/ContentLength/filewebresponse_contentlength_contenttype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_ContentLength_ContentType/VB/filewebresponse_contentlength_contenttype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebResponse/ContentLength/filewebresponse_contentlength_contenttype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -468,7 +468,7 @@
  The following example uses the <xref:System.Net.FileWebResponse.GetResponseStream%2A> method to return the data stream from the file system resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebResponse/GetResponseStream/filewebresponse_getresponsestream.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_GetResponseStream/VB/filewebresponse_getresponsestream.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebResponse/GetResponseStream/filewebresponse_getresponsestream.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -524,7 +524,7 @@
  The following example uses the <xref:System.Net.FileWebResponse.Headers%2A> property to retrieve the name/value pairs associated with the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebResponse/Headers/filewebresponse_headers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_Headers/VB/filewebresponse_headers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebResponse/Headers/filewebresponse_headers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -580,7 +580,7 @@
  The following example uses the <xref:System.Net.FileWebResponse.ResponseUri%2A> to retrieve the URI of the file system resource that provided the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/FileWebResponse/ResponseUri/filewebresponse_responseuri.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FileWebResponse_ResponseUri/VB/filewebresponse_responseuri.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/FileWebResponse/ResponseUri/filewebresponse_responseuri.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/HttpListener.xml b/xml/System.Net/HttpListener.xml
index fbf622cb9a2..c42d0e1d0df 100644
--- a/xml/System.Net/HttpListener.xml
+++ b/xml/System.Net/HttpListener.xml
@@ -56,7 +56,7 @@
     <example>
       <format type="text/markdown"><![CDATA[
         :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
-        :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+        :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
       ]]></format>
     </example>
     <related type="Article" href="/dotnet/framework/network-programming/changes-to-ntlm-authentication-for-httpwebrequest-in-version-3-5-sp1">Changes to NTLM authentication for HTTPWebRequest in Version 3.5 SP1</related>
@@ -108,7 +108,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListener> constructor to create a new <xref:System.Net.HttpListener> object. For the complete example, see the <xref:System.Net.HttpListener> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -169,7 +169,7 @@
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -240,7 +240,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListener.AuthenticationSchemes%2A> property to specify an authentication scheme.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -312,12 +312,12 @@
  The following code example sets the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet2":::
 
  The following code example provides an implementation of a method invoked by an <xref:System.Net.AuthenticationSchemeSelector> delegate.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -392,12 +392,12 @@
  The following code example demonstrates using the <xref:System.Net.HttpListener.BeginGetContext%2A> method to specify a callback method that will handle incoming client requests.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet12":::
 
  The following code example implements a callback method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -459,7 +459,7 @@
 The following code example demonstrates calling the `Close` method:
 
 :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet12":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet12":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -604,7 +604,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example shows the implementation of a callback method that calls the <xref:System.Net.HttpListener.EndGetContext%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -817,7 +817,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -941,7 +941,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example demonstrates setting this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -998,7 +998,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example demonstrates using this property to determine the listening state of an instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1049,7 +1049,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example demonstrates the use of the <xref:System.Net.HttpListener.IsSupported%2A> property to detect whether an <xref:System.Net.HttpListener> object can be used with the current operating system.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1104,7 +1104,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example demonstrates using the <xref:System.Net.HttpListener.Prefixes%2A> property to obtain and print the URI prefixes that are handled.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1173,7 +1173,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example demonstrates setting the <xref:System.Net.HttpListener.Realm%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -1234,7 +1234,7 @@ The following code example demonstrates calling the `Close` method:
  The following code example demonstrates using the <xref:System.Net.HttpListener.Start%2A> method to begin processing incoming requests.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -1297,7 +1297,7 @@ The following code example demonstrates calling the `Close` method:
 The following code example demonstrates using the <xref:System.Net.HttpListener.Stop%2A> method to stop processing incoming requests.
 
 :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1470,7 +1470,7 @@ The following code example demonstrates using the <xref:System.Net.HttpListener.
  The following code example demonstrates setting this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/HttpListenerContext.xml b/xml/System.Net/HttpListenerContext.xml
index 8b3a8da37e1..4ca6e6da36b 100644
--- a/xml/System.Net/HttpListenerContext.xml
+++ b/xml/System.Net/HttpListenerContext.xml
@@ -64,7 +64,7 @@
  The following code example displays the user information for a client request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet8":::
 
  ]]></format>
     </remarks>
@@ -452,7 +452,7 @@
  The following code example demonstrates calling this method. The `listener` variable holds an <xref:System.Net.HttpListener> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -507,7 +507,7 @@
  The following code example demonstrates getting the response to a client's request and adding the response body.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -574,7 +574,7 @@
  The following code example demonstrates accessing identity and authentication information about the client, and returning it to the client in the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/HttpListenerPrefixCollection.xml b/xml/System.Net/HttpListenerPrefixCollection.xml
index 556b671ceb7..7417b5a948e 100644
--- a/xml/System.Net/HttpListenerPrefixCollection.xml
+++ b/xml/System.Net/HttpListenerPrefixCollection.xml
@@ -73,7 +73,7 @@
  The following code example creates an <xref:System.Net.HttpListener> and adds user-specified prefixes to its <xref:System.Net.HttpListenerPrefixCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -140,7 +140,7 @@
  The following code example creates an <xref:System.Net.HttpListener> and adds user-specified prefixes to its <xref:System.Net.HttpListenerPrefixCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following code example removes all prefixes in an <xref:System.Net.HttpListenerPrefixCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -278,7 +278,7 @@
  The following code example checks to see whether a user-specified prefix is contained in the prefix collection of an <xref:System.Net.HttpListener>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -359,7 +359,7 @@
  The following code example copies the prefixes in a <xref:System.Net.HttpListenerPrefixCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -429,7 +429,7 @@
  The following code example copies the prefixes in a <xref:System.Net.HttpListenerPrefixCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -487,7 +487,7 @@
  The following code example displays the prefixes in a collection.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -551,7 +551,7 @@
  The following code example demonstrates enumerating through a collection. Note that the Visual Basic and C# examples use language specific statements to enumerate through the collection instead of retrieving the enumerator.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/HttpListenerRequest.xml b/xml/System.Net/HttpListenerRequest.xml
index c9c5fa50c72..32df89f253c 100644
--- a/xml/System.Net/HttpListenerRequest.xml
+++ b/xml/System.Net/HttpListenerRequest.xml
@@ -64,7 +64,7 @@
  The following code example demonstrates how to receive and respond to a <xref:System.Net.HttpListenerRequest>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
@@ -131,7 +131,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -242,7 +242,7 @@
  The following code example checks this property to determine whether the request includes a valid client certificate.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -305,7 +305,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListenerRequest.ContentEncoding%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@
  The following code example uses the <xref:System.Net.HttpListenerRequest.ContentLength64%2A> property while processing body data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -438,7 +438,7 @@
  The following code example demonstrates how to use this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -496,7 +496,7 @@
  The following code example displays the values of cookies sent with the request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -721,7 +721,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -781,7 +781,7 @@
  The following code example displays all the information in a given <xref:System.Net.WebHeaderCollection> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet21":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet21":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet21":::
 
  ]]></format>
         </remarks>
@@ -839,7 +839,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -900,7 +900,7 @@
  The following code example demonstrates using this property to read the data sent with a request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -964,7 +964,7 @@
  The following code example displays the value of the <xref:System.Net.HttpListenerRequest.IsAuthenticated%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1029,7 +1029,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListenerRequest.IsLocal%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1088,7 +1088,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListenerRequest.IsSecureConnection%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1188,7 +1188,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1252,7 +1252,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1316,7 +1316,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1375,7 +1375,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListenerRequest.QueryString%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1446,7 +1446,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListenerRequest.RawUrl%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -1505,7 +1505,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -1802,7 +1802,7 @@
  The following code example demonstrates using the <xref:System.Net.HttpListenerRequest.Url%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1876,7 +1876,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -1949,7 +1949,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -2013,7 +2013,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -2081,7 +2081,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -2148,7 +2148,7 @@
  The following code example displays the languages from the request's `Accept-Language` header.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/HttpListenerResponse.xml b/xml/System.Net/HttpListenerResponse.xml
index 3bf74308f3a..259ede30b3c 100644
--- a/xml/System.Net/HttpListenerResponse.xml
+++ b/xml/System.Net/HttpListenerResponse.xml
@@ -180,7 +180,7 @@
  The following code example demonstrates adding a header using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet26":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet26":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet26":::
 
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
  The following code example demonstrates adding a cookie to a response
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@
  The following code example demonstrates calling this method to send a <xref:System.Net.HttpStatusCode.Forbidden> (403) response to the client.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -471,7 +471,7 @@
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet24":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet24":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet24":::
 
  ]]></format>
         </remarks>
@@ -547,7 +547,7 @@
  The following code example demonstrates using this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -613,7 +613,7 @@
  The following code example demonstrates setting the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -742,7 +742,7 @@
  The following code example checks a request for a cookie, and returns a new cookie with the response if the request did not have one.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet20":::
 
  ]]></format>
         </remarks>
@@ -817,7 +817,7 @@
  The following code example demonstrates creating a response by copying a template response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -886,7 +886,7 @@
  The following code example demonstrates displaying the headers in a <xref:System.Net.WebHeaderCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet23":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet23":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet23":::
 
  ]]></format>
         </remarks>
@@ -954,7 +954,7 @@
  The following code example demonstrates setting the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1016,7 +1016,7 @@
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1075,7 +1075,7 @@
  The following code example demonstrates setting the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1146,7 +1146,7 @@
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet27":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet27":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet27":::
 
  ]]></format>
         </remarks>
@@ -1214,7 +1214,7 @@
  The following code example demonstrates setting this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet25":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet25":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet25":::
 
  ]]></format>
         </remarks>
@@ -1325,7 +1325,7 @@
  The following code example demonstrates calling this method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpListener/Overview/test.cs" id="Snippet28":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Net_Listener_Basic/VB/test.vb" id="Snippet28":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpListener/Overview/test.vb" id="Snippet28":::
 
  ]]></format>
         </remarks>
@@ -1388,7 +1388,7 @@
  The following code example demonstrates setting the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1448,7 +1448,7 @@
  The following code example demonstrates setting the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationSchemes/Overview/sample.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLListener/vb/sample.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationSchemes/Overview/sample.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/HttpVersion.xml b/xml/System.Net/HttpVersion.xml
index f3c597d5064..bfe9202f34f 100644
--- a/xml/System.Net/HttpVersion.xml
+++ b/xml/System.Net/HttpVersion.xml
@@ -64,7 +64,7 @@
  The following example demonstrates the use of <xref:System.Net.HttpVersion>.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpVersion/Overview/httpversion_version10.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpVersion_Version10/VB/httpversion_version10.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpVersion/Overview/httpversion_version10.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/HttpWebRequest.xml b/xml/System.Net/HttpWebRequest.xml
index 93479fdc623..3939af168cc 100644
--- a/xml/System.Net/HttpWebRequest.xml
+++ b/xml/System.Net/HttpWebRequest.xml
@@ -125,7 +125,7 @@ For apps that use TLS/SSL through APIs such as HttpClient, HttpWebRequest, FTPCl
  The following code example creates an <xref:System.Net.HttpWebRequest> for the URI `http://www.contoso.com/`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -412,7 +412,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example sets the <xref:System.Net.HttpWebRequest.Accept%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Accept/httpwebrequest_accept.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Accept/VB/httpwebrequest_accept.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Accept/httpwebrequest_accept.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1246,7 +1246,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example checks to see if the <xref:System.Net.HttpWebRequest> object `req` was redirected to another location to fulfill the request, and sets the value of the `hasChanged` variable to `true` if the request was redirected; otherwise `hasChanged` is set to `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Address/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest.RequestUri Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Address/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1316,7 +1316,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example uses the <xref:System.Net.HttpWebRequest.AllowAutoRedirect%2A> property to allow the request to follow redirection responses.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/AllowAutoRedirect/httpwebrequest_allowautoredirect.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_AllowAutoRedirect/VB/httpwebrequest_allowautoredirect.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/AllowAutoRedirect/httpwebrequest_allowautoredirect.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1424,7 +1424,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example uses the <xref:System.Net.HttpWebRequest.AllowWriteStreamBuffering%2A> property to disable data buffering.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/AllowWriteStreamBuffering/httpwebrequest_allowwritestreambuffering.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_AllowWriteStreamBuffering/VB/httpwebrequest_allowwritestreambuffering.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/AllowWriteStreamBuffering/httpwebrequest_allowwritestreambuffering.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1557,7 +1557,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example uses the <xref:System.Net.HttpWebRequest.BeginGetRequestStream%2A> method to make an asynchronous request for a stream instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/BeginGetRequestStream/httpwebrequest_begingetrequeststream.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_BeginGetRequestStream/VB/httpwebrequest_begingetrequeststream.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/BeginGetRequestStream/httpwebrequest_begingetrequeststream.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1831,7 +1831,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example uses the <xref:System.Net.HttpWebRequest.Connection%2A> property to set the value of the Connection HTTP Header.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Connection/httpwebrequest_connection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Connection/VB/httpwebrequest_connection.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Connection/httpwebrequest_connection.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1978,7 +1978,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example sets the <xref:System.Net.HttpWebRequest.ContentLength%2A> property to the length of the string being posted.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ContentLength/VB/httpwebrequest_contentlength.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2055,7 +2055,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example sets the <xref:System.Net.HttpWebRequest.ContentType%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ContentLength/VB/httpwebrequest_contentlength.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2258,7 +2258,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example sends a request to a URL and displays the cookies returned in the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2344,7 +2344,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example sets the credentials for a request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Credentials/httpwebrequest1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2669,7 +2669,7 @@ Both <xref:System.Net.HttpWebRequest> constructors are obsolete and should not b
  The following code example uses the <xref:System.Net.HttpWebRequest.EndGetRequestStream%2A> method to end an asynchronous request for a stream instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/BeginGetRequestStream/httpwebrequest_begingetrequeststream.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_BeginGetRequestStream/VB/httpwebrequest_begingetrequeststream.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/BeginGetRequestStream/httpwebrequest_begingetrequeststream.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3102,7 +3102,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example uses the <xref:System.Net.HttpWebRequest.GetRequestStream%2A> method to return a stream instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ContentLength/VB/httpwebrequest_contentlength.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3314,7 +3314,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example gets the response for a request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Credentials/httpwebrequest1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3405,7 +3405,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example checks the <xref:System.Net.HttpWebRequest.HaveResponse%2A> property to determine if a response has been received from an Internet resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/HaveResponse/httpwebrequest_haveresponse.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Httpwebrequest_HaveResponse/VB/httpwebrequest_haveresponse.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/HaveResponse/httpwebrequest_haveresponse.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3499,7 +3499,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example uses the <xref:System.Net.HttpWebRequest.Headers%2A> property to print the HTTP header name/value pairs to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Headers/httpwebrequest_headers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Headers/VB/httpwebrequest_headers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Headers/httpwebrequest_headers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3654,7 +3654,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example checks the <xref:System.Net.HttpWebRequest.IfModifiedSince%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/IfModifiedSince/httpwebrequest_ifmodifiedsince.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_IfModifiedSince/VB/httpwebrequest_ifmodifiedsince.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/IfModifiedSince/httpwebrequest_ifmodifiedsince.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3730,7 +3730,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the <xref:System.Net.HttpWebRequest.KeepAlive%2A> property to `false` to avoid establishing a persistent connection with the Internet resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Connection/httpwebrequest_connection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Connection/VB/httpwebrequest_connection.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Connection/httpwebrequest_connection.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3798,7 +3798,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Credentials/httpwebrequest1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3871,7 +3871,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Credentials/httpwebrequest1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4009,7 +4009,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the <xref:System.Net.HttpWebRequest.Method%2A> property to POST.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ContentLength/VB/httpwebrequest_contentlength.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ContentLength/httpwebrequest_contentlength.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -4089,7 +4089,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example prints the value of the <xref:System.Net.HttpWebRequest.Pipelined%2A> property to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Pipelined/httpwebrequest_pipelined.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_PipeLined/VB/httpwebrequest_pipelined.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Pipelined/httpwebrequest_pipelined.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4285,7 +4285,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the <xref:System.Net.HttpWebRequest.ProtocolVersion%2A> Property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ProtocolVersion/httpwebrequest_protocolversion.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_ProtocolVersion/VB/httpwebrequest_protocolversion.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ProtocolVersion/httpwebrequest_protocolversion.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4361,7 +4361,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example uses the <xref:System.Net.HttpWebRequest.Proxy%2A> method to get the proxy information for the request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Proxy/httpwebrequest_proxy.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Httpwebrequest_proxy/VB/httpwebrequest_proxy.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Proxy/httpwebrequest_proxy.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4515,7 +4515,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the <xref:System.Net.HttpWebRequest.Referer%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Referer/httpwebrequest_referer.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Referer/VB/httpwebrequest_referer.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Referer/httpwebrequest_referer.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4590,7 +4590,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example checks to see if the <xref:System.Net.HttpWebRequest> object `req` was redirected to another location to fulfill the request, and sets the value of the `hasChanged` variable to `true` if the request was redirected; otherwise, `hasChanged` is set to `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Address/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebRequest.RequestUri Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Address/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4655,7 +4655,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the <xref:System.Net.HttpWebRequest.SendChunked%2A> property to `true` so that data can be sent in segments to the Internet resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/SendChunked/httpwebrequest_sendchunked.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_SendChunked/VB/httpwebrequest_sendchunked.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/SendChunked/httpwebrequest_sendchunked.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -4779,7 +4779,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -4977,7 +4977,7 @@ The GetHashCode method returns a hash code of the web request. This value can be
  The following code example sets the <xref:System.Net.HttpWebRequest.Timeout%2A> property of the <xref:System.Net.HttpWebRequest> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Timeout/httpwebrequest_timeout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_Timeout/VB/httpwebrequest_timeout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Timeout/httpwebrequest_timeout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -5239,7 +5239,7 @@ The value for this property is stored in <xref:System.Net.WebHeaderCollection>.
  The following code example sets the <xref:System.Net.HttpWebRequest.UserAgent%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/UserAgent/httpwebrequest_useragent.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebRequest_UserAgent/VB/httpwebrequest_useragent.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/UserAgent/httpwebrequest_useragent.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/HttpWebResponse.xml b/xml/System.Net/HttpWebResponse.xml
index 205448ff114..857a7e2dbf8 100644
--- a/xml/System.Net/HttpWebResponse.xml
+++ b/xml/System.Net/HttpWebResponse.xml
@@ -109,7 +109,7 @@ The contents of the response from the Internet resource are returned as a <xref:
  The following example returns an <xref:System.Net.HttpWebResponse> from an <xref:System.Net.HttpWebRequest>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebResponse Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -316,7 +316,7 @@ The contents of the response from the Internet resource are returned as a <xref:
  The following example obtains the character set of the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/CharacterSet/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ContentEncoding_CharacterSet/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/CharacterSet/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -383,7 +383,7 @@ The contents of the response from the Internet resource are returned as a <xref:
  The following example demonstrates how to close a <xref:System.Net.HttpWebResponse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/Close/httpwebresponse_close.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Close/VB/httpwebresponse_close.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/Close/httpwebresponse_close.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -443,7 +443,7 @@ The contents of the response from the Internet resource are returned as a <xref:
  The following example uses the <xref:System.Net.HttpWebResponse.ContentEncoding%2A> property to obtain the value of the Content-Encoding header returned with the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/CharacterSet/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ContentEncoding_CharacterSet/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/CharacterSet/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -504,7 +504,7 @@ The contents of the response from the Internet resource are returned as a <xref:
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Credentials/httpwebrequest1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -565,7 +565,7 @@ The contents of the response from the Internet resource are returned as a <xref:
  The following example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/Credentials/httpwebrequest1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLResponse1/VB/httpwebrequest1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/Credentials/httpwebrequest1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -635,7 +635,7 @@ The contents of the response from the Internet resource are returned as a <xref:
  The following example sends a request to a URL and displays the cookies returned in the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/Cookie/Overview/cookiessnippets.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLCookies/VB/cookiessnippets.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Cookie/Overview/cookiessnippets.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -878,7 +878,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  This example creates a Web request and queries for a response. If the site requires authentication, this example will respond with a challenge string. This string is extracted using <xref:System.Net.HttpWebResponse.GetResponseHeader%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/GetResponseHeader/httpwebresponse_getresponseheader.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_GetResponseHeader/VB/httpwebresponse_getresponseheader.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/GetResponseHeader/httpwebresponse_getresponseheader.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -946,7 +946,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  The following example demonstrates how to use <xref:System.Net.HttpWebResponse.GetResponseStream%2A> to return the <xref:System.IO.Stream> instance used to read the response from the server.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/GetResponseStream/httpwebresponse_getresponsestream.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_GetResponseStream/VB/httpwebresponse_getresponsestream.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/GetResponseStream/httpwebresponse_getresponsestream.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1016,7 +1016,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  The following example writes the contents of all of the response headers to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/Headers/httpwebresponse_headers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Headers/VB/httpwebresponse_headers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/Headers/httpwebresponse_headers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1128,7 +1128,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  This example creates an <xref:System.Net.HttpWebRequest> and queries for a response. This example then checks whether the entity requested had been modified any time today.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/LastModified/httpwebresponse_lastmodified.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_LastModified/VB/httpwebresponse_lastmodified.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/LastModified/httpwebresponse_lastmodified.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1192,7 +1192,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  The following example checks the string contained in <xref:System.Net.HttpWebResponse.Method%2A>, to determine the Http method invoked by the Web server.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/Method/httpwebresponse_method_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Method_Server/VB/httpwebresponse_method_server.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/Method/httpwebresponse_method_server.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1252,7 +1252,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  This example creates an <xref:System.Net.HttpWebRequest> and queries for an <xref:System.Net.HttpWebResponse>. The example then checks to see if the server is responding with the same version.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/ProtocolVersion/httpwebresponse_protocolversion.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ProtocolVersion/VB/httpwebresponse_protocolversion.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/ProtocolVersion/httpwebresponse_protocolversion.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1317,7 +1317,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  This example creates a <xref:System.Net.HttpWebRequest> and queries for an <xref:System.Net.HttpWebResponse> and then checks to see whether the original URI was redirected by the server.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/ResponseUri/httpwebresponse_responseuri.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_ResponseUri/VB/httpwebresponse_responseuri.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/ResponseUri/httpwebresponse_responseuri.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1377,7 +1377,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  The following example uses the <xref:System.Net.HttpWebResponse.Server%2A> property to display the Web server's name to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/Method/httpwebresponse_method_server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_Method_Server/VB/httpwebresponse_method_server.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/Method/httpwebresponse_method_server.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1441,7 +1441,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  The following example uses <xref:System.Net.HttpWebResponse.StatusCode%2A> to verify that the status of the <xref:System.Net.HttpWebResponse> is OK.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/StatusCode/httpwebresponse_statuscode_statusdescription.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_StatusCode_StatusDescription/VB/httpwebresponse_statuscode_statusdescription.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/StatusCode/httpwebresponse_statuscode_statusdescription.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1505,7 +1505,7 @@ The GetHashCode method returns a hash code of the web response instance. This va
  The following example uses <xref:System.Net.HttpWebResponse.StatusDescription%2A> to verify that the status of the <xref:System.Net.HttpWebResponse> is OK.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebResponse/StatusCode/httpwebresponse_statuscode_statusdescription.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebResponse_StatusCode_StatusDescription/VB/httpwebresponse_statuscode_statusdescription.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebResponse/StatusCode/httpwebresponse_statuscode_statusdescription.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/IAuthenticationModule.xml b/xml/System.Net/IAuthenticationModule.xml
index f270ff9c46c..518dccc46f9 100644
--- a/xml/System.Net/IAuthenticationModule.xml
+++ b/xml/System.Net/IAuthenticationModule.xml
@@ -57,7 +57,7 @@
  The following example creates a customized authentication class by implementing the <xref:System.Net.IAuthenticationModule> interface. For a complete example refer to the <xref:System.Net.AuthenticationManager> class.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet6":::
 
  ]]></format>
     </remarks>
@@ -129,7 +129,7 @@
  The following example shows how to use the <xref:System.Net.IAuthenticationModule.Authenticate%2A> method. For a complete example refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -188,7 +188,7 @@
  The following example shows how to use the <xref:System.Net.IAuthenticationModule.AuthenticationType%2A> property. For a complete example refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -245,7 +245,7 @@
  The following example shows how to use the <xref:System.Net.IAuthenticationModule.CanPreAuthenticate%2A> property. For a complete example refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -317,7 +317,7 @@
  The following example shows how to use the <xref:System.Net.IAuthenticationModule.PreAuthenticate%2A> method. For a complete example refer to the <xref:System.Net.AuthenticationManager> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/AuthenticationManager/Overview/custombasicauthentication.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.Authentication/VB/custombasicauthentication.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/AuthenticationManager/Overview/custombasicauthentication.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/ICertificatePolicy.xml b/xml/System.Net/ICertificatePolicy.xml
index 2044be7be5b..86d7cd1df3c 100644
--- a/xml/System.Net/ICertificatePolicy.xml
+++ b/xml/System.Net/ICertificatePolicy.xml
@@ -30,7 +30,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic ICertificatePolicy Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Net/ICertificatePolicy/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic ICertificatePolicy Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ICertificatePolicy/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/ICredentials.xml b/xml/System.Net/ICredentials.xml
index 605d0503c79..8f259a14d4a 100644
--- a/xml/System.Net/ICredentials.xml
+++ b/xml/System.Net/ICredentials.xml
@@ -62,7 +62,7 @@
  The following example illustrates how to use the <xref:System.Net.ICredentials> interface.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/ICredentials/Overview/icredential.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ICredential/VB/icredential.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ICredentials/Overview/icredential.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -131,7 +131,7 @@
  The following uses <xref:System.Net.ICredentials.GetCredential%2A> to retrieve a <xref:System.Net.NetworkCredential> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/ICredentials/Overview/icredential.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ICredential/VB/icredential.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ICredentials/Overview/icredential.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/IPAddress.xml b/xml/System.Net/IPAddress.xml
index 817e73e22e8..16567a220e3 100644
--- a/xml/System.Net/IPAddress.xml
+++ b/xml/System.Net/IPAddress.xml
@@ -103,7 +103,7 @@
  The following code example shows how to query a server to obtain the family addresses and the IP addresses it supports.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/Overview/ipaddress.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress/VB/ipaddress.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/Overview/ipaddress.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -538,7 +538,7 @@
  Refer to the example in the <xref:System.Net.IPAddress> class topic.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/Overview/ipaddress.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress/VB/ipaddress.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/Overview/ipaddress.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -662,7 +662,7 @@
  The following example prints the <xref:System.Net.IPAddress.Broadcast> address to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/Broadcast/ipaddress_broadcast_loopback.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_Broadcast_Loopback/VB/ipaddress_broadcast_loopback.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/Broadcast/ipaddress_broadcast_loopback.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -789,7 +789,7 @@
  The following code example shows how to get a server IP address in byte format.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/Overview/ipaddress.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress/VB/ipaddress.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/Overview/ipaddress.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1094,7 +1094,7 @@
  The following code example displays the value of the current host's Any address in standard compressed format.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/IPv6Any/noneanyloopback.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IPv6NoneAnyLoopback/VB/noneanyloopback.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/IPv6Any/noneanyloopback.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1159,7 +1159,7 @@
  The following code example displays the value of the current host's loopback address in standard compressed format.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/IPv6Any/noneanyloopback.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IPv6NoneAnyLoopback/VB/noneanyloopback.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/IPv6Any/noneanyloopback.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1224,7 +1224,7 @@
  The following code example displays the value of the current host's None address in standard compressed format.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/IPv6Any/noneanyloopback.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IPv6NoneAnyLoopback/VB/noneanyloopback.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/IPv6Any/noneanyloopback.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1570,7 +1570,7 @@
  The following code example uses the <xref:System.Net.IPAddress.IsLoopback%2A> method to determine whether the specified address is a loopback address.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/IsLoopback/isloopback.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.IsLoopback/VB/isloopback.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/IsLoopback/isloopback.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1703,7 +1703,7 @@
  The following example prints the <xref:System.Net.IPAddress.Loopback> address to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/Broadcast/ipaddress_broadcast_loopback.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_Broadcast_Loopback/VB/ipaddress_broadcast_loopback.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/Broadcast/ipaddress_broadcast_loopback.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1893,7 +1893,7 @@
  The following example uses the <xref:System.Net.IPAddress.NetworkToHostOrder%2A> method to convert a short value from network byte order to host byte order.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_NetworkToHost/VB/ipaddress_networktohost.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1966,7 +1966,7 @@
  The following example uses the <xref:System.Net.IPAddress.NetworkToHostOrder%2A> method to convert an integer value from network byte order to host byte order.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_NetworkToHost/VB/ipaddress_networktohost.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2039,7 +2039,7 @@
  The following example uses the <xref:System.Net.IPAddress.NetworkToHostOrder%2A> method to convert a long value from network byte order to host byte order.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_NetworkToHost/VB/ipaddress_networktohost.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/NetworkToHostOrder/ipaddress_networktohost.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2105,7 +2105,7 @@
  The following example uses the <xref:System.Net.IPAddress.None> property to indicate that no network interface should be used.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/None/ipaddress_none.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPAddress_None/VB/ipaddress_none.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/None/ipaddress_none.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2225,7 +2225,7 @@
  The following code converts a string that contains an IP address, in dotted-quad notation for IPv4 or in colon-hexadecimal notation for IPv6, into an instance of the <xref:System.Net.IPAddress> class. Then it uses the overloaded <xref:System.Net.IPAddress.ToString%2A> method to display the address in standard notation.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/Parse/parse.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress.Parse/VB/parse.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/Parse/parse.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2354,7 +2354,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPAddress/Overview/ipaddress.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPAddress/VB/ipaddress.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPAddress/Overview/ipaddress.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/IPEndPoint.xml b/xml/System.Net/IPEndPoint.xml
index 9abed0a45f2..683b69b6e4a 100644
--- a/xml/System.Net/IPEndPoint.xml
+++ b/xml/System.Net/IPEndPoint.xml
@@ -69,7 +69,7 @@
 
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
  The following example uses the specified IP address and port number to create an <xref:System.Net.IPEndPoint>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/.ctor/ipendpoint_properties.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPEndPoint_Properties/VB/ipendpoint_properties.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/.ctor/ipendpoint_properties.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -201,7 +201,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@
  The following example sets the <xref:System.Net.IPEndPoint.Address%2A> property using the <xref:System.Net.IPAddress> specified.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -329,7 +329,7 @@
  The following example uses the <xref:System.Net.IPEndPoint.AddressFamily%2A> property to return the <xref:System.Net.Sockets.AddressFamily> to which the <xref:System.Net.IPEndPoint> belongs. In this case it is the <xref:System.Net.Sockets.AddressFamily.InterNetwork><xref:System.Net.Sockets.AddressFamily>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -389,7 +389,7 @@
  The following example uses the specified <xref:System.Net.SocketAddress> to create an <xref:System.Net.IPEndPoint>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -563,7 +563,7 @@
  The following example uses the <xref:System.Net.IPEndPoint.MaxPort> property to print the maximum value that can be assigned to the <xref:System.Net.IPEndPoint.Port%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/.ctor/ipendpoint_properties.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPEndPoint_Properties/VB/ipendpoint_properties.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/.ctor/ipendpoint_properties.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -618,7 +618,7 @@
  The following example uses the <xref:System.Net.IPEndPoint.MinPort> property to print the minimum value that can be assigned to the <xref:System.Net.IPEndPoint.Port%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/.ctor/ipendpoint_properties.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPEndPoint_Properties/VB/ipendpoint_properties.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/.ctor/ipendpoint_properties.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -801,7 +801,7 @@ Literal IPv6 addresses require to be enclosed in square brackets [] when passing
  The following example uses the <xref:System.Net.IPEndPoint.Port%2A> property to set TCP port number of the <xref:System.Net.EndPoint>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -858,7 +858,7 @@ Literal IPv6 addresses require to be enclosed in square brackets [] when passing
  The following example uses the <xref:System.Net.IPEndPoint.Serialize%2A> method to serialize endpoint information into a <xref:System.Net.SocketAddress> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -915,7 +915,7 @@ Literal IPv6 addresses require to be enclosed in square brackets [] when passing
  The following example returns a string representation of the IP address and port number of the specified <xref:System.Net.IPEndPoint>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPEndPoint/Overview/ipendpoint.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.IPEndPoint/VB/ipendpoint.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPEndPoint/Overview/ipendpoint.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/IPHostEntry.xml b/xml/System.Net/IPHostEntry.xml
index 00500ffc1a3..dccfa0295c0 100644
--- a/xml/System.Net/IPHostEntry.xml
+++ b/xml/System.Net/IPHostEntry.xml
@@ -64,7 +64,7 @@
  The following example queries the DNS database for information on the host `www.contoso.com` and returns the information in an <xref:System.Net.IPHostEntry> instance.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/Dns/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Dns Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/Dns/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -171,7 +171,7 @@
  The following example uses the <xref:System.Net.IPHostEntry.AddressList%2A> property to access the IP addresses that are associated with the <xref:System.Net.IPHostEntry>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPHostEntry/AddressList/iphostentry_addresslist.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPHostEntry_AddressList/VB/iphostentry_addresslist.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPHostEntry/AddressList/iphostentry_addresslist.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -290,7 +290,7 @@
  The following example uses the <xref:System.Net.IPHostEntry.HostName%2A> property to retrieve the primary host name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IPHostEntry/AddressList/iphostentry_addresslist.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IPHostEntry_AddressList/VB/iphostentry_addresslist.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IPHostEntry/AddressList/iphostentry_addresslist.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/IWebProxy.xml b/xml/System.Net/IWebProxy.xml
index 9d5a29167f7..fe775d7e358 100644
--- a/xml/System.Net/IWebProxy.xml
+++ b/xml/System.Net/IWebProxy.xml
@@ -112,7 +112,7 @@
  The following example uses the <xref:System.Net.WebProxy.Credentials%2A> property to set the credentials that will be submitted to the proxy server for authentication.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/IWebProxy/Credentials/iwebproxy_interface.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IWebProxy_Interface/VB/iwebproxy_interface.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IWebProxy/Credentials/iwebproxy_interface.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -175,7 +175,7 @@
  The following example uses the <xref:System.Net.WebProxy.GetProxy%2A> method to return the URI that the <xref:System.Net.Http.HttpClient> uses to access the Internet resource.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IWebProxy/Credentials/iwebproxy_interface.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IWebProxy_Interface/VB/iwebproxy_interface.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IWebProxy/Credentials/iwebproxy_interface.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -238,7 +238,7 @@
  The following example uses the <xref:System.Net.WebProxy.IsBypassed%2A> property to determine whether the proxy server should be used for the specified host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/IWebProxy/Credentials/iwebproxy_interface.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IWebProxy_Interface/VB/iwebproxy_interface.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/IWebProxy/Credentials/iwebproxy_interface.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/NetworkCredential.xml b/xml/System.Net/NetworkCredential.xml
index 5b7b56fdb9f..b24992e24b6 100644
--- a/xml/System.Net/NetworkCredential.xml
+++ b/xml/System.Net/NetworkCredential.xml
@@ -90,7 +90,7 @@
  The following code example associates a <xref:System.Net.NetworkCredential> object with a set of Uniform Resource Identifiers (URIs) in a <xref:System.Net.CredentialCache>. It then passes the <xref:System.Net.CredentialCache> to a <xref:System.Net.Http.HttpClient> object, which uses it to authenticate requests to an Internet server.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/NetworkCredential/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic NetworkCredential Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/NetworkCredential/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -286,7 +286,7 @@
  The following code example creates a <xref:System.Net.NetworkCredential> object using the specified user name and password.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/NetworkCredential/.ctor/networkcredential_constructor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_Constructor2/VB/networkcredential_constructor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/NetworkCredential/.ctor/networkcredential_constructor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -472,7 +472,7 @@
  The following code example uses the <xref:System.Net.NetworkCredential.Domain%2A> property to set the domain associated with the credentials.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_UserName_Password_Domain/VB/networkcredential_username_password_domain.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -621,7 +621,7 @@
  The following code example uses the <xref:System.Net.NetworkCredential.GetCredential%2A> method to retrieve a <xref:System.Net.NetworkCredential> object for the specified URI.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/NetworkCredential/GetCredential/networkcredential_getcredential.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_GetCredential/VB/networkcredential_getcredential.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/NetworkCredential/GetCredential/networkcredential_getcredential.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -678,7 +678,7 @@
  The following code example uses the <xref:System.Net.NetworkCredential.Password%2A> property to set the password associated with the credentials.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_UserName_Password_Domain/VB/networkcredential_username_password_domain.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -791,7 +791,7 @@
  The following code example uses the <xref:System.Net.NetworkCredential.UserName%2A> property to set the user name associated with the credentials.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NetworkCredential_UserName_Password_Domain/VB/networkcredential_username_password_domain.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/NetworkCredential/Domain/networkcredential_username_password_domain.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/OpenReadCompletedEventArgs.xml b/xml/System.Net/OpenReadCompletedEventArgs.xml
index c62237dce05..99c571b096a 100644
--- a/xml/System.Net/OpenReadCompletedEventArgs.xml
+++ b/xml/System.Net/OpenReadCompletedEventArgs.xml
@@ -64,12 +64,12 @@
  The following code example demonstrates downloading a resource for reading.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet30":::
 
  The following method is called when the download completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet31":::
 
  ]]></format>
     </remarks>
@@ -127,7 +127,7 @@
  The following code example uses the stream returned by this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet31":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/OpenReadCompletedEventHandler.xml b/xml/System.Net/OpenReadCompletedEventHandler.xml
index feeb2b2652f..0a701b1ea1e 100644
--- a/xml/System.Net/OpenReadCompletedEventHandler.xml
+++ b/xml/System.Net/OpenReadCompletedEventHandler.xml
@@ -66,12 +66,12 @@
  The following code example demonstrates downloading a resource for reading.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet30":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet30":::
 
  The following method is called when the download completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet31":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet31":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet31":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/OpenWriteCompletedEventArgs.xml b/xml/System.Net/OpenWriteCompletedEventArgs.xml
index 74cdd9d89f1..4f1864931f9 100644
--- a/xml/System.Net/OpenWriteCompletedEventArgs.xml
+++ b/xml/System.Net/OpenWriteCompletedEventArgs.xml
@@ -64,12 +64,12 @@
  The following code example demonstrates opening a stream to write data to be uploaded.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet16":::
 
  The following method is called when the stream is available.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet15":::
 
  ]]></format>
     </remarks>
@@ -127,7 +127,7 @@
  The following code example uses the stream returned by this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/OpenWriteCompletedEventHandler.xml b/xml/System.Net/OpenWriteCompletedEventHandler.xml
index 37a8ed22fb2..d065c1e4279 100644
--- a/xml/System.Net/OpenWriteCompletedEventHandler.xml
+++ b/xml/System.Net/OpenWriteCompletedEventHandler.xml
@@ -66,12 +66,12 @@
  The following code example demonstrates opening a stream to write data to be uploaded.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet16":::
 
  The following method is called when the stream is available.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet15":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/ServicePoint.xml b/xml/System.Net/ServicePoint.xml
index 9c377fab322..45b0ddb38e3 100644
--- a/xml/System.Net/ServicePoint.xml
+++ b/xml/System.Net/ServicePoint.xml
@@ -77,7 +77,7 @@
  The following code example creates a <xref:System.Net.ServicePoint> object that connects to the URI `www.contoso.com`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -131,7 +131,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -269,7 +269,7 @@ Although a <xref:System.Net.ServicePoint> object can make multiple connections t
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -334,7 +334,7 @@ Although a <xref:System.Net.ServicePoint> object can make multiple connections t
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -467,7 +467,7 @@ Although a <xref:System.Net.ServicePoint> object can make multiple connections t
  The following code example sets the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/ServicePoint/ConnectionLeaseTimeout/nclservicepoint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLServicePoint/VB/nclservicepoint.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ServicePoint/ConnectionLeaseTimeout/nclservicepoint.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -535,7 +535,7 @@ Although a <xref:System.Net.ServicePoint> object can make multiple connections t
  The following code example uses the <xref:System.Net.ServicePoint.ConnectionLimit> property to check the maximum number of connections that the <xref:System.Net.ServicePoint> object can make to the specified Uniform Resource Identifier (URI).
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -605,7 +605,7 @@ Although a <xref:System.Net.ServicePoint> object can make multiple connections t
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -669,7 +669,7 @@ Although a <xref:System.Net.ServicePoint> object can make multiple connections t
  The following code example uses the <xref:System.Net.ServicePoint.CurrentConnections> property to determine the number of open Internet connections associated with this <xref:System.Net.ServicePoint> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -751,7 +751,7 @@ Although a <xref:System.Net.ServicePoint> object can make multiple connections t
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -859,7 +859,7 @@ The `GetHashCode` method returns a hash code of this instance. This value can be
  The following code example uses the <xref:System.Net.ServicePoint.IdleSince> property to set and retrieve the date and time that the <xref:System.Net.ServicePoint> object was last connected to a host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -926,7 +926,7 @@ The `GetHashCode` method returns a hash code of this instance. This value can be
  The following code example uses the <xref:System.Net.ServicePoint.MaxIdleTime> property to set and retrieve the <xref:System.Net.ServicePoint> idle time.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -991,7 +991,7 @@ The `GetHashCode` method returns a hash code of this instance. This value can be
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1059,7 +1059,7 @@ The `GetHashCode` method returns a hash code of this instance. This value can be
  The following code example sets the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/ServicePoint/ConnectionLeaseTimeout/nclservicepoint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLServicePoint/VB/nclservicepoint.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ServicePoint/ConnectionLeaseTimeout/nclservicepoint.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1202,7 +1202,7 @@ The `GetHashCode` method returns a hash code of this instance. This value can be
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -1280,7 +1280,7 @@ The `GetHashCode` method returns a hash code of this instance. This value can be
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/ServicePointManager.xml b/xml/System.Net/ServicePointManager.xml
index af6ad8fafdc..3451f99a22c 100644
--- a/xml/System.Net/ServicePointManager.xml
+++ b/xml/System.Net/ServicePointManager.xml
@@ -77,7 +77,7 @@
  The following code example creates a <xref:System.Net.ServicePoint> object for connections to the URI `www.contoso.com`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/ServicePointManager/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic ServicePoint Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ServicePointManager/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -137,7 +137,7 @@
  The following code example shows how to catch a certificate policy exception for a custom certificate policy. It assumes that the certificate policy object has been defined, that the Uniform Resource Identifier (URI) for the Web resource is contained in the variable `myUri`, and that there is a method named `ProcessResponse` that performs the work of the application.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/ServicePointManager/CertificatePolicy/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic ServicePointManager.CertificatePolicy Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ServicePointManager/CertificatePolicy/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -200,7 +200,7 @@
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -273,7 +273,7 @@
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -375,7 +375,7 @@
  The following code example sets the <xref:System.Net.ServicePointManager.DefaultConnectionLimit%2A> property using this field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -432,7 +432,7 @@
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/ServicePointManager/DnsRefreshTimeout/servicepoint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePointWhidbey/VB/servicepoint.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ServicePointManager/DnsRefreshTimeout/servicepoint.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -493,7 +493,7 @@
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/ServicePointManager/DnsRefreshTimeout/servicepoint.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePointWhidbey/VB/servicepoint.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/ServicePointManager/DnsRefreshTimeout/servicepoint.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -629,7 +629,7 @@
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -788,7 +788,7 @@
  The following code example demonstrates calling this method to access a <xref:System.Net.ServicePoint> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -929,7 +929,7 @@
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -999,7 +999,7 @@
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -1335,7 +1335,7 @@ Each callback returns a value that indicates whether the certificate is accepted
  The following code example sets this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/HttpWebRequest/ServicePoint/servicepoint.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Net.ServicePoint/VB/servicepoint.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/HttpWebRequest/ServicePoint/servicepoint.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/SocketAddress.xml b/xml/System.Net/SocketAddress.xml
index bdc6e92fd20..380cf10f7d2 100644
--- a/xml/System.Net/SocketAddress.xml
+++ b/xml/System.Net/SocketAddress.xml
@@ -69,7 +69,7 @@
  The following example demonstrates how to use <xref:System.Net.SocketAddress> to serialize an instance of the <xref:System.Net.EndPoint> class. After serialization, the underlying byte buffer of the <xref:System.Net.SocketAddress> contains all of the <xref:System.Net.IPEndPoint> state information.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/SocketAddress/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SocketAddressExample/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/SocketAddress/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/UploadDataCompletedEventArgs.xml b/xml/System.Net/UploadDataCompletedEventArgs.xml
index 6ef0fc92fe1..d7f6a56d111 100644
--- a/xml/System.Net/UploadDataCompletedEventArgs.xml
+++ b/xml/System.Net/UploadDataCompletedEventArgs.xml
@@ -60,12 +60,12 @@
  The following code example demonstrates asynchronously uploading data.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet34":::
 
  The following method is called when the upload completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet35":::
 
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet35":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/UploadDataCompletedEventHandler.xml b/xml/System.Net/UploadDataCompletedEventHandler.xml
index 014507b9a79..347919e01ce 100644
--- a/xml/System.Net/UploadDataCompletedEventHandler.xml
+++ b/xml/System.Net/UploadDataCompletedEventHandler.xml
@@ -62,12 +62,12 @@
  The following code example demonstrates asynchronously uploading data.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet34":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet34":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet34":::
 
  The following method is called when the upload completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet35":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet35":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet35":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/UploadFileCompletedEventArgs.xml b/xml/System.Net/UploadFileCompletedEventArgs.xml
index 83617fe377e..4488599ef72 100644
--- a/xml/System.Net/UploadFileCompletedEventArgs.xml
+++ b/xml/System.Net/UploadFileCompletedEventArgs.xml
@@ -60,12 +60,12 @@
  The following code example demonstrates asynchronously uploading a file.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet4":::
 
  The following method is called when the upload completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet5":::
 
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/UploadFileCompletedEventHandler.xml b/xml/System.Net/UploadFileCompletedEventHandler.xml
index c44d3c7a1e4..dda01b568da 100644
--- a/xml/System.Net/UploadFileCompletedEventHandler.xml
+++ b/xml/System.Net/UploadFileCompletedEventHandler.xml
@@ -62,12 +62,12 @@
  The following code example demonstrates asynchronously uploading a file.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet6":::
 
  The following method is called when the upload completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet7":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/UploadStringCompletedEventArgs.xml b/xml/System.Net/UploadStringCompletedEventArgs.xml
index 314f6399cb0..96b5ccf709b 100644
--- a/xml/System.Net/UploadStringCompletedEventArgs.xml
+++ b/xml/System.Net/UploadStringCompletedEventArgs.xml
@@ -64,12 +64,12 @@
  The following code example demonstrates asynchronously uploading a string.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet38":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet38":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet38":::
 
  The following method is called when the upload completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet39":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet39":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet39":::
 
  ]]></format>
     </remarks>
@@ -127,7 +127,7 @@
  The following code example displays the value of this property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet39":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet39":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet39":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/UploadStringCompletedEventHandler.xml b/xml/System.Net/UploadStringCompletedEventHandler.xml
index 2410b6b7dda..d4f6a52bd3f 100644
--- a/xml/System.Net/UploadStringCompletedEventHandler.xml
+++ b/xml/System.Net/UploadStringCompletedEventHandler.xml
@@ -66,12 +66,12 @@
  The following code example demonstrates asynchronously uploading a string.
   
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet38":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet38":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet38":::
 
  The following method is called when the upload completes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs" id="Snippet39":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb" id="Snippet39":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb" id="Snippet39":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/WebClient.xml b/xml/System.Net/WebClient.xml
index b913c48f9fa..86f22d5d713 100644
--- a/xml/System.Net/WebClient.xml
+++ b/xml/System.Net/WebClient.xml
@@ -114,7 +114,7 @@
 
  [!code-cpp[NCLWebClientUserAgent#1](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientUserAgent/CPP/useragent.cpp#1)]
  [!code-csharp[NCLWebClientUserAgent#1](~/snippets/csharp/System.Net/WebClient/Overview/useragent.cs#1)]
- [!code-vb[NCLWebClientUserAgent#1](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientUserAgent/VB/useragent.vb#1)]
+ [!code-vb[NCLWebClientUserAgent#1](~/snippets/visualbasic/System.Net/WebClient/Overview/useragent.vb#1)]
 
  ]]></format>
     </remarks>
@@ -182,7 +182,7 @@
 
  [!code-cpp[WebClient#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient/CPP/webclient.cpp#1)]
  [!code-csharp[WebClient#1](~/snippets/csharp/System.Net/WebClient/.ctor/webclient.cs#1)]
- [!code-vb[WebClient#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient/VB/webclient.vb#1)]
+ [!code-vb[WebClient#1](~/snippets/visualbasic/System.Net/WebClient/.ctor/webclient.vb#1)]
 
  ]]></format>
         </remarks>
@@ -367,7 +367,7 @@
 
  [!code-cpp[WebClient_BaseAddress_ResponseHeaders#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_BaseAddress_ResponseHeaders/CPP/webclient_baseaddress_responseheaders.cpp#1)]
  [!code-csharp[WebClient_BaseAddress_ResponseHeaders#1](~/snippets/csharp/System.Net/WebClient/BaseAddress/webclient_baseaddress_responseheaders.cs#1)]
- [!code-vb[WebClient_BaseAddress_ResponseHeaders#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_BaseAddress_ResponseHeaders/VB/webclient_baseaddress_responseheaders.vb#1)]
+ [!code-vb[WebClient_BaseAddress_ResponseHeaders#1](~/snippets/visualbasic/System.Net/WebClient/BaseAddress/webclient_baseaddress_responseheaders.vb#1)]
 
  ]]></format>
         </remarks>
@@ -567,7 +567,7 @@
 
  [!code-cpp[WebClientAuthentication#1](~/snippets/cpp/VS_Snippets_Remoting/WebClientAuthentication/CPP/webclientauth.cpp#1)]
  [!code-csharp[WebClientAuthentication#1](~/snippets/csharp/System.Net/WebClient/Credentials/webclientauth.cs#1)]
- [!code-vb[WebClientAuthentication#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClientAuthentication/VB/webclientauth.vb#1)]
+ [!code-vb[WebClientAuthentication#1](~/snippets/visualbasic/System.Net/WebClient/Credentials/webclientauth.vb#1)]
 
  ]]></format>
         </remarks>
@@ -652,7 +652,7 @@
 
  [!code-cpp[WebClient_DownloadData#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_DownloadData/CPP/webclient_downloaddata.cpp#1)]
  [!code-csharp[WebClient_DownloadData#1](~/snippets/csharp/System.Net/WebClient/DownloadData/webclient_downloaddata.cs#1)]
- [!code-vb[WebClient_DownloadData#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_DownloadData/VB/webclient_downloaddata.vb#1)]
+ [!code-vb[WebClient_DownloadData#1](~/snippets/visualbasic/System.Net/WebClient/DownloadData/webclient_downloaddata.vb#1)]
 
  ]]></format>
         </remarks>
@@ -971,13 +971,13 @@
 
  [!code-cpp[NCLWebClientAsync#21](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#21)]
  [!code-csharp[NCLWebClientAsync#21](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#21)]
- [!code-vb[NCLWebClientAsync#21](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#21)]
+ [!code-vb[NCLWebClientAsync#21](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#21)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#22](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#22)]
  [!code-csharp[NCLWebClientAsync#22](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#22)]
- [!code-vb[NCLWebClientAsync#22](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#22)]
+ [!code-vb[NCLWebClientAsync#22](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#22)]
 
  ]]></format>
         </remarks>
@@ -1228,7 +1228,7 @@
 
  [!code-cpp[WebClient_DownloadFile#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_DownloadFile/CPP/webclient_downloadfile.cpp#1)]
  [!code-csharp[WebClient_DownloadFile#1](~/snippets/csharp/System.Net/WebClient/DownloadFile/webclient_downloadfile.cs#1)]
- [!code-vb[WebClient_DownloadFile#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_DownloadFile/VB/webclient_downloadfile.vb#1)]
+ [!code-vb[WebClient_DownloadFile#1](~/snippets/visualbasic/System.Net/WebClient/DownloadFile/webclient_downloadfile.vb#1)]
 
  ]]></format>
         </remarks>
@@ -1590,7 +1590,7 @@
 
  [!code-cpp[NCLWebClientAsync#19](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#19)]
  [!code-csharp[NCLWebClientAsync#19](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#19)]
- [!code-vb[NCLWebClientAsync#19](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#19)]
+ [!code-vb[NCLWebClientAsync#19](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#19)]
 
  ]]></format>
         </remarks>
@@ -1868,7 +1868,7 @@ internal class MyWebClient : WebClientProtocol
 
 [!code-cpp[DownloadProgressChanged](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#SnippetDownloadProgressChanged)]
 [!code-csharp[DownloadProgressChanged](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#SnippetDownloadProgressChanged)]
-[!code-vb[DownloadProgressChanged](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#SnippetDownloadProgressChanged)]
+[!code-vb[DownloadProgressChanged](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#SnippetDownloadProgressChanged)]
 
  ]]></format>
         </remarks>
@@ -1949,7 +1949,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#25](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#25)]
  [!code-csharp[NCLWebClientAsync#25](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#25)]
- [!code-vb[NCLWebClientAsync#25](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#25)]
+ [!code-vb[NCLWebClientAsync#25](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#25)]
 
  ]]></format>
         </remarks>
@@ -2274,13 +2274,13 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#28](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#28)]
  [!code-csharp[NCLWebClientAsync#28](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#28)]
- [!code-vb[NCLWebClientAsync#28](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#28)]
+ [!code-vb[NCLWebClientAsync#28](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#28)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#29](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#29)]
  [!code-csharp[NCLWebClientAsync#29](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#29)]
- [!code-vb[NCLWebClientAsync#29](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#29)]
+ [!code-vb[NCLWebClientAsync#29](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#29)]
 
  ]]></format>
         </remarks>
@@ -2516,7 +2516,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#1](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#1)]
  [!code-csharp[NCLWebClientAsync#1](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#1)]
- [!code-vb[NCLWebClientAsync#1](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#1)]
+ [!code-vb[NCLWebClientAsync#1](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#1)]
 
  ]]></format>
         </remarks>
@@ -2826,7 +2826,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_UpLoadData_Headers#2](~/snippets/cpp/VS_Snippets_Remoting/WebClient_UpLoadData_Headers/CPP/webclient_uploaddata_headers.cpp#2)]
  [!code-csharp[WebClient_UpLoadData_Headers#2](~/snippets/csharp/System.Net/WebClient/Headers/webclient_uploaddata_headers.cs#2)]
- [!code-vb[WebClient_UpLoadData_Headers#2](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadData_Headers/VB/webclient_uploaddata_headers.vb#2)]
+ [!code-vb[WebClient_UpLoadData_Headers#2](~/snippets/visualbasic/System.Net/WebClient/Headers/webclient_uploaddata_headers.vb#2)]
 
  ]]></format>
         </remarks>
@@ -3788,7 +3788,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_OpenRead#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_OpenRead/CPP/webclient_openread.cpp#1)]
  [!code-csharp[WebClient_OpenRead#1](~/snippets/csharp/System.Net/WebClient/OpenRead/webclient_openread.cs#1)]
- [!code-vb[WebClient_OpenRead#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenRead/VB/webclient_openread.vb#1)]
+ [!code-vb[WebClient_OpenRead#1](~/snippets/visualbasic/System.Net/WebClient/OpenRead/webclient_openread.vb#1)]
 
  ]]></format>
         </remarks>
@@ -4128,13 +4128,13 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#30](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#30)]
  [!code-csharp[NCLWebClientAsync#30](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#30)]
- [!code-vb[NCLWebClientAsync#30](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#30)]
+ [!code-vb[NCLWebClientAsync#30](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#30)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#31](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#31)]
  [!code-csharp[NCLWebClientAsync#31](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#31)]
- [!code-vb[NCLWebClientAsync#31](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#31)]
+ [!code-vb[NCLWebClientAsync#31](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#31)]
 
  ]]></format>
         </remarks>
@@ -4400,7 +4400,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_OpenWrite2#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_OpenWrite2/CPP/webclient_openwrite2.cpp#1)]
  [!code-csharp[WebClient_OpenWrite2#1](~/snippets/csharp/System.Net/WebClient/OpenWrite/webclient_openwrite2.cs#1)]
- [!code-vb[WebClient_OpenWrite2#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenWrite2/VB/webclient_openwrite2.vb#1)]
+ [!code-vb[WebClient_OpenWrite2#1](~/snippets/visualbasic/System.Net/WebClient/OpenWrite/webclient_openwrite2.vb#1)]
 
  ]]></format>
         </remarks>
@@ -4564,7 +4564,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_OpenWrite#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_OpenWrite/CPP/webclient_openwrite.cpp#1)]
  [!code-csharp[WebClient_OpenWrite#1](~/snippets/csharp/System.Net/WebClient/OpenWrite/webclient_openwrite.cs#1)]
- [!code-vb[WebClient_OpenWrite#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_OpenWrite/VB/webclient_openwrite.vb#1)]
+ [!code-vb[WebClient_OpenWrite#1](~/snippets/visualbasic/System.Net/WebClient/OpenWrite/webclient_openwrite.vb#1)]
 
  ]]></format>
         </remarks>
@@ -4972,13 +4972,13 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#14](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#14)]
  [!code-csharp[NCLWebClientAsync#14](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#14)]
- [!code-vb[NCLWebClientAsync#14](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#14)]
+ [!code-vb[NCLWebClientAsync#14](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#14)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#15](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#15)]
  [!code-csharp[NCLWebClientAsync#15](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#15)]
- [!code-vb[NCLWebClientAsync#15](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#15)]
+ [!code-vb[NCLWebClientAsync#15](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#15)]
 
  ]]></format>
         </remarks>
@@ -5478,7 +5478,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_QueryString#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_QueryString/CPP/webclient_querystring.cpp#1)]
  [!code-csharp[WebClient_QueryString#1](~/snippets/csharp/System.Net/WebClient/QueryString/webclient_querystring.cs#1)]
- [!code-vb[WebClient_QueryString#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_QueryString/VB/webclient_querystring.vb#1)]
+ [!code-vb[WebClient_QueryString#1](~/snippets/visualbasic/System.Net/WebClient/QueryString/webclient_querystring.vb#1)]
 
  ]]></format>
         </remarks>
@@ -5548,7 +5548,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_BaseAddress_ResponseHeaders#2](~/snippets/cpp/VS_Snippets_Remoting/WebClient_BaseAddress_ResponseHeaders/CPP/webclient_baseaddress_responseheaders.cpp#2)]
  [!code-csharp[WebClient_BaseAddress_ResponseHeaders#2](~/snippets/csharp/System.Net/WebClient/BaseAddress/webclient_baseaddress_responseheaders.cs#2)]
- [!code-vb[WebClient_BaseAddress_ResponseHeaders#2](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_BaseAddress_ResponseHeaders/VB/webclient_baseaddress_responseheaders.vb#2)]
+ [!code-vb[WebClient_BaseAddress_ResponseHeaders#2](~/snippets/visualbasic/System.Net/WebClient/BaseAddress/webclient_baseaddress_responseheaders.vb#2)]
 
  ]]></format>
         </remarks>
@@ -5634,7 +5634,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_UpLoadData2#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_UpLoadData2/CPP/webclient_uploaddata2.cpp#1)]
  [!code-csharp[WebClient_UpLoadData2#1](~/snippets/csharp/System.Net/WebClient/UploadData/webclient_uploaddata2.cs#1)]
- [!code-vb[WebClient_UpLoadData2#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadData2/VB/webclient_uploaddata2.vb#1)]
+ [!code-vb[WebClient_UpLoadData2#1](~/snippets/visualbasic/System.Net/WebClient/UploadData/webclient_uploaddata2.vb#1)]
 
  ]]></format>
         </remarks>
@@ -5822,7 +5822,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_UpLoadData_Headers#2](~/snippets/cpp/VS_Snippets_Remoting/WebClient_UpLoadData_Headers/CPP/webclient_uploaddata_headers.cpp#2)]
  [!code-csharp[WebClient_UpLoadData_Headers#2](~/snippets/csharp/System.Net/WebClient/Headers/webclient_uploaddata_headers.cs#2)]
- [!code-vb[WebClient_UpLoadData_Headers#2](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadData_Headers/VB/webclient_uploaddata_headers.vb#2)]
+ [!code-vb[WebClient_UpLoadData_Headers#2](~/snippets/visualbasic/System.Net/WebClient/Headers/webclient_uploaddata_headers.vb#2)]
 
  ]]></format>
         </remarks>
@@ -6289,13 +6289,13 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#36](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#36)]
  [!code-csharp[NCLWebClientAsync#36](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#36)]
- [!code-vb[NCLWebClientAsync#36](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#36)]
+ [!code-vb[NCLWebClientAsync#36](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#36)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#37](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#37)]
  [!code-csharp[NCLWebClientAsync#37](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#37)]
- [!code-vb[NCLWebClientAsync#37](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#37)]
+ [!code-vb[NCLWebClientAsync#37](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#37)]
 
  ]]></format>
         </remarks>
@@ -6747,7 +6747,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_UpLoadFile#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_UpLoadFile/CPP/webclient_uploadfile.cpp#1)]
  [!code-csharp[WebClient_UpLoadFile#1](~/snippets/csharp/System.Net/WebClient/UploadFile/webclient_uploadfile.cs#1)]
- [!code-vb[WebClient_UpLoadFile#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadFile/VB/webclient_uploadfile.vb#1)]
+ [!code-vb[WebClient_UpLoadFile#1](~/snippets/visualbasic/System.Net/WebClient/UploadFile/webclient_uploadfile.vb#1)]
 
  The following code example shows an ASP.NET page that can accept posted files and is suitable for use with the <xref:System.Net.WebClient.UploadFile%2A> method. The page must reside on a Web server. Its address provides the value for the `address` parameter of the <xref:System.Net.WebClient.UploadFile%2A> method.
 
@@ -6954,7 +6954,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_UpLoadFile2#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_UpLoadFile2/CPP/webclient_uploadfile2.cpp#1)]
  [!code-csharp[WebClient_UpLoadFile2#1](~/snippets/csharp/System.Net/WebClient/UploadFile/webclient_uploadfile2.cs#1)]
- [!code-vb[WebClient_UpLoadFile2#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UpLoadFile2/VB/webclient_uploadfile2.vb#1)]
+ [!code-vb[WebClient_UpLoadFile2#1](~/snippets/visualbasic/System.Net/WebClient/UploadFile/webclient_uploadfile2.vb#1)]
 
  The following code example shows an ASP.NET page that can accept posted files and is suitable for use with the <xref:System.Net.WebClient.UploadFile%2A> method. The page must reside on a Web server. Its address provides the value for the `address` parameter of the <xref:System.Net.WebClient.UploadFile%2A> method.
 
@@ -7480,13 +7480,13 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#4](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#4)]
  [!code-csharp[NCLWebClientAsync#4](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#4)]
- [!code-vb[NCLWebClientAsync#4](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#4)]
+ [!code-vb[NCLWebClientAsync#4](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#4)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#5](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#5)]
  [!code-csharp[NCLWebClientAsync#5](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#5)]
- [!code-vb[NCLWebClientAsync#5](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#5)]
+ [!code-vb[NCLWebClientAsync#5](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#5)]
 
  ]]></format>
         </remarks>
@@ -7975,13 +7975,13 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#4](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#4)]
  [!code-csharp[NCLWebClientAsync#4](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#4)]
- [!code-vb[NCLWebClientAsync#4](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#4)]
+ [!code-vb[NCLWebClientAsync#4](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#4)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#42](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#42)]
  [!code-csharp[NCLWebClientAsync#42](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#42)]
- [!code-vb[NCLWebClientAsync#42](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#42)]
+ [!code-vb[NCLWebClientAsync#42](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#42)]
 
  ]]></format>
         </remarks>
@@ -8064,7 +8064,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#1](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#1)]
  [!code-csharp[NCLWebClientAsync#1](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#1)]
- [!code-vb[NCLWebClientAsync#1](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#1)]
+ [!code-vb[NCLWebClientAsync#1](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#1)]
 
  ]]></format>
         </remarks>
@@ -8237,7 +8237,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#2](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#2)]
  [!code-csharp[NCLWebClientAsync#2](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#2)]
- [!code-vb[NCLWebClientAsync#2](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#2)]
+ [!code-vb[NCLWebClientAsync#2](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#2)]
 
  ]]></format>
         </remarks>
@@ -8708,13 +8708,13 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#38](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#38)]
  [!code-csharp[NCLWebClientAsync#38](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#38)]
- [!code-vb[NCLWebClientAsync#38](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#38)]
+ [!code-vb[NCLWebClientAsync#38](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#38)]
 
  The following code example shows an implementation of a handler for this event.
 
  [!code-cpp[NCLWebClientAsync#39](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#39)]
  [!code-csharp[NCLWebClientAsync#39](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#39)]
- [!code-vb[NCLWebClientAsync#39](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#39)]
+ [!code-vb[NCLWebClientAsync#39](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#39)]
 
  ]]></format>
         </remarks>
@@ -9172,7 +9172,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_UploadValues#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_UploadValues/CPP/webclient_uploadvalues.cpp#1)]
  [!code-csharp[WebClient_UploadValues#1](~/snippets/csharp/System.Net/WebClient/UploadValues/webclient_uploadvalues.cs#1)]
- [!code-vb[WebClient_UploadValues#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UploadValues/VB/webclient_uploadvalues.vb#1)]
+ [!code-vb[WebClient_UploadValues#1](~/snippets/visualbasic/System.Net/WebClient/UploadValues/webclient_uploadvalues.vb#1)]
 
  ]]></format>
         </remarks>
@@ -9378,7 +9378,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[WebClient_UploadValues2#1](~/snippets/cpp/VS_Snippets_Remoting/WebClient_UploadValues2/CPP/webclient_uploadvalues2.cpp#1)]
  [!code-csharp[WebClient_UploadValues2#1](~/snippets/csharp/System.Net/WebClient/UploadValues/webclient_uploadvalues2.cs#1)]
- [!code-vb[WebClient_UploadValues2#1](~/snippets/visualbasic/VS_Snippets_Remoting/WebClient_UploadValues2/VB/webclient_uploadvalues2.vb#1)]
+ [!code-vb[WebClient_UploadValues2#1](~/snippets/visualbasic/System.Net/WebClient/UploadValues/webclient_uploadvalues2.vb#1)]
 
  ]]></format>
         </remarks>
@@ -10349,7 +10349,7 @@ internal class MyWebClient : WebClientProtocol
 
  [!code-cpp[NCLWebClientAsync#3](~/snippets/cpp/VS_Snippets_Remoting/NCLWebClientAsync/CPP/asyncmethods.cpp#3)]
  [!code-csharp[NCLWebClientAsync#3](~/snippets/csharp/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.cs#3)]
- [!code-vb[NCLWebClientAsync#3](~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebClientAsync/VB/asyncmethods.vb#3)]
+ [!code-vb[NCLWebClientAsync#3](~/snippets/visualbasic/System.Net/DownloadDataCompletedEventArgs/Overview/asyncmethods.vb#3)]
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/WebException.xml b/xml/System.Net/WebException.xml
index 1f259468851..408e2777e4b 100644
--- a/xml/System.Net/WebException.xml
+++ b/xml/System.Net/WebException.xml
@@ -151,7 +151,7 @@
  The following example throws a default <xref:System.Net.WebException>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebException/.ctor/webexception_constructor1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor1/VB/webexception_constructor1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -218,7 +218,7 @@
  The following example throws a <xref:System.Net.WebException> by specifying an error message.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebException/.ctor/webexception_constructor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor2/VB/webexception_constructor2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -352,7 +352,7 @@
  The following example throws a <xref:System.Net.WebException> by specifying an error message and a <xref:System.Net.WebExceptionStatus>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebException/.ctor/webexception_constructor3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor3/VB/webexception_constructor3.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -422,7 +422,7 @@
  The following example throws a <xref:System.Net.WebException> by specifying an error message and nested exception.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebException/.ctor/webexception_constructor4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor4/VB/webexception_constructor4.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -503,7 +503,7 @@
  The following example throws a <xref:System.Net.WebException> by specifying an error message and a <xref:System.Net.WebExceptionStatus>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebException/.ctor/webexception_constructor5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebException_Constructor5/VB/webexception_constructor5.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebException/.ctor/webexception_constructor5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -628,7 +628,7 @@
  The following example checks the <xref:System.Net.WebException.Status%2A> property and prints to the console the <xref:System.Net.HttpWebResponse.StatusCode%2A> and <xref:System.Net.HttpWebResponse.StatusDescription%2A> of the underlying <xref:System.Net.HttpWebResponse> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebException/Response/webexception_status_response.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebException_Status_Response/VB/webexception_status_response.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebException/Response/webexception_status_response.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -699,7 +699,7 @@
  The following example checks the <xref:System.Net.WebException.Status%2A> property and prints to the console the <xref:System.Net.HttpWebResponse.StatusCode%2A> and <xref:System.Net.HttpWebResponse.StatusDescription%2A> of the underlying <xref:System.Net.HttpWebResponse> instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebException/Response/webexception_status_response.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebException_Status_Response/VB/webexception_status_response.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebException/Response/webexception_status_response.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/WebHeaderCollection.xml b/xml/System.Net/WebHeaderCollection.xml
index c0abc797864..75cfcc2f931 100644
--- a/xml/System.Net/WebHeaderCollection.xml
+++ b/xml/System.Net/WebHeaderCollection.xml
@@ -330,7 +330,7 @@
  The following example adds a name/value pair to a <xref:System.Net.WebHeaderCollection> using the <xref:System.Net.WebHeaderCollection.Add%2A> Method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebHeaderCollection/Add/webheadercollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Add/VB/webheadercollection_add.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebHeaderCollection/Add/webheadercollection_add.vb" id="Snippet1":::
 
 > [!NOTE]
 > The length of the *value* portion of `header`, that is, the string after the colon (:), is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
@@ -569,7 +569,7 @@
  The following example adds a name/value pair to a <xref:System.Net.WebHeaderCollection> using the <xref:System.Net.WebHeaderCollection.Add%2A> Method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebHeaderCollection/Add/webheadercollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Add/VB/webheadercollection_add.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebHeaderCollection/Add/webheadercollection_add.vb" id="Snippet1":::
 
 > [!NOTE]
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
@@ -1319,7 +1319,7 @@
  The following example uses the <xref:System.Net.WebHeaderCollection.GetValues%2A> method to retrieve an array of values for each header in the <xref:System.Net.WebHeaderCollection>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebHeaderCollection/GetValues/webheadercollection_getvalues_1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_GetValues_1/VB/webheadercollection_getvalues_1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebHeaderCollection/GetValues/webheadercollection_getvalues_1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1428,7 +1428,7 @@
  The following example checks the <xref:System.Net.WebHeaderCollection.IsRestricted%2A> property to see if any headers are prohibited from being set.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebHeaderCollection/IsRestricted/webheadercollection_isrestricted.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_IsRestricted/VB/webheadercollection_isrestricted.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebHeaderCollection/IsRestricted/webheadercollection_isrestricted.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1525,7 +1525,7 @@
  The following example checks the <xref:System.Net.WebHeaderCollection.IsRestricted%2A> property to see if any request headers are prohibited from being set.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebHeaderCollection/IsRestricted/webheadercollection_isrestricted.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_IsRestricted/VB/webheadercollection_isrestricted.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebHeaderCollection/IsRestricted/webheadercollection_isrestricted.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2003,7 +2003,7 @@
  The following example uses the <xref:System.Net.WebHeaderCollection.Remove%2A> method to remove a header from the <xref:System.Net.WebHeaderCollection>. After the header is removed, this example prints all existing headers to the screen to prove that it has been removed.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebHeaderCollection/Remove/webheadercollection_remove.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Remove/VB/webheadercollection_remove.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebHeaderCollection/Remove/webheadercollection_remove.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2234,7 +2234,7 @@
  The following example uses the <xref:System.Net.WebHeaderCollection.Set%2A> method to set the value of an existing header.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebHeaderCollection/Set/webheadercollection_set.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebHeaderCollection_Set/VB/webheadercollection_set.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebHeaderCollection/Set/webheadercollection_set.vb" id="Snippet1":::
 
 > [!NOTE]
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
diff --git a/xml/System.Net/WebProxy.xml b/xml/System.Net/WebProxy.xml
index 4f051fb9a18..f8c17a52703 100644
--- a/xml/System.Net/WebProxy.xml
+++ b/xml/System.Net/WebProxy.xml
@@ -90,7 +90,7 @@
  The following code example sets up an <xref:System.Net.Http.HttpClient> instance with a <xref:System.Net.WebProxy> instance. The <xref:System.Net.Http.HttpClient> instance uses the proxy to connect to external Internet resources. (For an example that demonstrates using the WPAD feature, see the documentation for the <xref:System.Net.IWebProxyScript> class.)
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebProxy/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic WebProxy Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebProxy/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Net/WebRequest.xml b/xml/System.Net/WebRequest.xml
index 9157361236b..04df0bbff35 100644
--- a/xml/System.Net/WebRequest.xml
+++ b/xml/System.Net/WebRequest.xml
@@ -96,7 +96,7 @@
  The following example shows how to create a <xref:System.Net.WebRequest> instance and return the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/Overview/webrequestget.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebRequestSimple/VB/webrequestget.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/Overview/webrequestget.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -173,7 +173,7 @@
  The following example shows how to create a <xref:System.Net.WebRequest> instance by calling the <xref:System.Net.WebRequest.Create%2A> method on the <xref:System.Net.WebRequest> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic WebRequest.WebRequest Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
  The following example uses the <xref:System.Net.WebRequest.BeginGetRequestStream%2A> to asynchronously obtain the request stream.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_BeginGetRequest/VB/webrequest_begingetrequest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -760,7 +760,7 @@
  The following example sets the <xref:System.Net.WebRequest.ContentLength%2A> property to the amount of bytes in the outgoing byte buffer.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/ContentLength/webrequest_contenttype.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_ContentType/VB/webrequest_contenttype.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/ContentLength/webrequest_contenttype.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -838,7 +838,7 @@
  The following example sets the <xref:System.Net.WebRequest.ContentType%2A> property to the appropriate media type.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/ContentLength/webrequest_contenttype.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_ContentType/VB/webrequest_contenttype.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/ContentLength/webrequest_contenttype.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -940,7 +940,7 @@
  The following example uses <xref:System.Net.WebRequest.Create%2A> to instantiate an <xref:System.Net.HttpWebRequest> instance. A string representing the target URL is used as the constructor parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/Create/webresponse_responseuri.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ResponseUri/VB/webresponse_responseuri.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/Create/webresponse_responseuri.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1041,7 +1041,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
  The following example uses <xref:System.Net.WebRequest.Create%2A> to instantiate an <xref:System.Net.HttpWebRequest> instance. A Uri representing the target URL is used as the constructor parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/Create/webrequest_create.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Create/VB/webrequest_create.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/Create/webrequest_create.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1391,7 +1391,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example sets the <xref:System.Net.WebRequest.Credentials%2A> property using the default credentials of the current user. When the request is made, credentials stored in this property are used to validate the client. This is identical to setting the <xref:System.Net.WebRequest.UseDefaultCredentials%2A> property to `true`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/Overview/webrequestget.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLWebRequestSimple/VB/webrequestget.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/Overview/webrequestget.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1617,7 +1617,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example obtains and uses the request stream by calling the <xref:System.Net.WebRequest.EndGetRequestStream%2A>. The <xref:System.Net.WebRequest.EndGetRequestStream%2A> method completes the asynchronous call to <xref:System.Net.WebRequest.BeginGetRequestStream%2A>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_BeginGetRequest/VB/webrequest_begingetrequest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1826,7 +1826,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example uses the <xref:System.Net.WebRequest.GetRequestStream%2A> method to obtain a stream and then writes data that stream.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/ContentLength/webrequest_contenttype.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_ContentType/VB/webrequest_contenttype.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/ContentLength/webrequest_contenttype.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -1958,7 +1958,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example sets the <xref:System.Net.WebRequest.Timeout%2A> property to 10000 milliseconds. If the timeout period expires before the resource can be returned, a <xref:System.Net.WebException> is thrown.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/GetResponse/webrequest_timeout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Timeout/VB/webrequest_timeout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/GetResponse/webrequest_timeout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2142,7 +2142,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example displays the header name/value pairs associated with this request.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/Headers/webrequest_headers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Headers/VB/webrequest_headers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/Headers/webrequest_headers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2277,7 +2277,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example sets the <xref:System.Net.WebRequest.Method%2A> property to POST to indicate that the request will post data to the target host.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_BeginGetRequest/VB/webrequest_begingetrequest.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/BeginGetRequestStream/webrequest_begingetrequest.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -2415,7 +2415,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example displays the current network proxy address and allows the user to assign a new network proxy address and port number.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/Proxy/webrequest_proxy.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Proxy/VB/webrequest_proxy.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/Proxy/webrequest_proxy.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2616,7 +2616,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example checks the <xref:System.Net.WebRequest.RequestUri%2A> property to determine the site originally requested.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/RequestUri/webrequest_requesturi.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_RequestUri1/VB/webrequest_requesturi.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/RequestUri/webrequest_requesturi.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2751,7 +2751,7 @@ This property allows an application to determine which <xref:System.Net.IWebRequ
  The following example sets the <xref:System.Net.WebRequest.Timeout%2A> property to 10000 milliseconds. If the timeout period expires before the resource can be returned, a <xref:System.Net.WebException> is thrown.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/GetResponse/webrequest_timeout.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebRequest_Timeout/VB/webrequest_timeout.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/GetResponse/webrequest_timeout.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Net/WebResponse.xml b/xml/System.Net/WebResponse.xml
index cd2ca2f70f8..895689c6e13 100644
--- a/xml/System.Net/WebResponse.xml
+++ b/xml/System.Net/WebResponse.xml
@@ -89,7 +89,7 @@
  The following example creates a <xref:System.Net.WebResponse> instance from a <xref:System.Net.WebRequest>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebResponse/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic WebRequest Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebResponse/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -292,7 +292,7 @@
  The following example uses the <xref:System.Net.WebResponse.Close%2A> method to close the `WebResponse`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebResponse/Close/webresponse_close.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_Close/VB/webresponse_close.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebResponse/Close/webresponse_close.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -361,7 +361,7 @@
  The following example uses the <xref:System.Net.WebResponse.ContentLength%2A> property to obtain the Length of the resource returned.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebResponse/ContentLength/webresponse_contentlength_type.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ContentLength_Type/VB/webresponse_contentlength_type.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebResponse/ContentLength/webresponse_contentlength_type.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -430,7 +430,7 @@
  The following example uses the <xref:System.Net.WebResponse.ContentType%2A> property to obtain the content type of the response.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebResponse/ContentLength/webresponse_contentlength_type.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ContentLength_Type/VB/webresponse_contentlength_type.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebResponse/ContentLength/webresponse_contentlength_type.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -676,7 +676,7 @@
  The following example uses <xref:System.Net.WebResponse.GetResponseStream%2A> to return a <xref:System.IO.StreamReader> instance. A small local buffer is used to read data from the <xref:System.IO.StreamReader> and output it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebResponse/GetResponseStream/webresponse_getresponsestream.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_GetResponseStream/VB/webresponse_getresponsestream.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebResponse/GetResponseStream/webresponse_getresponsestream.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -741,7 +741,7 @@
  The following example displays all of the header name-value pairs returned in the <xref:System.Net.WebResponse>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebResponse/Headers/webresponse_headers.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_Headers/VB/webresponse_headers.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebResponse/Headers/webresponse_headers.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -929,7 +929,7 @@
  The following example uses the <xref:System.Net.WebResponse.ResponseUri%2A> property to determine the location from which the <xref:System.Net.WebResponse> originated.
 
  :::code language="csharp" source="~/snippets/csharp/System.Net/WebRequest/Create/webresponse_responseuri.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebResponse_ResponseUri/VB/webresponse_responseuri.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Net/WebRequest/Create/webresponse_responseuri.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels.Http/HttpServerChannel.xml b/xml/System.Runtime.Remoting.Channels.Http/HttpServerChannel.xml
index 254fd5a7444..8b4d59dcfda 100644
--- a/xml/System.Runtime.Remoting.Channels.Http/HttpServerChannel.xml
+++ b/xml/System.Runtime.Remoting.Channels.Http/HttpServerChannel.xml
@@ -541,7 +541,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpChannel.GetUrlsFromUri/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels.Http/HttpServerChannel/GetUrlsForUri/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.GetUrlsFromUri/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels.Http/HttpServerChannel/GetUrlsForUri/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels.Tcp/TcpChannel.xml b/xml/System.Runtime.Remoting.Channels.Tcp/TcpChannel.xml
index fdcc935ad68..c63426b47cd 100644
--- a/xml/System.Runtime.Remoting.Channels.Tcp/TcpChannel.xml
+++ b/xml/System.Runtime.Remoting.Channels.Tcp/TcpChannel.xml
@@ -151,7 +151,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation/CPP/server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels.Tcp/TcpChannel/.ctor/server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation/VB/server.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/.ctor/server.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -412,7 +412,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/TcpChannel.GetUrlsForUri/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels.Tcp/TcpChannel/GetUrlsForUri/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TcpChannel.GetUrlsForUri/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpChannel/GetUrlsForUri/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.xml b/xml/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.xml
index b0d8917e9c2..c9d4fe274b4 100644
--- a/xml/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.xml
+++ b/xml/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.xml
@@ -476,7 +476,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/TcpServerChannel.GetUrlsForUri/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel/GetUrlsForUri/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TcpServerChannel.GetUrlsForUri/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel/GetUrlsForUri/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.xml b/xml/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.xml
index 642794608c7..ec476b0befa 100644
--- a/xml/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.xml
+++ b/xml/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.xml
@@ -55,7 +55,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CommonTransportKeys/CPP/commontransportkeys.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/commontransportkeys.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -90,7 +90,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CommonTransportKeys/CPP/commontransportkeys.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/commontransportkeys.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.xml b/xml/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.xml
index 1432fe780c6..22908c0727b 100644
--- a/xml/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.xml
+++ b/xml/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.xml
@@ -41,7 +41,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/CPP/soapclientformattersinkprovider_customprovider.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/VB/soapclientformattersinkprovider_customprovider.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -77,7 +77,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/CPP/soapclientformattersinkprovider_customprovider.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/VB/soapclientformattersinkprovider_customprovider.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/ChannelServices.xml b/xml/System.Runtime.Remoting.Channels/ChannelServices.xml
index 05895281cbb..585415b556c 100644
--- a/xml/System.Runtime.Remoting.Channels/ChannelServices.xml
+++ b/xml/System.Runtime.Remoting.Channels/ChannelServices.xml
@@ -204,7 +204,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_GetChannel/CPP/channelservices_getchannel_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/channelservices_getchannel_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_GetChannel/VB/channelservices_getchannel_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/channelservices_getchannel_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -247,7 +247,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_GetChannel/CPP/channelservices_getchannel_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/channelservices_getchannel_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_GetChannel/VB/channelservices_getchannel_client.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetChannel/channelservices_getchannel_client.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -290,7 +290,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/CPP/channelservices_registeredchannels_client.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_client.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/channelservices_registeredchannels_client.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_client.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -349,7 +349,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpChannel/CPP/server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/RegisterChannel/server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel/VB/server.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/RegisterChannel/server.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -444,7 +444,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/CPP/channelservices_registeredchannels_server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/channelservices_registeredchannels_server.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_server.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -487,7 +487,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/CPP/channelservices_syncdispatchmessage_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/VB/channelservices_syncdispatchmessage_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -530,7 +530,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/CPP/channelservices_registeredchannels_server.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_server.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_RegisteredChannels/VB/channelservices_registeredchannels_server.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/GetUrlsForObject/channelservices_registeredchannels_server.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IChannel.xml b/xml/System.Runtime.Remoting.Channels/IChannel.xml
index bcd127b84b7..7c4346a5608 100644
--- a/xml/System.Runtime.Remoting.Channels/IChannel.xml
+++ b/xml/System.Runtime.Remoting.Channels/IChannel.xml
@@ -69,7 +69,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpServerChannel_Server_Client/CPP/httpserverchannel_9_server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpserverchannel_9_server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpserverchannel_9_server.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpserverchannel_9_server.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -117,7 +117,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpServerChannel_Server_Client/CPP/httpclientchannel_6_client.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpclientchannel_6_client.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpclientchannel_6_client.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpclientchannel_6_client.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -168,7 +168,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpServerChannel_Server_Client/CPP/httpclientchannel_6_client.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpclientchannel_6_client.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpclientchannel_6_client.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpclientchannel_6_client.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IChannelDataStore.xml b/xml/System.Runtime.Remoting.Channels/IChannelDataStore.xml
index 0f0d3be7a71..4efc2953ba2 100644
--- a/xml/System.Runtime.Remoting.Channels/IChannelDataStore.xml
+++ b/xml/System.Runtime.Remoting.Channels/IChannelDataStore.xml
@@ -32,7 +32,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IChannelDataStore_Item/CPP/ichanneldatastore.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelDataStore/Overview/ichanneldatastore.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IChannelDataStore_Item/VB/ichanneldatastore.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelDataStore/Overview/ichanneldatastore.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IChannelReceiver.xml b/xml/System.Runtime.Remoting.Channels/IChannelReceiver.xml
index 0cb15abdb98..d3f86a04bb5 100644
--- a/xml/System.Runtime.Remoting.Channels/IChannelReceiver.xml
+++ b/xml/System.Runtime.Remoting.Channels/IChannelReceiver.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/CPP/ichannelreceiver_channeldata_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/VB/ichannelreceiver_channeldata_server.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/CPP/ichannelreceiver_channeldata_server.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/VB/ichannelreceiver_channeldata_server.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -167,7 +167,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/CPP/ichannelreceiver_channeldata_server.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiver_StartListening_ChannelData/VB/ichannelreceiver_channeldata_server.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiver/Overview/ichannelreceiver_channeldata_server.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpServerChannel_Server_Client/CPP/httpserverchannel_9_server.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpserverchannel_9_server.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpServerChannel_Server_Client/VB/httpserverchannel_9_server.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannel/ChannelName/httpserverchannel_9_server.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IChannelReceiverHook.xml b/xml/System.Runtime.Remoting.Channels/IChannelReceiverHook.xml
index 2f2199f571e..1364fe397f3 100644
--- a/xml/System.Runtime.Remoting.Channels/IChannelReceiverHook.xml
+++ b/xml/System.Runtime.Remoting.Channels/IChannelReceiverHook.xml
@@ -27,7 +27,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IChannelReceiverHook_ChannelScheme/CPP/ichannelreceiverhook_channelscheme.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelReceiverHook/Overview/ichannelreceiverhook_channelscheme.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IChannelReceiverHook_ChannelScheme/VB/ichannelreceiverhook_channelscheme.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/Overview/ichannelreceiverhook_channelscheme.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpChannel.AddHookChannelUri/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelReceiverHook/AddHookChannelUri/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.AddHookChannelUri/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/AddHookChannelUri/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -149,7 +149,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpChannel.ChannelSinkChain/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelReceiverHook/ChannelSinkChain/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpChannel.ChannelSinkChain/VB/class1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelReceiverHook/ChannelSinkChain/class1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IChannelSender.xml b/xml/System.Runtime.Remoting.Channels/IChannelSender.xml
index b824d058350..1e4e000624f 100644
--- a/xml/System.Runtime.Remoting.Channels/IChannelSender.xml
+++ b/xml/System.Runtime.Remoting.Channels/IChannelSender.xml
@@ -39,7 +39,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IChannelSender/CPP/ichannelsender_2_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelSender/Overview/ichannelsender_2_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IChannelSender/VB/ichannelsender_2_client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelSender/Overview/ichannelsender_2_client.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -90,7 +90,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IChannelSender/CPP/ichannelsender_2_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IChannelSender/Overview/ichannelsender_2_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IChannelSender/VB/ichannelsender_2_client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IChannelSender/Overview/ichannelsender_2_client.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IClientChannelSink.xml b/xml/System.Runtime.Remoting.Channels/IClientChannelSink.xml
index 15aaf7bc9fd..b281c9742e3 100644
--- a/xml/System.Runtime.Remoting.Channels/IClientChannelSink.xml
+++ b/xml/System.Runtime.Remoting.Channels/IClientChannelSink.xml
@@ -87,7 +87,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/CPP/soapclientformattersinkprovider_customprovider.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_BaseChannelSinkWithProperties/VB/soapclientformattersinkprovider_customprovider.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties/Overview/soapclientformattersinkprovider_customprovider.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -136,7 +136,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CommonTransportKeys/CPP/commontransportkeys.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/commontransportkeys.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IServerChannelSink.xml b/xml/System.Runtime.Remoting.Channels/IServerChannelSink.xml
index e67d893077a..a7afa650b67 100644
--- a/xml/System.Runtime.Remoting.Channels/IServerChannelSink.xml
+++ b/xml/System.Runtime.Remoting.Channels/IServerChannelSink.xml
@@ -93,7 +93,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CommonTransportKeys/CPP/commontransportkeys.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CommonTransportKeys/VB/commontransportkeys.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties/Overview/commontransportkeys.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/IServerChannelSinkProvider.xml b/xml/System.Runtime.Remoting.Channels/IServerChannelSinkProvider.xml
index 228e845f559..50491ff951f 100644
--- a/xml/System.Runtime.Remoting.Channels/IServerChannelSinkProvider.xml
+++ b/xml/System.Runtime.Remoting.Channels/IServerChannelSinkProvider.xml
@@ -83,7 +83,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_Next_Create/CPP/soapclientformattersinkprovider_customprovider.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/CreateSink/soapclientformattersinkprovider_customprovider.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientFormatterSinkProvider_Next_Create/VB/soapclientformattersinkprovider_customprovider.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/CreateSink/soapclientformattersinkprovider_customprovider.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -125,7 +125,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IServerChannelSinkProvider_CreateSink/CPP/iserverchannelsinkprovider_3.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/GetChannelData/iserverchannelsinkprovider_3.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IServerChannelSinkProvider_CreateSink/VB/iserverchannelsinkprovider_3.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/GetChannelData/iserverchannelsinkprovider_3.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -168,7 +168,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SinkProviders/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/Next/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SinkProviders/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/IServerChannelSinkProvider/Next/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/ITransportHeaders.xml b/xml/System.Runtime.Remoting.Channels/ITransportHeaders.xml
index 17a3037f3a0..f170d4a0de7 100644
--- a/xml/System.Runtime.Remoting.Channels/ITransportHeaders.xml
+++ b/xml/System.Runtime.Remoting.Channels/ITransportHeaders.xml
@@ -27,7 +27,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ITransportHeaders_Item/CPP/itransportheaders_3_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ITransportHeaders_Item/VB/itransportheaders_3_server.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -66,7 +66,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ITransportHeaders_Item/CPP/itransportheaders_3_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ITransportHeaders_Item/VB/itransportheaders_3_server.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -118,7 +118,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ITransportHeaders_Item/CPP/itransportheaders_3_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ITransportHeaders_Item/VB/itransportheaders_3_server.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ITransportHeaders/Overview/itransportheaders_3_server.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/ServerProcessing.xml b/xml/System.Runtime.Remoting.Channels/ServerProcessing.xml
index 2500fe0b8a1..6acbb41a366 100644
--- a/xml/System.Runtime.Remoting.Channels/ServerProcessing.xml
+++ b/xml/System.Runtime.Remoting.Channels/ServerProcessing.xml
@@ -32,7 +32,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ServerProcessing/Overview/serverprocessing_loggingsinks.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServerProcessing_LoggingSinks_Create/VB/serverprocessing_loggingsinks.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ServerProcessing/Overview/serverprocessing_loggingsinks.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Channels/SinkProviderData.xml b/xml/System.Runtime.Remoting.Channels/SinkProviderData.xml
index 38bc98d51c5..caa90883794 100644
--- a/xml/System.Runtime.Remoting.Channels/SinkProviderData.xml
+++ b/xml/System.Runtime.Remoting.Channels/SinkProviderData.xml
@@ -34,7 +34,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/SinkProviderData/Overview/sinkproviderdata_ipfiltersink.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SinkProviderData/VB/sinkproviderdata_ipfiltersink.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/SinkProviderData/Overview/sinkproviderdata_ipfiltersink.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Lifetime/ClientSponsor.xml b/xml/System.Runtime.Remoting.Lifetime/ClientSponsor.xml
index 1438ad0a196..359597ea22b 100644
--- a/xml/System.Runtime.Remoting.Lifetime/ClientSponsor.xml
+++ b/xml/System.Runtime.Remoting.Lifetime/ClientSponsor.xml
@@ -48,7 +48,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ClientSponsor_Register/CPP/clientsponsor_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -145,7 +145,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ClientSponsor_Register/CPP/clientsponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -218,7 +218,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ClientSponsor_Register/CPP/clientsponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -262,7 +262,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ClientSponsor_Register/CPP/clientsponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ClientSponsor_Register/CPP/clientsponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ClientSponsor_Register/CPP/clientsponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ClientSponsor_Register/CPP/clientsponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ClientSponsor_Register/VB/clientsponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ClientSponsor/Overview/clientsponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Lifetime/ISponsor.xml b/xml/System.Runtime.Remoting.Lifetime/ISponsor.xml
index 1d98503aee5..1fbc92399ab 100644
--- a/xml/System.Runtime.Remoting.Lifetime/ISponsor.xml
+++ b/xml/System.Runtime.Remoting.Lifetime/ISponsor.xml
@@ -32,7 +32,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ISponsor_Client/CPP/isponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ISponsor/Overview/isponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ISponsor_Client/VB/isponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ISponsor/Overview/isponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ISponsor_Client/CPP/isponsor_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/ISponsor/Overview/isponsor_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ISponsor_Client/VB/isponsor_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/ISponsor/Overview/isponsor_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Lifetime/LifetimeServices.xml b/xml/System.Runtime.Remoting.Lifetime/LifetimeServices.xml
index 7c012c3c223..80e7b085940 100644
--- a/xml/System.Runtime.Remoting.Lifetime/LifetimeServices.xml
+++ b/xml/System.Runtime.Remoting.Lifetime/LifetimeServices.xml
@@ -44,7 +44,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.Lifetime/CPP/server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/LifetimeServices/Overview/server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.Lifetime/VB/server.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/Overview/server.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -188,7 +188,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ILease_ILease/CPP/ilease_client.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/ilease_client.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ILease_ILease/VB/ilease_client.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/ilease_client.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -232,7 +232,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ILease_ILease/CPP/ilease_client.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/ilease_client.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ILease_ILease/VB/ilease_client.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Lifetime/LifetimeServices/RenewOnCallTime/ilease_client.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/CallContext.xml b/xml/System.Runtime.Remoting.Messaging/CallContext.xml
index 184afedde40..fbbfd9bae99 100644
--- a/xml/System.Runtime.Remoting.Messaging/CallContext.xml
+++ b/xml/System.Runtime.Remoting.Messaging/CallContext.xml
@@ -53,7 +53,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CallContext/CPP/client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/CallContext/Overview/client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/client.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -97,7 +97,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CallContext_GetHeaders/CPP/callcontext_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/callcontext_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CallContext/CPP/service.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/CallContext/Overview/service.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/service.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/service.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CallContext_GetHeaders/CPP/callcontext_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/callcontext_client.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_client.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -330,7 +330,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CallContext/CPP/client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/CallContext/Overview/client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -374,7 +374,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CallContext_GetHeaders/CPP/callcontext_share.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_share.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CallContext_GetHeaders/VB/callcontext_share.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/FreeNamedDataSlot/callcontext_share.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/ILogicalThreadAffinative.xml b/xml/System.Runtime.Remoting.Messaging/ILogicalThreadAffinative.xml
index d2e29aca92c..5d941141a0c 100644
--- a/xml/System.Runtime.Remoting.Messaging/ILogicalThreadAffinative.xml
+++ b/xml/System.Runtime.Remoting.Messaging/ILogicalThreadAffinative.xml
@@ -34,7 +34,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CallContext/CPP/service.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/CallContext/Overview/service.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CallContext/VB/service.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/CallContext/Overview/service.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/IMessage.xml b/xml/System.Runtime.Remoting.Messaging/IMessage.xml
index 9589b935d9f..a43883dbfdf 100644
--- a/xml/System.Runtime.Remoting.Messaging/IMessage.xml
+++ b/xml/System.Runtime.Remoting.Messaging/IMessage.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/CPP/channelservices_syncdispatchmessage_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/VB/channelservices_syncdispatchmessage_client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -74,7 +74,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMessageSink_Client/CPP/imessagesink_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMessage/Properties/imessagesink_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMessageSink_Client/VB/imessagesink_client.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMessage/Properties/imessagesink_client.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/IMessageSink.xml b/xml/System.Runtime.Remoting.Messaging/IMessageSink.xml
index 124473cb702..60e1386fb73 100644
--- a/xml/System.Runtime.Remoting.Messaging/IMessageSink.xml
+++ b/xml/System.Runtime.Remoting.Messaging/IMessageSink.xml
@@ -40,7 +40,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMessageSink_Client/CPP/imessagesink_client.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMessage/Properties/imessagesink_client.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMessageSink_Client/VB/imessagesink_client.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMessage/Properties/imessagesink_client.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/IMethodCallMessage.xml b/xml/System.Runtime.Remoting.Messaging/IMethodCallMessage.xml
index bb4228af11b..f4b3ae32fe0 100644
--- a/xml/System.Runtime.Remoting.Messaging/IMethodCallMessage.xml
+++ b/xml/System.Runtime.Remoting.Messaging/IMethodCallMessage.xml
@@ -39,7 +39,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/CPP/imethodcallmessage.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/VB/imethodcallmessage.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -147,7 +147,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/CPP/imethodcallmessage.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/VB/imethodcallmessage.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/CPP/imethodcallmessage.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodCallMessage_GetInArg/VB/imethodcallmessage.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodCallMessage/Overview/imethodcallmessage.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/IMethodMessage.xml b/xml/System.Runtime.Remoting.Messaging/IMethodMessage.xml
index 5aca3a26e9b..9af721e4fc8 100644
--- a/xml/System.Runtime.Remoting.Messaging/IMethodMessage.xml
+++ b/xml/System.Runtime.Remoting.Messaging/IMethodMessage.xml
@@ -38,7 +38,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodMessage_MethodName/CPP/imethodmessage_methodname.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_MethodName/VB/imethodmessage_methodname.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -78,7 +78,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodMessage_MethodName/CPP/imethodmessage_methodname.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_MethodName/VB/imethodmessage_methodname.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodMessage_MethodName/CPP/imethodmessage_methodname.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_MethodName/VB/imethodmessage_methodname.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -266,7 +266,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodMessage_LogicalCallContext/CPP/imethodmessage_logicalcallcontext.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodMessage/LogicalCallContext/imethodmessage_logicalcallcontext.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_LogicalCallContext/VB/imethodmessage_logicalcallcontext.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/LogicalCallContext/imethodmessage_logicalcallcontext.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodMessage_MethodName/CPP/imethodmessage_methodname.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodMessage_MethodName/VB/imethodmessage_methodname.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodMessage/Overview/imethodmessage_methodname.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/IMethodReturnMessage.xml b/xml/System.Runtime.Remoting.Messaging/IMethodReturnMessage.xml
index d5bb3bd2047..eb3e54c7c0c 100644
--- a/xml/System.Runtime.Remoting.Messaging/IMethodReturnMessage.xml
+++ b/xml/System.Runtime.Remoting.Messaging/IMethodReturnMessage.xml
@@ -41,7 +41,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/CPP/imethodreturnmessage_returnvalue.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/VB/imethodreturnmessage_returnvalue.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodReturnMessage_Exception/CPP/imethodreturnmessage_exception.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Exception/imethodreturnmessage_exception.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_Exception/VB/imethodreturnmessage_exception.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Exception/imethodreturnmessage_exception.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -190,7 +190,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/CPP/imethodreturnmessage_returnvalue.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/VB/imethodreturnmessage_returnvalue.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -237,7 +237,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/CPP/imethodreturnmessage_returnvalue.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/VB/imethodreturnmessage_returnvalue.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Messaging/ReturnMessage.xml b/xml/System.Runtime.Remoting.Messaging/ReturnMessage.xml
index d5ffb76e4c8..05e2df889df 100644
--- a/xml/System.Runtime.Remoting.Messaging/ReturnMessage.xml
+++ b/xml/System.Runtime.Remoting.Messaging/ReturnMessage.xml
@@ -51,7 +51,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/CPP/imethodreturnmessage_returnvalue.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/VB/imethodreturnmessage_returnvalue.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -728,7 +728,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/CPP/imethodreturnmessage_returnvalue.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/IMethodReturnMessage_ReturnValue/VB/imethodreturnmessage_returnvalue.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Messaging/IMethodReturnMessage/Overview/imethodreturnmessage_returnvalue.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Metadata/SoapFieldAttribute.xml b/xml/System.Runtime.Remoting.Metadata/SoapFieldAttribute.xml
index 188efda3b77..2b05a559aa9 100644
--- a/xml/System.Runtime.Remoting.Metadata/SoapFieldAttribute.xml
+++ b/xml/System.Runtime.Remoting.Metadata/SoapFieldAttribute.xml
@@ -41,7 +41,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapAttributes1/CPP/s.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Metadata/SoapFieldAttribute/Overview/s.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributes1/VB/s.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Metadata/SoapFieldAttribute/Overview/s.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.Metadata/SoapTypeAttribute.xml b/xml/System.Runtime.Remoting.Metadata/SoapTypeAttribute.xml
index d1992eff371..965ba2f4006 100644
--- a/xml/System.Runtime.Remoting.Metadata/SoapTypeAttribute.xml
+++ b/xml/System.Runtime.Remoting.Metadata/SoapTypeAttribute.xml
@@ -41,7 +41,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapAttributes1/CPP/s.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Metadata/SoapFieldAttribute/Overview/s.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributes1/VB/s.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Metadata/SoapFieldAttribute/Overview/s.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting.MetadataServices/MetaData.xml b/xml/System.Runtime.Remoting.MetadataServices/MetaData.xml
index 55f50d4b4bc..24ba3cdb460 100644
--- a/xml/System.Runtime.Remoting.MetadataServices/MetaData.xml
+++ b/xml/System.Runtime.Remoting.MetadataServices/MetaData.xml
@@ -89,7 +89,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MetaData.ConvertCodeSourceFileToAssemblyFile/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.MetadataServices/MetaData/ConvertCodeSourceFileToAssemblyFile/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertCodeSourceFileToAssemblyFile/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertCodeSourceFileToAssemblyFile/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToFile/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToFile/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToFile/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToFile/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -451,7 +451,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToStream/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToStream/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MetaData.ConvertTypesToSchemaToStream/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.MetadataServices/MetaData/ConvertTypesToSchemaToStream/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Proxies/ProxyAttribute.xml b/xml/System.Runtime.Remoting.Proxies/ProxyAttribute.xml
index 20476f9271d..4e4138ce77c 100644
--- a/xml/System.Runtime.Remoting.Proxies/ProxyAttribute.xml
+++ b/xml/System.Runtime.Remoting.Proxies/ProxyAttribute.xml
@@ -50,7 +50,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet11":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -121,7 +121,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -176,7 +176,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting.Proxies/RealProxy.xml b/xml/System.Runtime.Remoting.Proxies/RealProxy.xml
index 549458cb4a6..7afbd7114fd 100644
--- a/xml/System.Runtime.Remoting.Proxies/RealProxy.xml
+++ b/xml/System.Runtime.Remoting.Proxies/RealProxy.xml
@@ -49,7 +49,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/CPP/channelservices_syncdispatchmessage_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ChannelServices_SyncDispatchMessage/VB/channelservices_syncdispatchmessage_client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Channels/ChannelServices/SyncDispatchMessage/channelservices_syncdispatchmessage_client.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -90,7 +90,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet12":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet12":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet12":::  
   
  ]]></format>
         </remarks>
@@ -137,7 +137,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -256,7 +256,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -338,7 +338,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RealProxy_Sample/CPP/realproxy_sample.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RealProxy_Sample/VB/realproxy_sample.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -381,7 +381,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -422,7 +422,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -469,7 +469,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet9":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -503,7 +503,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -592,7 +592,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -636,7 +636,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -678,7 +678,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RealProxy_Sample/CPP/realproxy_sample.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RealProxy_Sample/VB/realproxy_sample.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -726,7 +726,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/CPP/customproxy_sample.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CustomProxy_Attribute_RealProxy/VB/customproxy_sample.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/ProxyAttribute/Overview/customproxy_sample.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -770,7 +770,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RealProxy_Sample/CPP/realproxy_sample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RealProxy_Sample/VB/realproxy_sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting.Proxies/RealProxy/GetCOMIUnknown/realproxy_sample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting/ActivatedClientTypeEntry.xml b/xml/System.Runtime.Remoting/ActivatedClientTypeEntry.xml
index 97c0e57c7b6..2082e959a2e 100644
--- a/xml/System.Runtime.Remoting/ActivatedClientTypeEntry.xml
+++ b/xml/System.Runtime.Remoting/ActivatedClientTypeEntry.xml
@@ -43,19 +43,19 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/CPP/activatedclienttypeentry_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.vb" id="Snippet1":::
 
  The following code example shows a server for this client:
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/CPP/activatedclienttypeentry_server.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_server.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_server.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_server.vb" id="Snippet10":::
 
  The following code example provides the remote object used by the client and the server:
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/CPP/activatedclienttypeentry_share.cpp" id="Snippet20":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_share.cs" id="Snippet20":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_share.vb" id="Snippet20":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_share.vb" id="Snippet20":::
 
  ]]></format>
     </remarks>
@@ -114,7 +114,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/CPP/activatedclienttypeentry_client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_client.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -175,7 +175,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/CPP/activatedclienttypeentry_client.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_client.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -245,7 +245,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/CPP/activatedclienttypeentry_client.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_client.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -280,7 +280,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/CPP/activatedclienttypeentry_client.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.ActivatedClientTypeEntry/VB/activatedclienttypeentry_client.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedClientTypeEntry/Overview/activatedclienttypeentry_client.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting/ActivatedServiceTypeEntry.xml b/xml/System.Runtime.Remoting/ActivatedServiceTypeEntry.xml
index 31e20d0aa83..2a45699ac7e 100644
--- a/xml/System.Runtime.Remoting/ActivatedServiceTypeEntry.xml
+++ b/xml/System.Runtime.Remoting/ActivatedServiceTypeEntry.xml
@@ -41,7 +41,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ActivatedServiceTypeEntry_ObjectType_Client/CPP/activatedservicetypeentry_objecttype_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ActivatedServiceTypeEntry/Overview/activatedservicetypeentry_objecttype_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ActivatedServiceTypeEntry_ObjectType_Client/VB/activatedservicetypeentry_objecttype_server.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ActivatedServiceTypeEntry/Overview/activatedservicetypeentry_objecttype_server.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting/IRemotingTypeInfo.xml b/xml/System.Runtime.Remoting/IRemotingTypeInfo.xml
index b27e52ac440..2dd22ba5924 100644
--- a/xml/System.Runtime.Remoting/IRemotingTypeInfo.xml
+++ b/xml/System.Runtime.Remoting/IRemotingTypeInfo.xml
@@ -32,7 +32,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Remoting.ObjRef/CPP/client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/IRemotingTypeInfo/Overview/client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Remoting.ObjRef/VB/client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/IRemotingTypeInfo/Overview/client.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -118,7 +118,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Remoting.ObjRef/CPP/client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/IRemotingTypeInfo/Overview/client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Remoting.ObjRef/VB/client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/IRemotingTypeInfo/Overview/client.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting/ObjRef.xml b/xml/System.Runtime.Remoting/ObjRef.xml
index 711202a58db..ea1ffcab202 100644
--- a/xml/System.Runtime.Remoting/ObjRef.xml
+++ b/xml/System.Runtime.Remoting/ObjRef.xml
@@ -62,7 +62,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CreateObjRef2/CPP/example.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ObjRef/Overview/example.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CreateObjRef2/VB/example.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ObjRef/Overview/example.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting/ObjectHandle.xml b/xml/System.Runtime.Remoting/ObjectHandle.xml
index 092892f112d..b70629d3dd7 100644
--- a/xml/System.Runtime.Remoting/ObjectHandle.xml
+++ b/xml/System.Runtime.Remoting/ObjectHandle.xml
@@ -65,7 +65,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ObjectHandle/CPP/objecthandleassembly.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ObjectHandle/Overview/objecthandleassembly.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ObjectHandle/VB/objecthandleassembly.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ObjectHandle/Overview/objecthandleassembly.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -188,7 +188,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ObjectHandle/CPP/objecthandleassembly.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ObjectHandle/Overview/objecthandleassembly.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ObjectHandle/VB/objecthandleassembly.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ObjectHandle/Overview/objecthandleassembly.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting/RemotingConfiguration.xml b/xml/System.Runtime.Remoting/RemotingConfiguration.xml
index 704f057ad95..f9fe917e680 100644
--- a/xml/System.Runtime.Remoting/RemotingConfiguration.xml
+++ b/xml/System.Runtime.Remoting/RemotingConfiguration.xml
@@ -106,13 +106,13 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/server.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.vb" id="Snippet2":::
 
  The following code example demonstrates how to access an object remoted from a named application.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/client.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/client.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -172,7 +172,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/CPP/remotingconfiguration_configure_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/Configure/remotingconfiguration_configure_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/VB/remotingconfiguration_configure_server.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/Configure/remotingconfiguration_configure_server.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -392,7 +392,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/CPP/RemotingConfiguration_GetRegisteredActivatedService_server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/remotingconfiguration_getregisteredactivatedservice_server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/VB/remotingconfiguration_getregisteredactivatedservice_server.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/remotingconfiguration_getregisteredactivatedservice_server.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -443,7 +443,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredWellKnownClient_Client/CPP/remotingconfiguration_getregisteredwellknownclient_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredWellKnownClientTypes/remotingconfiguration_getregisteredwellknownclient_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredWellKnownClient_Client/VB/remotingconfiguration_getregisteredwellknownclient_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredWellKnownClientTypes/remotingconfiguration_getregisteredwellknownclient_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -494,7 +494,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/CPP/remotingconfiguration_configure_server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/Configure/remotingconfiguration_configure_server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_Configure_Client/VB/remotingconfiguration_configure_server.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/Configure/remotingconfiguration_configure_server.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -547,7 +547,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/CPP/RemotingConfiguration_GetRegisteredActivatedService_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/remotingconfiguration_getregisteredactivatedservice_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_GetRegisteredActivatedServer_Client/VB/remotingconfiguration_getregisteredactivatedservice_server.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/GetRegisteredActivatedServiceTypes/remotingconfiguration_getregisteredactivatedservice_server.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -600,7 +600,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType1_Client/CPP/remotingconfiguration_isremotelyactivatedclienttype1_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype1_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType1_Client/VB/remotingconfiguration_isremotelyactivatedclienttype1_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype1_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -646,7 +646,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType2_Client/CPP/remotingconfiguration_isremotelyactivatedclienttype2_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype2_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsRemotelyActivatedClientType2_Client/VB/remotingconfiguration_isremotelyactivatedclienttype2_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsRemotelyActivatedClientType/remotingconfiguration_isremotelyactivatedclienttype2_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -700,7 +700,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType1_Client/CPP/remotingconfiguration_iswellknownclienttype1_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype1_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType1_Client/VB/remotingconfiguration_iswellknownclienttype1_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype1_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -746,7 +746,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType2_Client/CPP/remotingconfiguration_iswellknownclienttype2_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype2_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration_IsWellKnownClientType2_Client/VB/remotingconfiguration_iswellknownclienttype2_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/IsWellKnownClientType/remotingconfiguration_iswellknownclienttype2_client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -884,7 +884,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/CPP/client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -996,13 +996,13 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/CPP/server.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/server.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/server.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/server.vb" id="Snippet2":::
 
  The following code example shows the service object registered in the sample code above.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/CPP/service.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/service.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ClientActivation/VB/service.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/RegisterActivatedClientType/service.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -1111,13 +1111,13 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/client.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/client.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.vb" id="Snippet5":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/client.cpp" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.cs" id="Snippet6":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/client.vb" id="Snippet6":::
+:::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.vb" id="Snippet6":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/client.cpp" id="Snippet7":::
 :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.cs" id="Snippet7":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/client.vb" id="Snippet7":::
+:::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/client.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -1182,7 +1182,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/CreateObjRef2/CPP/example.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/ObjRef/Overview/example.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/CreateObjRef2/VB/example.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/ObjRef/Overview/example.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1243,19 +1243,19 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/server.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.vb" id="Snippet1":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/server.cpp" id="Snippet2":::
 :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.cs" id="Snippet2":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/server.vb" id="Snippet2":::
+:::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.vb" id="Snippet2":::
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/server.cpp" id="Snippet3":::
 :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.cs" id="Snippet3":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/server.vb" id="Snippet3":::
+:::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/server.vb" id="Snippet3":::
 
  The following code example shows the service object registered in the sample code above.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/CPP/service.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/service.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingConfiguration.ServerActivation1/VB/service.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingConfiguration/ApplicationName/service.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting/RemotingServices.xml b/xml/System.Runtime.Remoting/RemotingServices.xml
index 33ea4495884..e4f686591c2 100644
--- a/xml/System.Runtime.Remoting/RemotingServices.xml
+++ b/xml/System.Runtime.Remoting/RemotingServices.xml
@@ -98,7 +98,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.BasicSample/CPP/basicclient.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/Connect/basicclient.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/basicclient.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/basicclient.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -195,7 +195,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.BasicSample/CPP/manualserver.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/Connect/manualserver.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/manualserver.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/manualserver.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -249,7 +249,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/CPP/serviceclass.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/ExecuteMessage/serviceclass.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/VB/serviceclass.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/ExecuteMessage/serviceclass.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -343,19 +343,19 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.TimerSample/CPP/timerclient.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerclient.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerclient.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerclient.vb" id="Snippet1":::
 
  To compile and run this example, you will need to compile and run a server, timerserver.exe, and compile a shared library, timerservice.dll.
 
  The source for timerserver.exe follows:
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerserver.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerserver.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerserver.vb" id="Snippet2":::
 
  The source for timerservice.dll follows:
 
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerservice.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.TimerSample/VB/timerservice.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetLifetimeService/timerservice.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -478,7 +478,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/CPP/remotingservicessample.cpp" id="Snippet18":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.cs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/VB/remotingservicessample.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -530,7 +530,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.GetObjRefForProxy/CPP/client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/GetObjRefForProxy/client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.GetObjRefForProxy/VB/client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjRefForProxy/client.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -629,7 +629,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/CPP/remotingservicessample.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/VB/remotingservicessample.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -679,7 +679,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/CPP/serviceclass.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/ExecuteMessage/serviceclass.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.ExecuteMessage/VB/serviceclass.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/ExecuteMessage/serviceclass.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -757,7 +757,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices IsObject Snippets/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/IsObjectOutOfAppDomain/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices IsObject Snippets/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsObjectOutOfAppDomain/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -806,7 +806,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices IsObject Snippets/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/IsObjectOutOfAppDomain/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices IsObject Snippets/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/IsObjectOutOfAppDomain/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -857,7 +857,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/CPP/remotingservicessample.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Runtime.Remoting.RemotingServices/VB/remotingservicessample.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/GetObjectUri/remotingservicessample.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1083,7 +1083,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.BasicSample/CPP/manualserver.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/Connect/manualserver.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.BasicSample/VB/manualserver.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Connect/manualserver.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1269,7 +1269,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/RemotingServices.Unmarshal/CPP/client.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/RemotingServices/Unmarshal/client.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/RemotingServices.Unmarshal/VB/client.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/RemotingServices/Unmarshal/client.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Remoting/WellKnownClientTypeEntry.xml b/xml/System.Runtime.Remoting/WellKnownClientTypeEntry.xml
index 85a9920e37b..e7e1b3fcea4 100644
--- a/xml/System.Runtime.Remoting/WellKnownClientTypeEntry.xml
+++ b/xml/System.Runtime.Remoting/WellKnownClientTypeEntry.xml
@@ -39,7 +39,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/WellKnownClientTypeEntry_Client/CPP/wellknownclienttypeentry_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/WellKnownClientTypeEntry/Overview/wellknownclienttypeentry_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WellKnownClientTypeEntry_Client/VB/wellknownclienttypeentry_client.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/WellKnownClientTypeEntry/Overview/wellknownclienttypeentry_client.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Remoting/WellKnownServiceTypeEntry.xml b/xml/System.Runtime.Remoting/WellKnownServiceTypeEntry.xml
index 6e8840f1ffd..48bfb308791 100644
--- a/xml/System.Runtime.Remoting/WellKnownServiceTypeEntry.xml
+++ b/xml/System.Runtime.Remoting/WellKnownServiceTypeEntry.xml
@@ -41,7 +41,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/WellKnownServiceTypeEntry_Server/CPP/wellknownservicetypeentry_server.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Remoting/WellKnownServiceTypeEntry/Overview/wellknownservicetypeentry_server.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WellKnownServiceTypeEntry_Server/VB/wellknownservicetypeentry_server.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Remoting/WellKnownServiceTypeEntry/Overview/wellknownservicetypeentry_server.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.xml b/xml/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.xml
index 34075c19380..93d90c69c68 100644
--- a/xml/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.xml
+++ b/xml/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.xml
@@ -46,7 +46,7 @@ TimeSpan objects are serialized according to the ISO 8601: 1998 section 5.5.3.2.
       <format type="text/markdown"><![CDATA[
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFormatter Example/CPP/soapformatter.cpp" id="Snippet1":::
 :::code language="csharp" source="~/snippets/csharp/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFormatter Example/VB/soapformatter.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.vb" id="Snippet1":::
       ]]></format>
     </example>
   </Docs>
@@ -92,7 +92,7 @@ TimeSpan objects are serialized according to the ISO 8601: 1998 section 5.5.3.2.
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFormatter Example/CPP/soapformatter.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFormatter Example/VB/soapformatter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@ TimeSpan objects are serialized according to the ISO 8601: 1998 section 5.5.3.2.
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFormatter Example/CPP/soapformatter.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFormatter Example/VB/soapformatter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -412,7 +412,7 @@ TimeSpan objects are serialized according to the ISO 8601: 1998 section 5.5.3.2.
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFormatter Example/CPP/soapformatter.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFormatter Example/VB/soapformatter.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Serialization.Formatters.Soap/SoapFormatter/Overview/soapformatter.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Runtime.Serialization/SerializationInfo.xml b/xml/System.Runtime.Serialization/SerializationInfo.xml
index e89b55a361f..108f469e093 100644
--- a/xml/System.Runtime.Serialization/SerializationInfo.xml
+++ b/xml/System.Runtime.Serialization/SerializationInfo.xml
@@ -2462,7 +2462,7 @@ End Sub
  The following code example demonstrates the use of the <xref:System.Runtime.Serialization.SerializationInfo.GetValue%2A> method:
   
  :::code language="csharp" source="~/snippets/csharp/System.Runtime.Serialization/SerializationInfo/GetValue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SerializationInfo.GetValue Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Runtime.Serialization/SerializationInfo/GetValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Transactions/TransactionScope.xml b/xml/System.Transactions/TransactionScope.xml
index 1f82d4a2e7c..949cfb3db91 100644
--- a/xml/System.Transactions/TransactionScope.xml
+++ b/xml/System.Transactions/TransactionScope.xml
@@ -81,7 +81,7 @@
  The following example demonstrates how to use the <xref:System.Transactions.TransactionScope> class to define a block of code to participate in a transaction.
 
  :::code language="csharp" source="~/snippets/csharp/System.Transactions/TransactionScope/Overview/ScopeWithSQL.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/ScopeWithSQL.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Transactions/TransactionScope/Overview/ScopeWithSQL.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -770,7 +770,7 @@ When you use the `transactionOptions` parameter to specify an <xref:System.Trans
  The following example demonstrates how to use the <xref:System.Transactions.TransactionScope> class to define a block of code to participate in a transaction.
 
  :::code language="csharp" source="~/snippets/csharp/System.Transactions/TransactionScope/Overview/ScopeWithSQL.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/ScopeWithSQL.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Transactions/TransactionScope/Overview/ScopeWithSQL.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -836,7 +836,7 @@ When you use the `transactionOptions` parameter to specify an <xref:System.Trans
  The following example demonstrates how to use the <xref:System.Transactions.TransactionScope> class to define a block of code to participate in a transaction.
 
  :::code language="csharp" source="~/snippets/csharp/System.Transactions/TransactionScope/Overview/ScopeWithSQL.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/TransactionScope/vb/ScopeWithSQL.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Transactions/TransactionScope/Overview/ScopeWithSQL.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Configuration/XmlFormatExtensionAttribute.xml b/xml/System.Web.Services.Configuration/XmlFormatExtensionAttribute.xml
index d1107bd37b4..1d205f6c035 100644
--- a/xml/System.Web.Services.Configuration/XmlFormatExtensionAttribute.xml
+++ b/xml/System.Web.Services.Configuration/XmlFormatExtensionAttribute.xml
@@ -58,7 +58,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -144,7 +144,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -405,7 +405,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -445,7 +445,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.xml b/xml/System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.xml
index 41bb4e5aa8e..a16c3ead908 100644
--- a/xml/System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.xml
+++ b/xml/System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.xml
@@ -58,7 +58,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.xml b/xml/System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.xml
index 76ec0372dd2..e887905d1b2 100644
--- a/xml/System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.xml
+++ b/xml/System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.xml
@@ -58,7 +58,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -140,7 +140,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -180,7 +180,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -220,7 +220,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension/VB/source.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Configuration/XmlFormatExtensionAttribute/Overview/source.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/Binding.xml b/xml/System.Web.Services.Description/Binding.xml
index 90ff626b1db..bf25d5513c2 100644
--- a/xml/System.Web.Services.Description/Binding.xml
+++ b/xml/System.Web.Services.Description/Binding.xml
@@ -55,7 +55,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample1/CPP/bindingcollectionsample1.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample1/VB/bindingcollectionsample1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionSample2/CPP/bindingcollectionsample2.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/bindingcollectionsample2.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -214,10 +214,10 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionSample2/CPP/bindingcollectionsample2.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/bindingcollectionsample2.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.vb" id="Snippet5":::  
 :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionSample2/CPP/bindingcollectionsample2.cpp" id="Snippet8":::
 :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.cs" id="Snippet8":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/bindingcollectionsample2.vb" id="Snippet8":::  
+:::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -303,7 +303,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionSample2/CPP/bindingcollectionsample2.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/bindingcollectionsample2.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/BindingCollection.xml b/xml/System.Web.Services.Description/BindingCollection.xml
index 2bd7c6eb70f..5db5c9dd961 100644
--- a/xml/System.Web.Services.Description/BindingCollection.xml
+++ b/xml/System.Web.Services.Description/BindingCollection.xml
@@ -79,7 +79,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample3/CPP/bindingcollectionsample3.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample3/VB/bindingcollectionsample3.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -125,7 +125,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample3/CPP/bindingcollectionsample3.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample3/VB/bindingcollectionsample3.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -171,7 +171,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample1/CPP/bindingcollectionsample1.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample1/VB/bindingcollectionsample1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample3/CPP/bindingcollectionsample3.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample3/VB/bindingcollectionsample3.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -307,7 +307,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionSample2/CPP/bindingcollectionsample2.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionSample2/VB/bindingcollectionsample2.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Extensions/bindingcollectionsample2.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -362,7 +362,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample1/CPP/bindingcollectionsample1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample1/VB/bindingcollectionsample1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -414,7 +414,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample1/CPP/bindingcollectionsample1.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample1/VB/bindingcollectionsample1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Binding/Overview/bindingcollectionsample1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -465,7 +465,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/BindingCollectionsample3/CPP/bindingcollectionsample3.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/BindingCollectionsample3/VB/bindingcollectionsample3.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/BindingCollection/Add/bindingcollectionsample3.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/DocumentableItem.xml b/xml/System.Web.Services.Description/DocumentableItem.xml
index 47188b42eb2..ef4716e7b30 100644
--- a/xml/System.Web.Services.Description/DocumentableItem.xml
+++ b/xml/System.Web.Services.Description/DocumentableItem.xml
@@ -142,7 +142,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DocumentableItemsample/CPP/documentableitemsample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/DocumentableItem/Documentation/documentableitemsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DocumentableItemsample/VB/documentableitemsample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/DocumentableItem/Documentation/documentableitemsample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/FaultBinding.xml b/xml/System.Web.Services.Description/FaultBinding.xml
index af701cdeee7..f6fd204899a 100644
--- a/xml/System.Web.Services.Description/FaultBinding.xml
+++ b/xml/System.Web.Services.Description/FaultBinding.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Add/CPP/faultbindingcollection_add.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Add/VB/faultbindingcollection_add.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/FaultBindingCollection.xml b/xml/System.Web.Services.Description/FaultBindingCollection.xml
index 6879597472a..b965612c785 100644
--- a/xml/System.Web.Services.Description/FaultBindingCollection.xml
+++ b/xml/System.Web.Services.Description/FaultBindingCollection.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Importsample/CPP/importsample.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Add/CPP/faultbindingcollection_add.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Add/VB/faultbindingcollection_add.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -130,7 +130,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Remove/CPP/faultbindingcollection_remove.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Remove/VB/faultbindingcollection_remove.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -178,7 +178,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Remove/CPP/faultbindingcollection_remove.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Remove/VB/faultbindingcollection_remove.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -261,7 +261,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Remove/CPP/faultbindingcollection_remove.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Remove/VB/faultbindingcollection_remove.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -318,7 +318,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Remove/CPP/faultbindingcollection_remove.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Remove/VB/faultbindingcollection_remove.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -375,7 +375,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Add/CPP/faultbindingcollection_add.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Add/VB/faultbindingcollection_add.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBinding/Overview/faultbindingcollection_add.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -427,7 +427,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Item/CPP/faultbindingcollection_item.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Item/faultbindingcollection_item.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Item/VB/faultbindingcollection_item.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Item/faultbindingcollection_item.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -480,7 +480,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/FaultBindingCollection_Remove/CPP/faultbindingcollection_remove.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/FaultBindingCollection_Remove/VB/faultbindingcollection_remove.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Contains/faultbindingcollection_remove.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/HttpAddressBinding.xml b/xml/System.Web.Services.Description/HttpAddressBinding.xml
index a84fea9e89b..51d9ae2fd4d 100644
--- a/xml/System.Web.Services.Description/HttpAddressBinding.xml
+++ b/xml/System.Web.Services.Description/HttpAddressBinding.xml
@@ -47,7 +47,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/WebServices_HttpBinding/CPP/httpbinding.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/HttpAddressBinding/Overview/httpbinding.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebServices_HttpBinding/VB/httpbinding.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/HttpAddressBinding/Overview/httpbinding.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/HttpBinding.xml b/xml/System.Web.Services.Description/HttpBinding.xml
index 61e4e9eecd9..c1cdc7b1a6d 100644
--- a/xml/System.Web.Services.Description/HttpBinding.xml
+++ b/xml/System.Web.Services.Description/HttpBinding.xml
@@ -53,7 +53,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/WebServices_HttpBinding/CPP/httpbinding.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/HttpAddressBinding/Overview/httpbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/WebServices_HttpBinding/VB/httpbinding.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/HttpAddressBinding/Overview/httpbinding.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -128,7 +128,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpBinding_HttpBinding/CPP/httpbinding_ctor.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/HttpBinding/Namespace/httpbinding_ctor.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpBinding_HttpBinding/VB/httpbinding_ctor.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/HttpBinding/Namespace/httpbinding_ctor.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/Import.xml b/xml/System.Web.Services.Description/Import.xml
index d8776a79e8e..5d42f8211a3 100644
--- a/xml/System.Web.Services.Description/Import.xml
+++ b/xml/System.Web.Services.Description/Import.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Importsample/CPP/importsample.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb" id="Snippet7":::  
   
  ]]></format>
     </remarks>
@@ -161,7 +161,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Importsample/CPP/importsample.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -208,7 +208,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Importsample/CPP/importsample.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/ImportCollection.xml b/xml/System.Web.Services.Description/ImportCollection.xml
index 1015879ac22..851d6bc5d92 100644
--- a/xml/System.Web.Services.Description/ImportCollection.xml
+++ b/xml/System.Web.Services.Description/ImportCollection.xml
@@ -43,7 +43,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ImportCollection_6/CPP/importcollection_6.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -91,7 +91,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Importsample/CPP/importsample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -139,7 +139,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ImportCollection_6/CPP/importcollection_6.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -187,7 +187,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ImportCollection_6/CPP/importcollection_6.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ImportCollection_6/CPP/importcollection_6.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -291,7 +291,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Importsample/CPP/importsample.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Importsample/VB/importsample.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/FaultBindingCollection/Overview/importsample.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -343,7 +343,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ImportCollection_6/CPP/importcollection_6.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ImportCollection_6/CPP/importcollection_6.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ImportCollection_6/VB/importcollection_6.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ImportCollection/Overview/importcollection_6.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/InputBinding.xml b/xml/System.Web.Services.Description/InputBinding.xml
index fef00d1557b..db87873165e 100644
--- a/xml/System.Web.Services.Description/InputBinding.xml
+++ b/xml/System.Web.Services.Description/InputBinding.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/Message.xml b/xml/System.Web.Services.Description/Message.xml
index 0dd559cec50..8c8f5764b32 100644
--- a/xml/System.Web.Services.Description/Message.xml
+++ b/xml/System.Web.Services.Description/Message.xml
@@ -55,7 +55,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet13":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet13":::  
   
  ]]></format>
     </remarks>
@@ -167,7 +167,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message_Samples3/CPP/message_samples3.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Message/FindPartByName/message_samples3.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message_Samples3/VB/message_samples3.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Message/FindPartByName/message_samples3.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -215,7 +215,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Message_Samples3/CPP/message_samples3.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Message/FindPartByName/message_samples3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Message_Samples3/VB/message_samples3.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Message/FindPartByName/message_samples3.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -295,7 +295,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet13":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet13":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet13":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MessageBinding.xml b/xml/System.Web.Services.Description/MessageBinding.xml
index f6e7494ed0a..10c2664251b 100644
--- a/xml/System.Web.Services.Description/MessageBinding.xml
+++ b/xml/System.Web.Services.Description/MessageBinding.xml
@@ -55,7 +55,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageBinding_sample/CPP/messagebinding_sample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessageBinding/Overview/messagebinding_sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageBinding_sample/VB/messagebinding_sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessageBinding/Overview/messagebinding_sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/MessageCollection.xml b/xml/System.Web.Services.Description/MessageCollection.xml
index 6f70d3f57a0..cca2b5ac394 100644
--- a/xml/System.Web.Services.Description/MessageCollection.xml
+++ b/xml/System.Web.Services.Description/MessageCollection.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet9":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet9":::  
   
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -129,7 +129,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageCollection/CPP/messagecollection.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessageCollection/Contains/messagecollection.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -177,7 +177,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageCollection/CPP/messagecollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessageCollection/Contains/messagecollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -260,7 +260,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageCollection/CPP/messagecollection.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessageCollection/Contains/messagecollection.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -377,7 +377,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageCollection/CPP/messagecollection.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessageCollection/Contains/messagecollection.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -424,7 +424,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageCollection/CPP/messagecollection.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessageCollection/Contains/messagecollection.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -477,7 +477,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessageCollection/CPP/messagecollection.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessageCollection/Contains/messagecollection.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessageCollection/VB/messagecollection.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessageCollection/Contains/messagecollection.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MessagePart.xml b/xml/System.Web.Services.Description/MessagePart.xml
index 78b3e5f511a..95b9149925e 100644
--- a/xml/System.Web.Services.Description/MessagePart.xml
+++ b/xml/System.Web.Services.Description/MessagePart.xml
@@ -55,7 +55,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet10":::  
   
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MessagePartCollection.xml b/xml/System.Web.Services.Description/MessagePartCollection.xml
index 5fb26e2044b..e908f43eb19 100644
--- a/xml/System.Web.Services.Description/MessagePartCollection.xml
+++ b/xml/System.Web.Services.Description/MessagePartCollection.xml
@@ -43,7 +43,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet8":::  
   
  ]]></format>
     </remarks>
@@ -89,7 +89,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet14":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet14":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet14":::  
   
  ]]></format>
         </remarks>
@@ -137,7 +137,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -185,7 +185,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -323,7 +323,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet15":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet15":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet15":::  
   
  ]]></format>
         </remarks>
@@ -380,7 +380,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -478,7 +478,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MessagePartCollection/CPP/messagepartcollection.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MessagePart/Message/messagepartcollection.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MessagePartCollection/VB/messagepartcollection.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MessagePart/Message/messagepartcollection.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MimeContentBinding.xml b/xml/System.Web.Services.Description/MimeContentBinding.xml
index 4f5c2f110e3..43b34a7b8ff 100644
--- a/xml/System.Web.Services.Description/MimeContentBinding.xml
+++ b/xml/System.Web.Services.Description/MimeContentBinding.xml
@@ -53,7 +53,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeContentBinding_Part_4/CPP/mimecontentbinding_part_4.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeContentBinding_Part_4/VB/mimecontentbinding_part_4.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
@@ -121,7 +121,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeContentBinding_Part_4/CPP/mimecontentbinding_part_4.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeContentBinding_Part_4/VB/mimecontentbinding_part_4.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -172,7 +172,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeContentBinding_Part_4/CPP/mimecontentbinding_part_4.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeContentBinding_Part_4/VB/mimecontentbinding_part_4.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeContentBinding/Overview/mimecontentbinding_part_4.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MimeMultipartRelatedBinding.xml b/xml/System.Web.Services.Description/MimeMultipartRelatedBinding.xml
index 565441d84b3..3fb7cd63f41 100644
--- a/xml/System.Web.Services.Description/MimeMultipartRelatedBinding.xml
+++ b/xml/System.Web.Services.Description/MimeMultipartRelatedBinding.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeMultiPartRelatedBinding_Parts_2/CPP/mimemultipartrelatedbinding_parts_2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeMultipartRelatedBinding/Overview/mimemultipartrelatedbinding_parts_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeMultiPartRelatedBinding_Parts_2/VB/mimemultipartrelatedbinding_parts_2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeMultipartRelatedBinding/Overview/mimemultipartrelatedbinding_parts_2.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/MimePart.xml b/xml/System.Web.Services.Description/MimePart.xml
index 216558ac9ff..daba0b684e6 100644
--- a/xml/System.Web.Services.Description/MimePart.xml
+++ b/xml/System.Web.Services.Description/MimePart.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePart_3/CPP/mimepart_3.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePart/Overview/mimepart_3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePart_3/VB/mimepart_3.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePart/Overview/mimepart_3.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/MimePartCollection.xml b/xml/System.Web.Services.Description/MimePartCollection.xml
index 70649ba9411..d0b7bca4fac 100644
--- a/xml/System.Web.Services.Description/MimePartCollection.xml
+++ b/xml/System.Web.Services.Description/MimePartCollection.xml
@@ -45,7 +45,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePartCollection_1/CPP/mimepartcollection_1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePartCollection/Overview/mimepartcollection_1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_1/VB/mimepartcollection_1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Overview/mimepartcollection_1.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -120,7 +120,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePartCollection_8/CPP/mimepartcollection_8.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -168,7 +168,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePartCollection_8/CPP/mimepartcollection_8.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePartCollection_8/CPP/mimepartcollection_8.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -263,7 +263,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePartCollection_8/CPP/mimepartcollection_8.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -320,7 +320,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePartCollection_8/CPP/mimepartcollection_8.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -372,7 +372,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimePartCollection_8/CPP/mimepartcollection_8.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimePartCollection_8/VB/mimepartcollection_8.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimePartCollection/Add/mimepartcollection_8.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MimeTextBinding.xml b/xml/System.Web.Services.Description/MimeTextBinding.xml
index 4b67a53ae4e..12de857858f 100644
--- a/xml/System.Web.Services.Description/MimeTextBinding.xml
+++ b/xml/System.Web.Services.Description/MimeTextBinding.xml
@@ -51,7 +51,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Binding_Match_8/CPP/mimetext_binding_match_8.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Binding_Match_8/CPP/mimetext_binding_match_8.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MimeTextMatch.xml b/xml/System.Web.Services.Description/MimeTextMatch.xml
index 124c88c6286..a740dbbbb26 100644
--- a/xml/System.Web.Services.Description/MimeTextMatch.xml
+++ b/xml/System.Web.Services.Description/MimeTextMatch.xml
@@ -43,7 +43,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Binding_Match_8/CPP/mimetext_binding_match_8.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -127,7 +127,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeTextMatch_5/CPP/mimetextmatch_5.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/mimetextmatch_5.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeTextMatch_5/CPP/mimetextmatch_5.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/mimetextmatch_5.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -233,7 +233,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Binding_Match_8/CPP/mimetext_binding_match_8.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -280,7 +280,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Binding_Match_8/CPP/mimetext_binding_match_8.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -327,7 +327,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Binding_Match_8/CPP/mimetext_binding_match_8.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -379,7 +379,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Binding_Match_8/CPP/mimetext_binding_match_8.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Binding_Match_8/VB/mimetext_binding_match_8.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextBinding/Overview/mimetext_binding_match_8.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeTextMatch_5/CPP/mimetextmatch_5.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/mimetextmatch_5.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -490,7 +490,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeTextMatch_5/CPP/mimetextmatch_5.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeTextMatch_5/VB/mimetextmatch_5.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatch/Capture/mimetextmatch_5.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MimeTextMatchCollection.xml b/xml/System.Web.Services.Description/MimeTextMatchCollection.xml
index 4062754dba1..c5cd74f4191 100644
--- a/xml/System.Web.Services.Description/MimeTextMatchCollection.xml
+++ b/xml/System.Web.Services.Description/MimeTextMatchCollection.xml
@@ -43,7 +43,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/CPP/mimetext_match_matchcoll_9.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -118,7 +118,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/CPP/mimetext_match_matchcoll_9.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/CPP/mimetext_match_matchcoll_9.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/CPP/mimetext_match_matchcoll_9.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -261,7 +261,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/CPP/mimetext_match_matchcoll_9.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -318,7 +318,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/CPP/mimetext_match_matchcoll_9.cpp" id="Snippet9":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/CPP/mimetext_match_matchcoll_9.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeText_Match_MatchColl_9/VB/mimetext_match_matchcoll_9.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeTextMatchCollection/Overview/mimetext_match_matchcoll_9.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/MimeXmlBinding.xml b/xml/System.Web.Services.Description/MimeXmlBinding.xml
index 9b0f1ba101d..26c9b82a333 100644
--- a/xml/System.Web.Services.Description/MimeXmlBinding.xml
+++ b/xml/System.Web.Services.Description/MimeXmlBinding.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MimeXmlBinding_Part_3/CPP/mimexmlbinding_part_3.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/MimeXmlBinding/Overview/mimexmlbinding_part_3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MimeXmlBinding_Part_3/VB/mimexmlbinding_part_3.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/MimeXmlBinding/Overview/mimexmlbinding_part_3.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/Operation.xml b/xml/System.Web.Services.Description/Operation.xml
index a22c28c218d..cf98674fb97 100644
--- a/xml/System.Web.Services.Description/Operation.xml
+++ b/xml/System.Web.Services.Description/Operation.xml
@@ -55,7 +55,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Operation_5/CPP/operation_5.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Operation/Overview/operation_5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/operation_5.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Operation/Overview/operation_5.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -168,7 +168,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Operation_Faults/CPP/operation_faults.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Operation/Faults/operation_faults.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Operation_Faults/VB/operation_faults.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Operation/Faults/operation_faults.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Operation_IsBoundBy/CPP/operation_isboundby.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Operation/IsBoundBy/operation_isboundby.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Operation_IsBoundBy/VB/operation_isboundby.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Operation/IsBoundBy/operation_isboundby.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -272,7 +272,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Operation_5/CPP/operation_5.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Operation/Overview/operation_5.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Operation_5/VB/operation_5.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Operation/Overview/operation_5.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -354,7 +354,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Operation_2/CPP/operation_2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Operation/ParameterOrder/operation_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/operation_2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/operation_2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -422,7 +422,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Operation_2/CPP/operation_2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Operation/ParameterOrder/operation_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Operation_2/VB/operation_2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Operation/ParameterOrder/operation_2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/OperationBinding.xml b/xml/System.Web.Services.Description/OperationBinding.xml
index 45ce9937c05..c605457e33e 100644
--- a/xml/System.Web.Services.Description/OperationBinding.xml
+++ b/xml/System.Web.Services.Description/OperationBinding.xml
@@ -55,7 +55,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBinding_OperationBinding/CPP/operationbinding_operationbinding.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/operationbinding_operationbinding.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -129,7 +129,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBinding_OperationBinding/CPP/operationbinding_operationbinding.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/operationbinding_operationbinding.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -185,7 +185,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBinding_OperationBinding/CPP/operationbinding_operationbinding.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/operationbinding_operationbinding.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -232,7 +232,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBinding_OperationBinding/CPP/operationbinding_operationbinding.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/operationbinding_operationbinding.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -284,7 +284,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBinding_OperationBinding/CPP/operationbinding_operationbinding.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBinding_OperationBinding/VB/operationbinding_operationbinding.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBinding/Overview/operationbinding_operationbinding.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/OperationBindingCollection.xml b/xml/System.Web.Services.Description/OperationBindingCollection.xml
index 001d636265b..f0ef8379a54 100644
--- a/xml/System.Web.Services.Description/OperationBindingCollection.xml
+++ b/xml/System.Web.Services.Description/OperationBindingCollection.xml
@@ -41,7 +41,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -88,7 +88,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -136,7 +136,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -231,7 +231,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -288,7 +288,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -335,7 +335,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -388,7 +388,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/CPP/operationbindingcollection_operationbindingcollection.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationBindingCollection_OperationBindingCollection/VB/operationbindingcollection_operationbindingcollection.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationBindingCollection/Overview/operationbindingcollection_operationbindingcollection.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/OperationCollection.xml b/xml/System.Web.Services.Description/OperationCollection.xml
index c9ecae1508f..a3c252c59a7 100644
--- a/xml/System.Web.Services.Description/OperationCollection.xml
+++ b/xml/System.Web.Services.Description/OperationCollection.xml
@@ -43,7 +43,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -90,7 +90,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -138,7 +138,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -186,7 +186,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -233,7 +233,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -290,7 +290,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationCollection_Methods/CPP/operationcollection_methods.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationCollection_Methods/VB/operationcollection_methods.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationCollection/Overview/operationcollection_methods.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/OperationFault.xml b/xml/System.Web.Services.Description/OperationFault.xml
index 1d0cae1a93a..b4ff3f635ea 100644
--- a/xml/System.Web.Services.Description/OperationFault.xml
+++ b/xml/System.Web.Services.Description/OperationFault.xml
@@ -51,7 +51,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFault_OperationFault/CPP/operationfault_operationfault.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFault/Overview/operationfault_operationfault.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFault_OperationFault/VB/operationfault_operationfault.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFault/Overview/operationfault_operationfault.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/OperationFaultCollection.xml b/xml/System.Web.Services.Description/OperationFaultCollection.xml
index 601a20fc180..89781678a18 100644
--- a/xml/System.Web.Services.Description/OperationFaultCollection.xml
+++ b/xml/System.Web.Services.Description/OperationFaultCollection.xml
@@ -41,7 +41,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_7/CPP/operationfaultcollection_7.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -86,7 +86,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_Add/CPP/operationfaultcollection_add.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Add/operationfaultcollection_add.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Add/VB/operationfaultcollection_add.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Add/operationfaultcollection_add.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -132,7 +132,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_7/CPP/operationfaultcollection_7.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -178,7 +178,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_7/CPP/operationfaultcollection_7.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -259,7 +259,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_7/CPP/operationfaultcollection_7.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -314,7 +314,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_7/CPP/operationfaultcollection_7.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -369,7 +369,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_7/CPP/operationfaultcollection_7.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -414,7 +414,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_Item/CPP/operationfaultcollection_item.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Item/operationfaultcollection_item.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_Item/VB/operationfaultcollection_item.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Item/operationfaultcollection_item.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -465,7 +465,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFaultCollection_7/CPP/operationfaultcollection_7.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFaultCollection_7/VB/operationfaultcollection_7.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFaultCollection/Overview/operationfaultcollection_7.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/OperationFlow.xml b/xml/System.Web.Services.Description/OperationFlow.xml
index dba9ce3e981..b74bf1d07ba 100644
--- a/xml/System.Web.Services.Description/OperationFlow.xml
+++ b/xml/System.Web.Services.Description/OperationFlow.xml
@@ -42,7 +42,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationFlow_Enum/CPP/operationflow_enum.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationFlow/Overview/operationflow_enum.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationFlow_Enum/VB/operationflow_enum.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationFlow/Overview/operationflow_enum.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/OperationInput.xml b/xml/System.Web.Services.Description/OperationInput.xml
index 5d4e5c2dda2..a6623075183 100644
--- a/xml/System.Web.Services.Description/OperationInput.xml
+++ b/xml/System.Web.Services.Description/OperationInput.xml
@@ -49,7 +49,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationInput_OperationInput/CPP/operationinput_operationinput.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationInput/Overview/operationinput_operationinput.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationInput_OperationInput/VB/operationinput_operationinput.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationInput/Overview/operationinput_operationinput.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/OperationMessage.xml b/xml/System.Web.Services.Description/OperationMessage.xml
index 01ae21f5f0b..f2840bb3504 100644
--- a/xml/System.Web.Services.Description/OperationMessage.xml
+++ b/xml/System.Web.Services.Description/OperationMessage.xml
@@ -53,7 +53,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessage_Properties/CPP/operationmessage_properties.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessage/Overview/operationmessage_properties.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/operationmessage_properties.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/operationmessage_properties.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -128,7 +128,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessage_Properties/CPP/operationmessage_properties.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessage/Overview/operationmessage_properties.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessage_Properties/VB/operationmessage_properties.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessage/Overview/operationmessage_properties.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/OperationMessageCollection.xml b/xml/System.Web.Services.Description/OperationMessageCollection.xml
index 33a799871dd..48b8accf2cd 100644
--- a/xml/System.Web.Services.Description/OperationMessageCollection.xml
+++ b/xml/System.Web.Services.Description/OperationMessageCollection.xml
@@ -41,7 +41,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -86,7 +86,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -132,7 +132,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -178,7 +178,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -219,7 +219,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet9":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -264,7 +264,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -305,7 +305,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet10":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet10":::  
   
  ]]></format>
         </remarks>
@@ -360,7 +360,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -405,7 +405,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -557,7 +557,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet11":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet11":::  
   
  ]]></format>
         </remarks>
@@ -608,7 +608,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationMessageCollection_Sample/CPP/operationmessagecollection_sample.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationMessageCollection_Sample/VB/operationmessagecollection_sample.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationMessageCollection/Overview/operationmessagecollection_sample.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/OperationOutput.xml b/xml/System.Web.Services.Description/OperationOutput.xml
index 8b2ef382880..8b03ba090e7 100644
--- a/xml/System.Web.Services.Description/OperationOutput.xml
+++ b/xml/System.Web.Services.Description/OperationOutput.xml
@@ -49,7 +49,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/OperationOutput_OperationOutput/CPP/operationoutput_operationoutput.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/OperationOutput/Overview/operationoutput_operationoutput.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/OperationOutput_OperationOutput/VB/operationoutput_operationoutput.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/OperationOutput/Overview/operationoutput_operationoutput.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/OutputBinding.xml b/xml/System.Web.Services.Description/OutputBinding.xml
index 0b828ba950d..5d8a08d3969 100644
--- a/xml/System.Web.Services.Description/OutputBinding.xml
+++ b/xml/System.Web.Services.Description/OutputBinding.xml
@@ -49,7 +49,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DescriptionNamespaceSample1/CPP/descriptionnamespacesample1.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DescriptionNamespaceSample1/VB/descriptionnamespacesample1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/InputBinding/Overview/descriptionnamespacesample1.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/Port.xml b/xml/System.Web.Services.Description/Port.xml
index 772a06b6870..f873e523a50 100644
--- a/xml/System.Web.Services.Description/Port.xml
+++ b/xml/System.Web.Services.Description/Port.xml
@@ -57,7 +57,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortClass/CPP/portclass.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Port/Overview/portclass.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortClass/VB/portclass.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Port/Overview/portclass.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -138,7 +138,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortClass/CPP/portclass.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Port/Overview/portclass.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortClass/VB/portclass.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Port/Overview/portclass.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -188,7 +188,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortClass/CPP/portclass.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Port/Overview/portclass.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortClass/VB/portclass.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Port/Overview/portclass.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/PortCollection.xml b/xml/System.Web.Services.Description/PortCollection.xml
index e4109f47a87..558ecd46374 100644
--- a/xml/System.Web.Services.Description/PortCollection.xml
+++ b/xml/System.Web.Services.Description/PortCollection.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_Item/CPP/portcollection_item.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/Overview/portcollection_item.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/portcollection_item.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/portcollection_item.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_Add/CPP/portcollection_add.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/Add/portcollection_add.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Add/VB/portcollection_add.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/Add/portcollection_add.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -127,7 +127,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_Add/CPP/portcollection_add.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/Add/portcollection_add.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Add/VB/portcollection_add.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/Add/portcollection_add.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -173,7 +173,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_CopyTo/CPP/portcollection_copyto.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_CopyTo/VB/portcollection_copyto.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_CopyTo/CPP/portcollection_copyto.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_CopyTo/VB/portcollection_copyto.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -309,7 +309,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_CopyTo/CPP/portcollection_copyto.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_CopyTo/VB/portcollection_copyto.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/CopyTo/portcollection_copyto.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -369,7 +369,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_Item/CPP/portcollection_item.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/Overview/portcollection_item.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/portcollection_item.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/portcollection_item.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -414,7 +414,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_Item/CPP/portcollection_item.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/Overview/portcollection_item.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/portcollection_item.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/portcollection_item.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -465,7 +465,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortCollection_Item/CPP/portcollection_item.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortCollection/Overview/portcollection_item.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortCollection_Item/VB/portcollection_item.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortCollection/Overview/portcollection_item.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/PortType.xml b/xml/System.Web.Services.Description/PortType.xml
index ce0238768f7..00e982c9745 100644
--- a/xml/System.Web.Services.Description/PortType.xml
+++ b/xml/System.Web.Services.Description/PortType.xml
@@ -53,7 +53,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortType_Class/CPP/porttype_class.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortType/Overview/porttype_class.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortType_Class/VB/porttype_class.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortType/Overview/porttype_class.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -195,7 +195,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortType/CPP/porttype.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortType/Operations/porttype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortType/VB/porttype.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortType/Operations/porttype.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/PortTypeCollection.xml b/xml/System.Web.Services.Description/PortTypeCollection.xml
index ace77ab6192..419bd0fa019 100644
--- a/xml/System.Web.Services.Description/PortTypeCollection.xml
+++ b/xml/System.Web.Services.Description/PortTypeCollection.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_Class/CPP/porttypecollection_class.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Overview/porttypecollection_class.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_Class/VB/porttypecollection_class.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Overview/porttypecollection_class.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_1/CPP/porttypecollection_1.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_1/VB/porttypecollection_1.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -127,7 +127,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_2/CPP/porttypecollection_2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/porttypecollection_2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -173,7 +173,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_CopyTo/CPP/porttypecollection_copyto.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/CopyTo/porttypecollection_copyto.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_CopyTo/VB/porttypecollection_copyto.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/CopyTo/porttypecollection_copyto.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_2/CPP/porttypecollection_2.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/porttypecollection_2.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -309,7 +309,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_2/CPP/porttypecollection_2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/porttypecollection_2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -369,7 +369,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_1/CPP/porttypecollection_1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_1/VB/porttypecollection_1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -414,7 +414,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_2/CPP/porttypecollection_2.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_2/VB/porttypecollection_2.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Contains/porttypecollection_2.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -466,7 +466,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/PortTypeCollection_1/CPP/porttypecollection_1.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/PortTypeCollection_1/VB/porttypecollection_1.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/PortTypeCollection/Add/porttypecollection_1.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/Service.xml b/xml/System.Web.Services.Description/Service.xml
index 1e8060e9ef4..ded2469b872 100644
--- a/xml/System.Web.Services.Description/Service.xml
+++ b/xml/System.Web.Services.Description/Service.xml
@@ -53,7 +53,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceClass/CPP/serviceclass.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Service/Overview/serviceclass.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceClass/VB/serviceclass.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Service/Overview/serviceclass.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -131,7 +131,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Service_Class4/CPP/service_class.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Service/Extensions/service_class.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/service_class.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Service/Extensions/service_class.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -208,7 +208,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Service_Class4/CPP/service_class.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/Service/Extensions/service_class.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Service_Class4/VB/service_class.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/Service/Extensions/service_class.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/ServiceCollection.xml b/xml/System.Web.Services.Description/ServiceCollection.xml
index effc382e4da..b22ccf96494 100644
--- a/xml/System.Web.Services.Description/ServiceCollection.xml
+++ b/xml/System.Web.Services.Description/ServiceCollection.xml
@@ -79,7 +79,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_Item/CPP/servicecollection_item.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -125,7 +125,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_CopyTo/CPP/servicecollection_copyto.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/servicecollection_copyto.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -171,7 +171,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_CopyTo/CPP/servicecollection_copyto.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/servicecollection_copyto.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_CopyTo/CPP/servicecollection_copyto.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_CopyTo/VB/servicecollection_copyto.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Contains/servicecollection_copyto.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -307,7 +307,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Read/CPP/servicedescription_read.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/servicedescription_read.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -367,7 +367,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_Item/CPP/servicecollection_item.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -412,7 +412,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Read/CPP/servicedescription_read.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/servicedescription_read.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -463,7 +463,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_Item/CPP/servicecollection_item.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/ServiceDescription.xml b/xml/System.Web.Services.Description/ServiceDescription.xml
index a942fc419f5..bd832e08576 100644
--- a/xml/System.Web.Services.Description/ServiceDescription.xml
+++ b/xml/System.Web.Services.Description/ServiceDescription.xml
@@ -61,7 +61,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription/CPP/servicedescription.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Overview/servicedescription.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription/VB/servicedescription.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Overview/servicedescription.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -141,7 +141,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Bindings/CPP/servicedescription_bindings.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Bindings/servicedescription_bindings.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Bindings/VB/servicedescription_bindings.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Bindings/servicedescription_bindings.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -187,7 +187,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/CPP/servicedescription_porttypes_2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/CanRead/servicedescription_porttypes_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/servicedescription_porttypes_2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/servicedescription_porttypes_2.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -237,7 +237,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/CPP/servicedescription_extensions_2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Extensions/servicedescription_extensions_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/servicedescription_extensions_2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/servicedescription_extensions_2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -289,7 +289,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Imports_Service/CPP/servicedescription_imports.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Imports/servicedescription_imports.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Imports_Service/VB/servicedescription_imports.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Imports/servicedescription_imports.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -341,7 +341,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Constructor_4/CPP/servicedescription_constructor_4.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Messages/servicedescription_constructor_4.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/servicedescription_constructor_4.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/servicedescription_constructor_4.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -411,7 +411,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Namespace/CPP/servicedescription_namespace.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Namespace/servicedescription_namespace.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Namespace/VB/servicedescription_namespace.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Namespace/servicedescription_namespace.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -463,7 +463,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/CPP/servicedescription_porttypes_2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/CanRead/servicedescription_porttypes_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_PortTypes_2/VB/servicedescription_porttypes_2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/CanRead/servicedescription_porttypes_2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -518,7 +518,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Read2/CPP/servicedescription_read2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read2/VB/servicedescription_read2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -563,7 +563,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Read1/CPP/servicedescription_read1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read1/VB/servicedescription_read1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Read/servicedescription_read1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -608,7 +608,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Constructor_4/CPP/servicedescription_constructor_4.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Messages/servicedescription_constructor_4.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Constructor_4/VB/servicedescription_constructor_4.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Messages/servicedescription_constructor_4.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -653,7 +653,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Read/CPP/servicedescription_read.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Read/VB/servicedescription_read.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Insert/servicedescription_read.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -848,7 +848,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/CPP/servicedescription_extensions_2.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Extensions/servicedescription_extensions_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Extensions_RetrieveUrl/VB/servicedescription_extensions_2.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Extensions/servicedescription_extensions_2.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -1015,7 +1015,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_Item/CPP/servicecollection_item.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -1062,7 +1062,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_Item/CPP/servicecollection_item.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -1114,7 +1114,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Types/CPP/servicedescription_types.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Types/servicedescription_types.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Types/VB/servicedescription_types.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Types/servicedescription_types.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1205,7 +1205,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescription_Types/CPP/servicedescription_types.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescription/Types/servicedescription_types.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescription_Types/VB/servicedescription_types.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescription/Types/servicedescription_types.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -1284,7 +1284,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceCollection_Item/CPP/servicecollection_item.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceCollection_Item/VB/servicecollection_item.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceCollection/Add/servicecollection_item.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/ServiceDescriptionBaseCollection.xml b/xml/System.Web.Services.Description/ServiceDescriptionBaseCollection.xml
index 723bf9e4b40..3992fa7bb3c 100644
--- a/xml/System.Web.Services.Description/ServiceDescriptionBaseCollection.xml
+++ b/xml/System.Web.Services.Description/ServiceDescriptionBaseCollection.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionBaseCollection/CPP/servicedescriptionbasecollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionBaseCollection/Overview/servicedescriptionbasecollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionBaseCollection/VB/servicedescriptionbasecollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionBaseCollection/Overview/servicedescriptionbasecollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/ServiceDescriptionCollection.xml b/xml/System.Web.Services.Description/ServiceDescriptionCollection.xml
index 5cf089b3e88..6ebed8d8fe4 100644
--- a/xml/System.Web.Services.Description/ServiceDescriptionCollection.xml
+++ b/xml/System.Web.Services.Description/ServiceDescriptionCollection.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection/CPP/servicedescriptioncollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/Overview/servicedescriptioncollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection/VB/servicedescriptioncollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Overview/servicedescriptioncollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/CPP/sdcollection_constructor_add_item.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/servicedescriptioncollection_constructor_add_item.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -118,7 +118,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/CPP/sdcollection_constructor_add_item.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/servicedescriptioncollection_constructor_add_item.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -163,7 +163,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/servicedescriptioncollection_contains_indexof_remove.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/CPP/sdcollection_insert_item_copyto.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/servicedescriptioncollection_insert_item_copyto.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/CPP/servicedescriptioncollection_getbinding.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/servicedescriptioncollection_getbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetBinding/VB/servicedescriptioncollection_getbinding.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetBinding/servicedescriptioncollection_getbinding.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/CPP/servicedescriptioncollection_getmessage.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/servicedescriptioncollection_getmessage.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetMessage/VB/servicedescriptioncollection_getmessage.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetMessage/servicedescriptioncollection_getmessage.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/CPP/servicedescriptioncollection_getporttype.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/servicedescriptioncollection_getporttype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetPortType/VB/servicedescriptioncollection_getporttype.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetPortType/servicedescriptioncollection_getporttype.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -428,7 +428,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/CPP/servicedescriptioncollection_getservice.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/GetService/servicedescriptioncollection_getservice.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_GetService/VB/servicedescriptioncollection_getservice.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/GetService/servicedescriptioncollection_getservice.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -473,7 +473,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/servicedescriptioncollection_contains_indexof_remove.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -528,7 +528,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/CPP/sdcollection_insert_item_copyto.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/servicedescriptioncollection_insert_item_copyto.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -588,7 +588,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/CPP/sdcollection_constructor_add_item.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Constructor_Add_Item/VB/servicedescriptioncollection_constructor_add_item.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/.ctor/servicedescriptioncollection_constructor_add_item.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -633,7 +633,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/CPP/sdcollection_insert_item_copyto.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Insert_Item_CopyTo/VB/servicedescriptioncollection_insert_item_copyto.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/CopyTo/servicedescriptioncollection_insert_item_copyto.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -719,7 +719,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionCollection_Contains_IndexOf_Remove/VB/servicedescriptioncollection_contains_indexof_remove.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionCollection/Contains/servicedescriptioncollection_contains_indexof_remove.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.xml b/xml/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.xml
index 3cd2bcc7cb8..e4d526981ca 100644
--- a/xml/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.xml
+++ b/xml/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.xml
@@ -41,7 +41,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -87,7 +87,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -132,7 +132,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -178,7 +178,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet10":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -224,7 +224,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet9":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -329,7 +329,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -391,7 +391,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -483,7 +483,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet11":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -538,7 +538,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet13":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -594,7 +594,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -640,7 +640,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -685,7 +685,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -764,7 +764,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/CPP/servicedescriptionformatextension_13.cpp" id="Snippet12":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionFormatExtension_13/VB/servicedescriptionformatextension_13.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection/Overview/servicedescriptionformatextension_13.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/ServiceDescriptionImportStyle.xml b/xml/System.Web.Services.Description/ServiceDescriptionImportStyle.xml
index 0c47d1a21d9..1beb524a03a 100644
--- a/xml/System.Web.Services.Description/ServiceDescriptionImportStyle.xml
+++ b/xml/System.Web.Services.Description/ServiceDescriptionImportStyle.xml
@@ -28,7 +28,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionImportStyle_Client/CPP/servicedescriptionimportstyle_client.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionImportStyle/Overview/servicedescriptionimportstyle_client.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportStyle_Client/VB/servicedescriptionimportstyle_client.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportStyle/Overview/servicedescriptionimportstyle_client.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/ServiceDescriptionImportWarnings.xml b/xml/System.Web.Services.Description/ServiceDescriptionImportWarnings.xml
index cf50bdeb2e4..01e578c3d14 100644
--- a/xml/System.Web.Services.Description/ServiceDescriptionImportWarnings.xml
+++ b/xml/System.Web.Services.Description/ServiceDescriptionImportWarnings.xml
@@ -28,7 +28,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ServiceDescriptionImportWarnings_Enum/CPP/servicedescriptionimportwarnings_enum.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/ServiceDescriptionImportWarnings/Overview/servicedescriptionimportwarnings_enum.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ServiceDescriptionImportWarnings_Enum/VB/servicedescriptionimportwarnings_enum.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/ServiceDescriptionImportWarnings/Overview/servicedescriptionimportwarnings_enum.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/SoapAddressBinding.xml b/xml/System.Web.Services.Description/SoapAddressBinding.xml
index 78b7ddaee1e..12850103a26 100644
--- a/xml/System.Web.Services.Description/SoapAddressBinding.xml
+++ b/xml/System.Web.Services.Description/SoapAddressBinding.xml
@@ -47,7 +47,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapOperationBinding/CPP/soapoperationbinding.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/soapoperationbinding.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.vb" id="Snippet4":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/SoapBinding.xml b/xml/System.Web.Services.Description/SoapBinding.xml
index 1d230c5fc1b..2505da916d7 100644
--- a/xml/System.Web.Services.Description/SoapBinding.xml
+++ b/xml/System.Web.Services.Description/SoapBinding.xml
@@ -57,7 +57,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapOperationBinding/CPP/soapoperationbinding.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/soapoperationbinding.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -131,7 +131,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapOperationBinding/CPP/soapoperationbinding.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/soapoperationbinding.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -176,7 +176,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapBodyBinding_Parts/CPP/soapbodybinding_parts.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBinding/Namespace/soapbodybinding_parts.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/soapbodybinding_parts.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/soapbodybinding_parts.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -262,7 +262,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/CPP/soapprotocol.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBinding/Style/soapprotocol.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/soapprotocol.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/soapprotocol.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/SoapBindingStyle.xml b/xml/System.Web.Services.Description/SoapBindingStyle.xml
index 30f6a3b5a5e..7cd184852dc 100644
--- a/xml/System.Web.Services.Description/SoapBindingStyle.xml
+++ b/xml/System.Web.Services.Description/SoapBindingStyle.xml
@@ -40,7 +40,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/CPP/soapprotocol.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBinding/Style/soapprotocol.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/soapprotocol.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/soapprotocol.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Description/SoapBodyBinding.xml b/xml/System.Web.Services.Description/SoapBodyBinding.xml
index 4ad5ab59b12..ac1efa3a69a 100644
--- a/xml/System.Web.Services.Description/SoapBodyBinding.xml
+++ b/xml/System.Web.Services.Description/SoapBodyBinding.xml
@@ -49,7 +49,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapOperationBinding/CPP/soapoperationbinding.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/soapoperationbinding.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.vb" id="Snippet3":::  
   
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapBindingStyle_Rpc/CPP/soapbindingstyle_rpc.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBodyBinding/Encoding/soapbindingstyle_rpc.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapBindingStyle_Rpc/VB/soapbindingstyle_rpc.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/Encoding/soapbindingstyle_rpc.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -189,7 +189,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapBindingStyle_Rpc/CPP/soapbindingstyle_rpc.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBodyBinding/Encoding/soapbindingstyle_rpc.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapBindingStyle_Rpc/VB/soapbindingstyle_rpc.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/Encoding/soapbindingstyle_rpc.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -243,7 +243,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapBodyBinding_Parts/CPP/soapbodybinding_parts.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBinding/Namespace/soapbodybinding_parts.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapBodyBinding_Parts/VB/soapbodybinding_parts.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Namespace/soapbodybinding_parts.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -301,7 +301,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFaultBinding_ctor/CPP/soapfaultbinding_ctor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/soapfaultbinding_ctor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/SoapFaultBinding.xml b/xml/System.Web.Services.Description/SoapFaultBinding.xml
index 3d8d33de359..96f5169a97b 100644
--- a/xml/System.Web.Services.Description/SoapFaultBinding.xml
+++ b/xml/System.Web.Services.Description/SoapFaultBinding.xml
@@ -49,7 +49,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFaultBinding/CPP/soapfaultbinding.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapFaultBinding/Overview/soapfaultbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding/VB/soapfaultbinding.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapFaultBinding/Overview/soapfaultbinding.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFaultBinding_ctor/CPP/soapfaultbinding_ctor.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/soapfaultbinding_ctor.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -222,7 +222,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFaultBinding_ctor/CPP/soapfaultbinding_ctor.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/soapfaultbinding_ctor.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -273,7 +273,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapFaultBinding_ctor/CPP/soapfaultbinding_ctor.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapFaultBinding_ctor/VB/soapfaultbinding_ctor.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBodyBinding/PartsString/soapfaultbinding_ctor.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/SoapHeaderBinding.xml b/xml/System.Web.Services.Description/SoapHeaderBinding.xml
index 9097801e1d8..b3ed7334cca 100644
--- a/xml/System.Web.Services.Description/SoapHeaderBinding.xml
+++ b/xml/System.Web.Services.Description/SoapHeaderBinding.xml
@@ -47,7 +47,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderBinding/CPP/soapheaderbinding.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapHeaderBinding/Overview/soapheaderbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding/VB/soapheaderbinding.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Overview/soapheaderbinding.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -218,7 +218,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderBinding_MapToProperty/CPP/soapheaderbinding_maptoproperty.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapHeaderBinding/MapToProperty/soapheaderbinding_maptoproperty.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_MapToProperty/VB/soapheaderbinding_maptoproperty.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/MapToProperty/soapheaderbinding_maptoproperty.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -270,7 +270,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderBinding_Use/CPP/soapheaderbinding_use.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapHeaderBinding/Message/soapheaderbinding_use.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_Use/VB/soapheaderbinding_use.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Message/soapheaderbinding_use.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderBinding_Use/CPP/soapheaderbinding_use.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapHeaderBinding/Message/soapheaderbinding_use.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderBinding_Use/VB/soapheaderbinding_use.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapHeaderBinding/Message/soapheaderbinding_use.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Description/SoapOperationBinding.xml b/xml/System.Web.Services.Description/SoapOperationBinding.xml
index 1a6c289d6f4..8f3f9fc8829 100644
--- a/xml/System.Web.Services.Description/SoapOperationBinding.xml
+++ b/xml/System.Web.Services.Description/SoapOperationBinding.xml
@@ -49,7 +49,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapOperationBinding/CPP/soapoperationbinding.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapOperationBinding/VB/soapoperationbinding.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapAddressBinding/Overview/soapoperationbinding.vb" id="Snippet2":::  
   
  ]]></format>
     </remarks>
@@ -129,7 +129,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/CPP/soapprotocol.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Description/SoapBinding/Style/soapprotocol.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapBinding_SoapOperationBinding/VB/soapprotocol.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Description/SoapBinding/Style/soapprotocol.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/ContractReference.xml b/xml/System.Web.Services.Discovery/ContractReference.xml
index 9413fc36905..8ceaa343f3b 100644
--- a/xml/System.Web.Services.Discovery/ContractReference.xml
+++ b/xml/System.Web.Services.Discovery/ContractReference.xml
@@ -37,7 +37,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference/CPP/contractreference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/Overview/contractreference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference/VB/contractreference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Overview/contractreference.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -87,7 +87,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_Reference/CPP/contractreference_ref.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Reference/VB/contractreference_ref.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -130,7 +130,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_ctor1/CPP/contractreference_ctor1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ctor1/VB/contractreference_ctor1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -176,7 +176,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_ctor2/CPP/contractreference_ctor2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ctor2/VB/contractreference_ctor2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ctor2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_Contract/CPP/contractreference_contract.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/Contract/contractreference_contract.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Contract/VB/contractreference_contract.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/Contract/contractreference_contract.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -256,7 +256,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_DefaultFileName/CPP/contractreference_defaultfilename.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/DefaultFilename/contractreference_defaultfilename.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/contractreference_defaultfilename.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/contractreference_defaultfilename.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -306,7 +306,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_Reference/CPP/contractreference_ref.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Reference/VB/contractreference_ref.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -345,7 +345,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_Reference/CPP/contractreference_ref.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Reference/VB/contractreference_ref.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_ReadDocument/CPP/contractreference_readdocument.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/ReadDocument/contractreference_readdocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_ReadDocument/VB/contractreference_readdocument.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/ReadDocument/contractreference_readdocument.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_Reference/CPP/contractreference_ref.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_Reference/VB/contractreference_ref.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/.ctor/contractreference_ref.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -524,7 +524,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_DefaultFileName/CPP/contractreference_defaultfilename.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/DefaultFilename/contractreference_defaultfilename.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_DefaultFileName/VB/contractreference_defaultfilename.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/DefaultFilename/contractreference_defaultfilename.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -562,7 +562,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/ContractReference_WriteDocument/CPP/contractreference_writedocument.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/ContractReference/WriteDocument/contractreference_writedocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/ContractReference_WriteDocument/VB/contractreference_writedocument.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/ContractReference/WriteDocument/contractreference_writedocument.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.xml b/xml/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.xml
index 1794fbf0ad3..88d834a393b 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.xml
@@ -31,7 +31,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientDocumentCollection2/CPP/discoveryclientdocumentcollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Overview/discoveryclientdocumentcollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection2/VB/discoveryclientdocumentcollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Overview/discoveryclientdocumentcollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -91,7 +91,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/CPP/discoveryclientdocumentcollection_ctor.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/VB/discoveryclientdocumentcollection_ctor.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -134,7 +134,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/CPP/discoveryclientdocumentcollection_keys.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/VB/discoveryclientdocumentcollection_keys.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -175,7 +175,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/CPP/discoveryclientdocumentcollection_ctor.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/VB/discoveryclientdocumentcollection_ctor.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -211,7 +211,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/CPP/discoveryclientdocumentcollection_keys.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/VB/discoveryclientdocumentcollection_keys.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -249,7 +249,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/CPP/discoveryclientdocumentcollection_ctor.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_ctor/VB/discoveryclientdocumentcollection_ctor.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Add/discoveryclientdocumentcollection_ctor.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -286,7 +286,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/CPP/discoveryclientdocumentcollection_keys.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientDocumentCollection_Keys/VB/discoveryclientdocumentcollection_keys.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientDocumentCollection/Contains/discoveryclientdocumentcollection_keys.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile.xml b/xml/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile.xml
index 235df70ccce..0898352fc15 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile.xml
@@ -29,7 +29,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/CPP/discoveryclientresultsfile_results.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/discoveryclientresultsfile_results.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultsFile_Results/VB/discoveryclientresultsfile_results.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol+DiscoveryClientResultsFile/Overview/discoveryclientresultsfile_results.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryClientProtocol.xml b/xml/System.Web.Services.Discovery/DiscoveryClientProtocol.xml
index 61b0a9ea687..9c336b51f04 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryClientProtocol.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryClientProtocol.xml
@@ -96,7 +96,7 @@
 ## Examples
  [!code-cpp[DiscoveryClientProtocol_AdditionalInformation#1](~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientProtocol_AdditionalInformation/CPP/discoveryclientprotocol_additionalinformation.cpp#1)]
  [!code-csharp[DiscoveryClientProtocol_AdditionalInformation#1](~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientProtocol/AdditionalInformation/discoveryclientprotocol_additionalinformation.cs#1)]
- [!code-vb[DiscoveryClientProtocol_AdditionalInformation#1](~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_AdditionalInformation/VB/discoveryclientprotocol_additionalinformation.vb#1)]
+ [!code-vb[DiscoveryClientProtocol_AdditionalInformation#1](~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/AdditionalInformation/discoveryclientprotocol_additionalinformation.vb#1)]
 
  ]]></format>
         </remarks>
@@ -280,7 +280,7 @@
 ## Examples
  [!code-cpp[DiscoveryClientProtocol_Download#2](~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientProtocol_Download/CPP/discoveryclientprotocol_download.cpp#2)]
  [!code-csharp[DiscoveryClientProtocol_Download#2](~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download.cs#2)]
- [!code-vb[DiscoveryClientProtocol_Download#2](~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download/VB/discoveryclientprotocol_download.vb#2)]
+ [!code-vb[DiscoveryClientProtocol_Download#2](~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download.vb#2)]
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
 ## Examples
  [!code-cpp[DiscoveryClientProtocol_Download2#1](~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/CPP/discoveryclientprotocol_download.cpp#1)]
  [!code-csharp[DiscoveryClientProtocol_Download2#1](~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download1.cs#1)]
- [!code-vb[DiscoveryClientProtocol_Download2#1](~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Download2/VB/discoveryclientprotocol_download.vb#1)]
+ [!code-vb[DiscoveryClientProtocol_Download2#1](~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Download/discoveryclientprotocol_download1.vb#1)]
 
  ]]></format>
         </remarks>
@@ -357,7 +357,7 @@
 ## Examples
  [!code-cpp[DiscoveryClientProtocol_Errors#1](~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/CPP/discoveryclientprotocol_errors.cpp#1)]
  [!code-csharp[DiscoveryClientProtocol_Errors#1](~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/discoveryclientprotocol_errors.cs#1)]
- [!code-vb[DiscoveryClientProtocol_Errors#1](~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientProtocol_Errors/VB/discoveryclientprotocol_errors.vb#1)]
+ [!code-vb[DiscoveryClientProtocol_Errors#1](~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientProtocol/Errors/discoveryclientprotocol_errors.vb#1)]
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.xml b/xml/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.xml
index 19fe0e5b743..2c4cbcba1be 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.xml
@@ -29,7 +29,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientReferenceCollection/CPP/discoveryclientreferencecollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Overview/discoveryclientreferencecollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection/VB/discoveryclientreferencecollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Overview/discoveryclientreferencecollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -93,7 +93,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/CPP/discoveryclientreferencecollection_items.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/VB/discoveryclientreferencecollection_items.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -130,7 +130,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/CPP/discoveryclientreferencecollection_items.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/VB/discoveryclientreferencecollection_items.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -167,7 +167,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Keys/CPP/discoveryclientreferencecollection_keys.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Contains/discoveryclientreferencecollection_keys.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Keys/VB/discoveryclientreferencecollection_keys.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Contains/discoveryclientreferencecollection_keys.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -203,7 +203,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/CPP/discoveryclientreferencecollection_items.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/VB/discoveryclientreferencecollection_items.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -235,7 +235,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Keys/CPP/discoveryclientreferencecollection_keys.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Contains/discoveryclientreferencecollection_keys.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Keys/VB/discoveryclientreferencecollection_keys.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Contains/discoveryclientreferencecollection_keys.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -270,7 +270,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/CPP/discoveryclientreferencecollection_items.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientReferenceCollection_Items/VB/discoveryclientreferencecollection_items.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientReferenceCollection/Add/discoveryclientreferencecollection_items.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryClientResult.xml b/xml/System.Web.Services.Discovery/DiscoveryClientResult.xml
index d52eafae2c3..a57293aabb5 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryClientResult.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryClientResult.xml
@@ -31,7 +31,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult/CPP/discoveryclientresult.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/Overview/discoveryclientresult.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult/VB/discoveryclientresult.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/Overview/discoveryclientresult.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -69,7 +69,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_Filename/CPP/discoveryclientresult_filename.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -105,7 +105,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_ctor/CPP/discoveryclientresult_ctor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_ctor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_ctor/VB/discoveryclientresult_ctor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_ctor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -148,7 +148,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_Filename/CPP/discoveryclientresult_filename.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_Filename/CPP/discoveryclientresult_filename.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_Filename/CPP/discoveryclientresult_filename.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryClientResultCollection.xml b/xml/System.Web.Services.Discovery/DiscoveryClientResultCollection.xml
index f7070724f0d..403cc7a4fe6 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryClientResultCollection.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryClientResultCollection.xml
@@ -24,7 +24,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResultCollection/CPP/discoveryclientresultcollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResultCollection/Overview/discoveryclientresultcollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResultCollection/VB/discoveryclientresultcollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResultCollection/Overview/discoveryclientresultcollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_Filename/CPP/discoveryclientresult_filename.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -122,7 +122,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_Filename/CPP/discoveryclientresult_filename.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -166,7 +166,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryClientResult_Filename/CPP/discoveryclientresult_filename.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryClientResult_Filename/VB/discoveryclientresult_filename.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryClientResult/.ctor/discoveryclientresult_filename.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryDocument.xml b/xml/System.Web.Services.Discovery/DiscoveryDocument.xml
index be8381b0f93..a8a653addf8 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryDocument.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryDocument.xml
@@ -37,7 +37,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument/CPP/discoverydocument.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/Overview/discoverydocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument/VB/discoverydocument.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Overview/discoverydocument.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -96,7 +96,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/CPP/discoverydocument_discoverydocument.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/VB/discoverydocument_discoverydocument.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -135,7 +135,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/CPP/discoverydocument_discoverydocument.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/VB/discoverydocument_discoverydocument.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -211,7 +211,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_Write2/CPP/discoverydocument_write2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write2/VB/discoverydocument_write2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -250,7 +250,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/CPP/discoverydocument_discoverydocument.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/VB/discoverydocument_discoverydocument.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -296,7 +296,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/CPP/discoverydocument_discoverydocument.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_DiscoveryDocument/VB/discoverydocument_discoverydocument.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/CanRead/discoverydocument_discoverydocument.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_Write1/CPP/discoverydocument_write1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/Write/discoverydocument_write1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write1/VB/discoverydocument_write1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Write/discoverydocument_write1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_Write2/CPP/discoverydocument_write2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write2/VB/discoverydocument_write2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -420,7 +420,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocument_Write2/CPP/discoverydocument_write2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocument_Write2/VB/discoverydocument_write2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocument/Read/discoverydocument_write2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryDocumentReference.xml b/xml/System.Web.Services.Discovery/DiscoveryDocumentReference.xml
index 1997f338522..92ea1862c30 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryDocumentReference.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryDocumentReference.xml
@@ -35,7 +35,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/CPP/discoverydocumentreference_ctor_writedocument.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/VB/discoverydocumentreference_ctor_writedocument.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -76,7 +76,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/CPP/discoverydocumentreference_ctor_writedocument.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/VB/discoverydocumentreference_ctor_writedocument.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -108,7 +108,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/CPP/discoverydocumentreference_ctor_properties.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/discoverydocumentreference_ctor_properties.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -146,7 +146,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/CPP/discoverydocumentreference_ctor_properties.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/discoverydocumentreference_ctor_properties.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -188,7 +188,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/ddreference_document_resolveall.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_Document_ResolveAll/VB/ddreference_document_resolveall.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/ddreference_document_resolveall.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -231,7 +231,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ReadDocument/CPP/discoverydocumentreference_readdocument.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/ReadDocument/discoverydocumentreference_readdocument.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ReadDocument/VB/discoverydocumentreference_readdocument.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/ReadDocument/discoverydocumentreference_readdocument.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -278,7 +278,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/CPP/discoverydocumentreference_ctor_properties.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/discoverydocumentreference_ctor_properties.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
   
 ## Examples  
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/ddreference_document_resolveall.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_Document_ResolveAll/VB/ddreference_document_resolveall.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Document/ddreference_document_resolveall.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -395,7 +395,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/CPP/discoverydocumentreference_ctor_properties.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_Properties/VB/discoverydocumentreference_ctor_properties.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/.ctor/discoverydocumentreference_ctor_properties.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -432,7 +432,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/CPP/discoverydocumentreference_ctor_writedocument.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryDocumentReference_ctor_WriteDocument/VB/discoverydocumentreference_ctor_writedocument.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryDocumentReference/Overview/discoverydocumentreference_ctor_writedocument.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryExceptionDictionary.xml b/xml/System.Web.Services.Discovery/DiscoveryExceptionDictionary.xml
index ecc2de142cf..8009a9ac61b 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryExceptionDictionary.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryExceptionDictionary.xml
@@ -29,7 +29,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/CPP/discoveryexceptiondictionary_property_method.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -89,7 +89,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/CPP/discoveryexceptiondictionary_property_method.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -130,7 +130,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/CPP/discoveryexceptiondictionary_property_method.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -169,7 +169,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/CPP/discoveryexceptiondictionary_property_method.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -203,7 +203,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/CPP/discoveryexceptiondictionary_property_method.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -239,7 +239,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/CPP/discoveryexceptiondictionary_property_method.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/CPP/discoveryexceptiondictionary_property_method.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryExceptionDictionary_Property_Method/VB/discoveryexceptiondictionary_property_method.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryExceptionDictionary/Overview/discoveryexceptiondictionary_property_method.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryReference.xml b/xml/System.Web.Services.Discovery/DiscoveryReference.xml
index b2b6b3ccba8..7d29ff984d1 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryReference.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryReference.xml
@@ -29,7 +29,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReference1/CPP/discoveryreference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReference/Overview/discoveryreference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference1/VB/discoveryreference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/Overview/discoveryreference.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -89,7 +89,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReference/CPP/discoveryreference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference/VB/discoveryreference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -127,7 +127,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReference/CPP/discoveryreference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference/VB/discoveryreference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -200,7 +200,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReference/CPP/discoveryreference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference/VB/discoveryreference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -247,7 +247,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReference/CPP/discoveryreference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference/VB/discoveryreference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -321,7 +321,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReference/CPP/discoveryreference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReference/VB/discoveryreference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReference/ClientProtocol/discoveryreference.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/DiscoveryReferenceCollection.xml b/xml/System.Web.Services.Discovery/DiscoveryReferenceCollection.xml
index ebba22ca3da..23900aab9a7 100644
--- a/xml/System.Web.Services.Discovery/DiscoveryReferenceCollection.xml
+++ b/xml/System.Web.Services.Discovery/DiscoveryReferenceCollection.xml
@@ -24,7 +24,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReferenceCollection/CPP/discoveryreferencecollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReferenceCollection/VB/discoveryreferencecollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReferenceCollection/CPP/discoveryreferencecollection.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReferenceCollection/VB/discoveryreferencecollection.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -116,7 +116,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReferenceCollection/CPP/discoveryreferencecollection.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReferenceCollection/VB/discoveryreferencecollection.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -152,7 +152,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/DiscoveryReferenceCollection/CPP/discoveryreferencecollection.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/DiscoveryReferenceCollection/VB/discoveryreferencecollection.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/DiscoveryReferenceCollection/Overview/discoveryreferencecollection.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/SchemaReference.xml b/xml/System.Web.Services.Discovery/SchemaReference.xml
index 40c5019def6..70389c2a47a 100644
--- a/xml/System.Web.Services.Discovery/SchemaReference.xml
+++ b/xml/System.Web.Services.Discovery/SchemaReference.xml
@@ -37,7 +37,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -80,7 +80,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -112,7 +112,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -150,7 +150,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -186,7 +186,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -223,7 +223,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -269,7 +269,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -389,7 +389,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -432,7 +432,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -469,7 +469,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SchemaReference/CPP/schemareference.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaReference/VB/schemareference.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SchemaReference/Overview/schemareference.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Discovery/SoapBinding.xml b/xml/System.Web.Services.Discovery/SoapBinding.xml
index 9d8b840c503..f98b2b69dcb 100644
--- a/xml/System.Web.Services.Discovery/SoapBinding.xml
+++ b/xml/System.Web.Services.Discovery/SoapBinding.xml
@@ -35,7 +35,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Discovery_SoapBinding1/CPP/discovery_soapbinding.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Discovery_SoapBinding1/VB/discovery_soapbinding.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -92,7 +92,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Discovery_SoapBinding1/CPP/discovery_soapbinding.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Discovery_SoapBinding1/VB/discovery_soapbinding.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -130,7 +130,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Discovery_SoapBinding1/CPP/discovery_soapbinding.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Discovery_SoapBinding1/VB/discovery_soapbinding.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Discovery/SoapBinding/Overview/discovery_soapbinding.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/HttpGetClientProtocol.xml b/xml/System.Web.Services.Protocols/HttpGetClientProtocol.xml
index 95f9d66bc0b..cbfe52cc7b8 100644
--- a/xml/System.Web.Services.Protocols/HttpGetClientProtocol.xml
+++ b/xml/System.Web.Services.Protocols/HttpGetClientProtocol.xml
@@ -36,12 +36,12 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/source.vb" id="Snippet1":::
 
  The following example is the `Math` XML Web service, from which the above proxy class was created.
 
  :::code language="aspx-csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/sourcecs.asmx":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/VB/sourcevb.asmx":::
+ :::code language="aspx-vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/sourcevb.asmx":::
 
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpGetClientProtocol_Constructor/CPP/httpgetclientprotocol_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpGetClientProtocol/.ctor/httpgetclientprotocol_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpGetClientProtocol_Constructor/VB/httpgetclientprotocol_constructor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/.ctor/httpgetclientprotocol_constructor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/HttpMethodAttribute.xml b/xml/System.Web.Services.Protocols/HttpMethodAttribute.xml
index 2d98c74bb63..d94b4cfeffd 100644
--- a/xml/System.Web.Services.Protocols/HttpMethodAttribute.xml
+++ b/xml/System.Web.Services.Protocols/HttpMethodAttribute.xml
@@ -37,7 +37,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic HttpMethodAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpMethodAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpMethodAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpMethodAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -132,7 +132,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic HttpMethodAttribute.ReturnFormatter Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpMethodAttribute/ParameterFormatter/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpMethodAttribute.ReturnFormatter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpMethodAttribute/ParameterFormatter/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -171,7 +171,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic HttpMethodAttribute.ReturnFormatter Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpMethodAttribute/ParameterFormatter/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpMethodAttribute.ReturnFormatter Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpMethodAttribute/ParameterFormatter/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/HttpPostClientProtocol.xml b/xml/System.Web.Services.Protocols/HttpPostClientProtocol.xml
index 08a981a364e..9f517011694 100644
--- a/xml/System.Web.Services.Protocols/HttpPostClientProtocol.xml
+++ b/xml/System.Web.Services.Protocols/HttpPostClientProtocol.xml
@@ -36,12 +36,12 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic HttpPostClientProtocol Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpPostClientProtocol Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/source.vb" id="Snippet1":::
 
  The following example is the `Math` XML Web service, from which the previous proxy class was created.
 
  :::code language="aspx-csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/sourcecs.asmx":::
- :::code language="aspx-vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpPostClientProtocol Example/VB/sourcevb.asmx":::
+ :::code language="aspx-vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/Overview/sourcevb.asmx":::
 
  ]]></format>
     </remarks>
@@ -73,7 +73,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/HttpPostClientProtocol_Constructor/CPP/httppostclientprotocol_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/HttpPostClientProtocol/.ctor/httppostclientprotocol_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HttpPostClientProtocol_Constructor/VB/httppostclientprotocol_constructor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/HttpPostClientProtocol/.ctor/httppostclientprotocol_constructor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/HttpSimpleClientProtocol.xml b/xml/System.Web.Services.Protocols/HttpSimpleClientProtocol.xml
index 12edad4720f..efbbd87d388 100644
--- a/xml/System.Web.Services.Protocols/HttpSimpleClientProtocol.xml
+++ b/xml/System.Web.Services.Protocols/HttpSimpleClientProtocol.xml
@@ -40,13 +40,13 @@
   
  [!code-cpp[Classic HttpGetClientProtocol Example#1](~/snippets/cpp/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/CPP/source.cpp#1)]
  [!code-csharp[Classic HttpGetClientProtocol Example#1](~/snippets/csharp/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/source.cs#1)]
- [!code-vb[Classic HttpGetClientProtocol Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpGetClientProtocol Example/VB/source.vb#1)]  
+ [!code-vb[Classic HttpGetClientProtocol Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/HttpGetClientProtocol/Overview/source.vb#1)]  
   
  The following code example is the `Math` XML Web service, from which the preceding proxy class was created.  
   
  [!code-cpp[Classic HttpSimpleClientProtocol Example#1](~/snippets/cpp/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol Example/CPP/source.cpp#1)]
  [!code-csharp[Classic HttpSimpleClientProtocol Example#1](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/Overview/source.cs#1)]
- [!code-vb[Classic HttpSimpleClientProtocol Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol Example/VB/source.vb#1)]  
+ [!code-vb[Classic HttpSimpleClientProtocol Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Overview/source.vb#1)]  
   
  ]]></format>
     </remarks>
@@ -119,18 +119,18 @@
  The following code example is an ASP.NET Web Form, which calls an XML Web service named `Math`. Within the `EnterBtn_Click` function, the Web Form starts and completes an asynchronous invocation of the `Add` XML Web service method.  
   
  [!code-aspx-csharp[Classic HttpSimpleClientProtocol.EndInvoke Example#1](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcecs.asmx#1)]
- [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.aspx#1)]  
+ [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.aspx#1)]  
   
  The following code example is a proxy class generated by the Web Services Description Language tool (Wsdl.exe) for the `Math` XML Web service below. Within the `BeginAdd` method of the proxy class, the <xref:System.Web.Services.Protocols.SoapHttpClientProtocol.BeginInvoke%2A> method starts an asynchronous invocation of the `Add` XML Web service method.  
   
  [!code-cpp[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/cpp/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/CPP/source.cpp#2)]
  [!code-csharp[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/source.cs#2)]
- [!code-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/source.vb#2)]  
+ [!code-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/source.vb#2)]  
   
  The following code example is the `Math` XML Web service, from which the preceding proxy class was created.  
   
  [!code-aspx-csharp[Classic HttpSimpleClientProtocol.EndInvoke Example#3](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcecs.asmx)]
- [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#3](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.asmx)]
+ [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#3](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.asmx)]
   
  ]]></format>
         </remarks>
@@ -169,18 +169,18 @@
  The following code example is an ASP.NET Web Form, which calls an XML Web service named `Math`. Within the `EnterBtn_Click` function, the Web Form starts and completes an asynchronous invocation of the `Add` XML Web service method.  
   
  [!code-aspx-csharp[Classic HttpSimpleClientProtocol.EndInvoke Example#1](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcecs.asmx#1)]
- [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.aspx#1)]  
+ [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.aspx#1)]  
   
  The following code example is a proxy class generated by the Web Services Description Language tool (Wsdl.exe) for the `Math` XML Web service below. Within the `EndAdd` method of the proxy class, the <xref:System.Web.Services.Protocols.SoapHttpClientProtocol.EndInvoke%2A> method starts an asynchronous invocation of the `Add` XML Web service method.  
   
  [!code-cpp[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/cpp/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/CPP/source.cpp#2)]
  [!code-csharp[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/source.cs#2)]
- [!code-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/source.vb#2)]  
+ [!code-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/source.vb#2)]  
   
  The following code example is the `Math` XML Web service, from which the above proxy class was created.  
   
  [!code-aspx-csharp[Classic HttpSimpleClientProtocol.EndInvoke Example#3](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcecs.asmx)]
- [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#3](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpSimpleClientProtocol.EndInvoke Example/VB/sourcevb.asmx)]
+ [!code-aspx-vb[Classic HttpSimpleClientProtocol.EndInvoke Example#3](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/BeginInvoke/sourcevb.asmx)]
   
  ]]></format>
         </remarks>
@@ -228,18 +228,18 @@
  The following code example is an ASP.NET Web Form, which calls an XML Web service named `Math`. Within the `EnterBtn_Click` function, the Web Form synchronously invokes the `Add` XML Web service method.  
   
  [!code-csharp[HttpSimpleClientProtocol.Invoke Example#2](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcecs.asmx#2)]
- [!code-vb[HttpSimpleClientProtocol.Invoke Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/sourcevb.aspx#2)]  
+ [!code-vb[HttpSimpleClientProtocol.Invoke Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcevb.aspx#2)]  
   
  The following code example is a proxy class generated by the Web Services Description Language tool (Wsdl.exe) for the `Math` XML Web service below. Within the `Add` method of the proxy class, the <xref:System.Web.Services.Protocols.HttpSimpleClientProtocol.Invoke%2A> method synchronously invokes the `Add` Web Service method.  
   
  [!code-cpp[HttpSimpleClientProtocol.Invoke Example#1](~/snippets/cpp/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/CPP/source.cpp#1)]
  [!code-csharp[HttpSimpleClientProtocol.Invoke Example#1](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/source.cs#1)]
- [!code-vb[HttpSimpleClientProtocol.Invoke Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/source.vb#1)]  
+ [!code-vb[HttpSimpleClientProtocol.Invoke Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/source.vb#1)]  
   
  The following code example is the `Math` XML Web service, from which the above proxy class was created.  
   
  [!code-aspx-csharp[HttpSimpleClientProtocol.Invoke Example#3](~/snippets/csharp/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcecs.asmx)]
- [!code-aspx-vb[HttpSimpleClientProtocol.Invoke Example#3](~/snippets/visualbasic/VS_Snippets_Remoting/HttpSimpleClientProtocol.Invoke Example/VB/sourcevb.asmx)]  
+ [!code-aspx-vb[HttpSimpleClientProtocol.Invoke Example#3](~/snippets/visualbasic/System.Web.Services.Protocols/HttpSimpleClientProtocol/Invoke/sourcevb.asmx)]  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/HttpWebClientProtocol.xml b/xml/System.Web.Services.Protocols/HttpWebClientProtocol.xml
index b3e15c1f17a..a88693222bc 100644
--- a/xml/System.Web.Services.Protocols/HttpWebClientProtocol.xml
+++ b/xml/System.Web.Services.Protocols/HttpWebClientProtocol.xml
@@ -470,7 +470,7 @@
 
  [!code-cpp[Classic HttpWebClientProtocol.Proxy Example#1](~/snippets/cpp/VS_Snippets_Remoting/Classic HttpWebClientProtocol.Proxy Example/CPP/source.cpp#1)]
  [!code-csharp[Classic HttpWebClientProtocol.Proxy Example#1](~/snippets/csharp/System.Web.Services.Protocols/HttpWebClientProtocol/Proxy/source.cs#1)]
- [!code-vb[Classic HttpWebClientProtocol.Proxy Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic HttpWebClientProtocol.Proxy Example/VB/source.vb#1)]
+ [!code-vb[Classic HttpWebClientProtocol.Proxy Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/Proxy/source.vb#1)]
 
  ]]></format>
         </remarks>
@@ -562,7 +562,7 @@
 ## Examples
  [!code-cpp[HttpWebClientProtocol_UserAgent#1](~/snippets/cpp/VS_Snippets_Remoting/HttpWebClientProtocol_UserAgent/CPP/httpwebclientprotocol_useragent.cpp#1)]
  [!code-csharp[HttpWebClientProtocol_UserAgent#1](~/snippets/csharp/System.Web.Services.Protocols/HttpWebClientProtocol/UserAgent/httpwebclientprotocol_useragent.cs#1)]
- [!code-vb[HttpWebClientProtocol_UserAgent#1](~/snippets/visualbasic/VS_Snippets_Remoting/HttpWebClientProtocol_UserAgent/VB/httpwebclientprotocol_useragent.vb#1)]
+ [!code-vb[HttpWebClientProtocol_UserAgent#1](~/snippets/visualbasic/System.Web.Services.Protocols/HttpWebClientProtocol/UserAgent/httpwebclientprotocol_useragent.vb#1)]
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/LogicalMethodInfo.xml b/xml/System.Web.Services.Protocols/LogicalMethodInfo.xml
index 7394d67df02..0efd2c60960 100644
--- a/xml/System.Web.Services.Protocols/LogicalMethodInfo.xml
+++ b/xml/System.Web.Services.Protocols/LogicalMethodInfo.xml
@@ -59,7 +59,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/CPP/logicalmethodinfo_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -103,7 +103,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create2/CPP/logicalmethodinfo_create2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -146,7 +146,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create2/CPP/logicalmethodinfo_create2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -190,7 +190,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create2/CPP/logicalmethodinfo_create2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -236,7 +236,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/CPP/logicalmethodinfo_begininvoke.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/logicalmethodinfo_begininvoke.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/VB/logicalmethodinfo_begininvoke.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/logicalmethodinfo_begininvoke.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -271,7 +271,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create2/CPP/logicalmethodinfo_create2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -320,7 +320,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create1/CPP/logicalmethodinfo_create1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create1/VB/logicalmethodinfo_create1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -360,7 +360,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create2/CPP/logicalmethodinfo_create2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -394,7 +394,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/CPP/logicalmethodinfo_getcustomattribute.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -431,7 +431,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/CPP/logicalmethodinfo_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -469,7 +469,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/CPP/logicalmethodinfo_begininvoke.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/logicalmethodinfo_begininvoke.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_BeginInvoke/VB/logicalmethodinfo_begininvoke.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/BeginInvoke/logicalmethodinfo_begininvoke.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -504,7 +504,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create2/CPP/logicalmethodinfo_create2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -543,7 +543,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/CPP/logicalmethodinfo_getcustomattribute.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -580,7 +580,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/CPP/logicalmethodinfo_getcustomattribute.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -620,7 +620,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create1/CPP/logicalmethodinfo_create1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create1/VB/logicalmethodinfo_create1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -660,7 +660,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/CPP/logicalmethodinfo_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -697,7 +697,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create2/CPP/logicalmethodinfo_create2.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create2/VB/logicalmethodinfo_create2.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/AsyncCallbackParameter/logicalmethodinfo_create2.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -734,7 +734,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/CPP/logicalmethodinfo_isbeginmethod.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/logicalmethodinfo_isbeginmethod.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/VB/logicalmethodinfo_isbeginmethod.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/logicalmethodinfo_isbeginmethod.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -771,7 +771,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/CPP/logicalmethodinfo_isbeginmethod.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/logicalmethodinfo_isbeginmethod.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_IsBeginMethod/VB/logicalmethodinfo_isbeginmethod.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/IsBeginMethod/logicalmethodinfo_isbeginmethod.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -804,7 +804,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create1/CPP/logicalmethodinfo_create1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create1/VB/logicalmethodinfo_create1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -836,7 +836,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/CPP/logicalmethodinfo_getcustomattribute.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -871,7 +871,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create1/CPP/logicalmethodinfo_create1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create1/VB/logicalmethodinfo_create1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -908,7 +908,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Create1/CPP/logicalmethodinfo_create1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Create1/VB/logicalmethodinfo_create1.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/Create/logicalmethodinfo_create1.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -949,7 +949,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/CPP/logicalmethodinfo_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -983,7 +983,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/CPP/logicalmethodinfo_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -1015,7 +1015,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/CPP/logicalmethodinfo_getcustomattribute.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -1048,7 +1048,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/CPP/logicalmethodinfo_constructor.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_Constructor/VB/logicalmethodinfo_constructor.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/.ctor/logicalmethodinfo_constructor.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/LogicalMethodTypes.xml b/xml/System.Web.Services.Protocols/LogicalMethodTypes.xml
index 8363f27520a..1eda5122368 100644
--- a/xml/System.Web.Services.Protocols/LogicalMethodTypes.xml
+++ b/xml/System.Web.Services.Protocols/LogicalMethodTypes.xml
@@ -23,7 +23,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/CPP/logicalmethodinfo_getcustomattribute.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/LogicalMethodInfo_GetCustomAttribute/VB/logicalmethodinfo_getcustomattribute.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/LogicalMethodInfo/CustomAttributeProvider/logicalmethodinfo_getcustomattribute.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Protocols/MatchAttribute.xml b/xml/System.Web.Services.Protocols/MatchAttribute.xml
index 7f8f936bf18..97a6e4a4e72 100644
--- a/xml/System.Web.Services.Protocols/MatchAttribute.xml
+++ b/xml/System.Web.Services.Protocols/MatchAttribute.xml
@@ -36,7 +36,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MatchAttribute/CPP/SvcClient_MatchAttribute.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MatchAttribute/CPP/SvcClient_MatchAttribute.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -111,7 +111,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MatchAttribute/CPP/SvcClient_MatchAttribute.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -149,7 +149,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MatchAttribute/CPP/SvcClient_MatchAttribute.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -183,7 +183,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MatchAttribute/CPP/SvcClient_MatchAttribute.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -220,7 +220,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MatchAttribute/CPP/SvcClient_MatchAttribute.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -257,7 +257,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/MatchAttribute/CPP/SvcClient_MatchAttribute.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/MatchAttribute/VB/SvcClient_MatchAttribute.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/MatchAttribute/Overview/SvcClient_MatchAttribute.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapClientMessage.xml b/xml/System.Web.Services.Protocols/SoapClientMessage.xml
index 711badd331c..8d2ad0698ae 100644
--- a/xml/System.Web.Services.Protocols/SoapClientMessage.xml
+++ b/xml/System.Web.Services.Protocols/SoapClientMessage.xml
@@ -26,7 +26,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientMessage/CPP/SoapClientMessage.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -65,7 +65,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientMessage/CPP/SoapClientMessage.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -104,7 +104,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientMessage/CPP/SoapClientMessage.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -189,7 +189,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientMessage/CPP/SoapClientMessage.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -231,7 +231,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientMessage/CPP/SoapClientMessage.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -307,7 +307,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapClientMessage/CPP/SoapClientMessage.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapClientMessage/VB/soapclientmessage.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapClientMessage/Overview/soapclientmessage.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapExtension.xml b/xml/System.Web.Services.Protocols/SoapExtension.xml
index b169897a93c..7933ac9a7c9 100644
--- a/xml/System.Web.Services.Protocols/SoapExtension.xml
+++ b/xml/System.Web.Services.Protocols/SoapExtension.xml
@@ -33,7 +33,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapExtension Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapExtension/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -100,7 +100,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapExtension.ChainStream Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapExtension/ChainStream/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.ChainStream Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/ChainStream/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -161,7 +161,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapExtension.GetInitializer-Type/CPP/traceextension.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapExtension/GetInitializer/traceextension.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapExtension.GetInitializer-Type/VB/traceextension.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/GetInitializer/traceextension.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapExtension.GetInitializer Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapExtension/GetInitializer/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.GetInitializer Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/GetInitializer/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -266,7 +266,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapExtension.Initialize Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapExtension/Initialize/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.Initialize Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapExtension/Initialize/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapExtensionAttribute.xml b/xml/System.Web.Services.Protocols/SoapExtensionAttribute.xml
index c2b06d637f3..26f6f750721 100644
--- a/xml/System.Web.Services.Protocols/SoapExtensionAttribute.xml
+++ b/xml/System.Web.Services.Protocols/SoapExtensionAttribute.xml
@@ -31,7 +31,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapExtensionAttribute Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapExtensionAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtensionAttribute Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -91,7 +91,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapExtensionAttribute/CPP/SoapExtensionAttribute.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapExtensionAttribute/ExtensionType/soapextensionattribute.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapExtensionAttribute/VB/soapextensionattribute.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapExtensionAttribute/ExtensionType/soapextensionattribute.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapHeader.xml b/xml/System.Web.Services.Protocols/SoapHeader.xml
index 48d21558c64..accb7710f25 100644
--- a/xml/System.Web.Services.Protocols/SoapHeader.xml
+++ b/xml/System.Web.Services.Protocols/SoapHeader.xml
@@ -132,7 +132,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHeader.Actor Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeader/Actor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeader.Actor Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/Actor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeader_EncodedMustUnderstand/CPP/soapheader_encodedmustunderstand.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeader/EncodedMustUnderstand/soapheader_encodedmustunderstand.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeader_EncodedMustUnderstand/VB/soapheader_encodedmustunderstand.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/EncodedMustUnderstand/soapheader_encodedmustunderstand.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -386,7 +386,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHeader.MustUnderstand Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeader/MustUnderstand/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeader.MustUnderstand Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/MustUnderstand/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapHeaderAttribute.xml b/xml/System.Web.Services.Protocols/SoapHeaderAttribute.xml
index 84199f4463e..3c7cbc8499d 100644
--- a/xml/System.Web.Services.Protocols/SoapHeaderAttribute.xml
+++ b/xml/System.Web.Services.Protocols/SoapHeaderAttribute.xml
@@ -91,7 +91,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -125,7 +125,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -168,7 +168,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderAttribute.MemberName Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderAttribute/.ctor/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapHeaderCollection.xml b/xml/System.Web.Services.Protocols/SoapHeaderCollection.xml
index df7e5439d44..d582f4c63df 100644
--- a/xml/System.Web.Services.Protocols/SoapHeaderCollection.xml
+++ b/xml/System.Web.Services.Protocols/SoapHeaderCollection.xml
@@ -24,7 +24,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection/CPP/SoapHeaderCollection.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/soapheadercollection.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection/CPP/SoapHeaderCollection.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/soapheadercollection.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -122,7 +122,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection_Contains/CPP/SoapHeaderCollection_Contains.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/soapheadercollection_contains.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -162,7 +162,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection/CPP/SoapHeaderCollection.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/soapheadercollection.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
@@ -208,7 +208,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection_Contains/CPP/SoapHeaderCollection_Contains.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/soapheadercollection_contains.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -255,7 +255,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection/CPP/SoapHeaderCollection.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection/VB/soapheadercollection.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Overview/soapheadercollection.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -301,7 +301,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection_Contains/CPP/SoapHeaderCollection_Contains.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/soapheadercollection_contains.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -342,7 +342,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapHeaderCollection_Contains/CPP/SoapHeaderCollection_Contains.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapHeaderCollection_Contains/VB/soapheadercollection_contains.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderCollection/Contains/soapheadercollection_contains.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapHeaderDirection.xml b/xml/System.Web.Services.Protocols/SoapHeaderDirection.xml
index 5c12beeb6a2..1ca204dbe47 100644
--- a/xml/System.Web.Services.Protocols/SoapHeaderDirection.xml
+++ b/xml/System.Web.Services.Protocols/SoapHeaderDirection.xml
@@ -36,7 +36,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHeaderDirection Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeaderDirection/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeaderDirection Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeaderDirection/Overview/source.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapHeaderException.xml b/xml/System.Web.Services.Protocols/SoapHeaderException.xml
index 281692be3b3..cc9c4938f3d 100644
--- a/xml/System.Web.Services.Protocols/SoapHeaderException.xml
+++ b/xml/System.Web.Services.Protocols/SoapHeaderException.xml
@@ -42,7 +42,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHeader.MustUnderstand Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapHeader/MustUnderstand/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHeader.MustUnderstand Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapHeader/MustUnderstand/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapHttpClientProtocol.xml b/xml/System.Web.Services.Protocols/SoapHttpClientProtocol.xml
index 7f51dd38b0b..240634bc860 100644
--- a/xml/System.Web.Services.Protocols/SoapHttpClientProtocol.xml
+++ b/xml/System.Web.Services.Protocols/SoapHttpClientProtocol.xml
@@ -39,7 +39,7 @@
 
  [!code-cpp[Classic SoapHttpClientProtocol Example#1](~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHttpClientProtocol Example/CPP/source.cpp#1)]
  [!code-csharp[Classic SoapHttpClientProtocol Example#1](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/source.cs#1)]
- [!code-vb[Classic SoapHttpClientProtocol Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol Example/VB/source.vb#1)]
+ [!code-vb[Classic SoapHttpClientProtocol Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/source.vb#1)]
 
  The following code example is the `Math` XML Web service, from which the preceding proxy class was generated.
 
@@ -47,7 +47,7 @@
 > This example has a text box that accepts user input, which is a potential security threat. By default, ASP.NET Web pages validate that user input does not include script or HTML elements. For more information, see [Script Exploits Overview](https://learn.microsoft.com/previous-versions/aspnet/w1sw53ds(v=vs.100)).
 
  [!code-aspx-csharp[Classic SoapHttpClientProtocol Example#2](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/sourcecs.asmx)]
- [!code-aspx-vb[Classic SoapHttpClientProtocol Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol Example/VB/sourcevb.asmx)]
+ [!code-aspx-vb[Classic SoapHttpClientProtocol Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/sourcevb.asmx)]
 
 
  ]]></format>
@@ -129,12 +129,12 @@
 
  [!code-cpp[Classic SoapHttpClientProtocol.BeginInvoke Example#1](~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.BeginInvoke Example/CPP/source.cpp#1)]
  [!code-csharp[Classic SoapHttpClientProtocol.BeginInvoke Example#1](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/source.cs#1)]
- [!code-vb[Classic SoapHttpClientProtocol.BeginInvoke Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.BeginInvoke Example/VB/source.vb#1)]
+ [!code-vb[Classic SoapHttpClientProtocol.BeginInvoke Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/source.vb#1)]
 
  The following code example is the `Math` XML Web service, from which the preceding proxy class was created.
 
  [!code-aspx-csharp[Classic SoapHttpClientProtocol.BeginInvoke Example#2](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/BeginInvoke/sourcecs.asmx)]
- [!code-aspx-vb[Classic SoapHttpClientProtocol.BeginInvoke Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.BeginInvoke Example/VB/sourcevb.asmx)]
+ [!code-aspx-vb[Classic SoapHttpClientProtocol.BeginInvoke Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/sourcevb.asmx)]
 
  ]]></format>
         </remarks>
@@ -183,7 +183,7 @@
 
  [!code-cpp[SoapHttpClientProtocol.Discover Example#1](~/snippets/cpp/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/CPP/source.cpp#1)]
  [!code-csharp[SoapHttpClientProtocol.Discover Example#1](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/source.cs#1)]
- [!code-vb[SoapHttpClientProtocol.Discover Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/source.vb#1)]
+ [!code-vb[SoapHttpClientProtocol.Discover Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/source.vb#1)]
 
  The following code example is a Web Service client using the preceding proxy class. Within the `EnterBtn_Click` event of the Web Form, the XML Web service client calls the <xref:System.Web.Services.Protocols.SoapHttpClientProtocol.Discover%2A> method attempting to dynamically bind to the URL supplied by the user.
 
@@ -191,7 +191,7 @@
 > This example has a text box that accepts user input, which is a potential security threat. By default, ASP.NET Web pages validate that user input does not include script or HTML elements. For more information, see [Script Exploits Overview](https://learn.microsoft.com/previous-versions/aspnet/w1sw53ds(v=vs.100)).
 
  [!code-csharp[SoapHttpClientProtocol.Discover Example#2](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/sourcecs.aspx#2)]
- [!code-vb[SoapHttpClientProtocol.Discover Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/SoapHttpClientProtocol.Discover Example/VB/sourcevb.aspx#2)]
+ [!code-vb[SoapHttpClientProtocol.Discover Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Discover/sourcevb.aspx#2)]
 
  ]]></format>
         </remarks>
@@ -246,12 +246,12 @@ The proxy class does not have a binding defined.</exception>
 
  [!code-cpp[Classic SoapHttpClientProtocol.EndInvoke Example#1](~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.EndInvoke Example/CPP/source.cpp#1)]
  [!code-csharp[Classic SoapHttpClientProtocol.EndInvoke Example#1](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/source.cs#1)]
- [!code-vb[Classic SoapHttpClientProtocol.EndInvoke Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.EndInvoke Example/VB/source.vb#1)]
+ [!code-vb[Classic SoapHttpClientProtocol.EndInvoke Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/source.vb#1)]
 
  The following code example is the `Math` XML Web service, from which the preceding proxy class was created.
 
  [!code-aspx-csharp[Classic SoapHttpClientProtocol.EndInvoke Example#2](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/EndInvoke/sourcecs.asmx)]
- [!code-aspx-vb[Classic SoapHttpClientProtocol.EndInvoke Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.EndInvoke Example/VB/sourcevb.asmx)]
+ [!code-aspx-vb[Classic SoapHttpClientProtocol.EndInvoke Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/sourcevb.asmx)]
 
  ]]></format>
         </remarks>
@@ -404,12 +404,12 @@ The proxy class does not have a binding defined.</exception>
 
  [!code-cpp[Classic SoapHttpClientProtocol.Invoke Example#1](~/snippets/cpp/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.Invoke Example/CPP/source.cpp#1)]
  [!code-csharp[Classic SoapHttpClientProtocol.Invoke Example#1](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/source.cs#1)]
- [!code-vb[Classic SoapHttpClientProtocol.Invoke Example#1](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.Invoke Example/VB/source.vb#1)]
+ [!code-vb[Classic SoapHttpClientProtocol.Invoke Example#1](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/source.vb#1)]
 
  The following code example is the `Math` XML Web service, from which the preceding proxy class was created.
 
  [!code-aspx-csharp[Classic SoapHttpClientProtocol.Invoke Example#2](~/snippets/csharp/System.Web.Services.Protocols/SoapHttpClientProtocol/Invoke/sourcecs.asmx)]
- [!code-aspx-vb[Classic SoapHttpClientProtocol.Invoke Example#2](~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapHttpClientProtocol.Invoke Example/VB/sourcevb.asmx)]
+ [!code-aspx-vb[Classic SoapHttpClientProtocol.Invoke Example#2](~/snippets/visualbasic/System.Web.Services.Protocols/SoapHttpClientProtocol/Overview/sourcevb.asmx)]
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapMessage.xml b/xml/System.Web.Services.Protocols/SoapMessage.xml
index 2f7bc31da5b..3c71dffbc56 100644
--- a/xml/System.Web.Services.Protocols/SoapMessage.xml
+++ b/xml/System.Web.Services.Protocols/SoapMessage.xml
@@ -31,7 +31,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
@@ -68,7 +68,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -140,7 +140,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet3":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet3":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet3":::  
   
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapMessage.EnsureStage Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/EnsureStage/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapMessage.EnsureStage Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/EnsureStage/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -334,7 +334,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet6":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet6":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet6":::  
   
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet8":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet8":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet8":::  
   
  ]]></format>
         </remarks>
@@ -424,7 +424,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet9":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet9":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet9":::  
   
  ]]></format>
         </remarks>
@@ -498,7 +498,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet7":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet7":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet7":::  
   
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet4":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet4":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet4":::  
   
  ]]></format>
         </remarks>
@@ -620,7 +620,7 @@
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic SoapExtension.ProcessMessage Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Stage/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic SoapExtension.ProcessMessage Example/VB/source.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stage/source.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -661,7 +661,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage_Headers/CPP/SoapMessage_Headers.cpp" id="Snippet2":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Stream/soapmessage_headers.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage_Headers/VB/soapmessage_headers.vb" id="Snippet2":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Stream/soapmessage_headers.vb" id="Snippet2":::  
   
  ]]></format>
         </remarks>
@@ -698,7 +698,7 @@
 ## Examples  
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessage/CPP/SoapMessage.cpp" id="Snippet5":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessage/VB/soapmessage.vb" id="Snippet5":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessage/Overview/soapmessage.vb" id="Snippet5":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Web.Services.Protocols/SoapMessageStage.xml b/xml/System.Web.Services.Protocols/SoapMessageStage.xml
index 4c6f2105735..8dcfbf76f47 100644
--- a/xml/System.Web.Services.Protocols/SoapMessageStage.xml
+++ b/xml/System.Web.Services.Protocols/SoapMessageStage.xml
@@ -39,7 +39,7 @@ The following example is a fragment of a SOAP extension, which implements the <x
   
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/SoapMessageState/CPP/SoapMessageState.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/SoapMessageStage/Overview/soapmessagestate.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapMessageState/VB/soapmessagestate.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/SoapMessageStage/Overview/soapmessagestate.vb" id="Snippet1":::  
   
  ]]></format>
     </remarks>
diff --git a/xml/System.Web.Services.Protocols/WebClientProtocol.xml b/xml/System.Web.Services.Protocols/WebClientProtocol.xml
index a9f3a2f8333..772e2f578ac 100644
--- a/xml/System.Web.Services.Protocols/WebClientProtocol.xml
+++ b/xml/System.Web.Services.Protocols/WebClientProtocol.xml
@@ -73,7 +73,7 @@
 ## Examples
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/System.Web.Services.Protocols.WebClientProtocol constructor/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/WebClientProtocol/.ctor/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/System.Web.Services.Protocols.WebClientProtocol constructor/VB/class1.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/.ctor/class1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -514,7 +514,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic WebClientProtocol.Timeout Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/WebClientProtocol/Timeout/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic WebClientProtocol.Timeout Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/Timeout/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -574,7 +574,7 @@
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Remoting/Classic WebClientProtocol.Url Example/CPP/source.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Web.Services.Protocols/WebClientProtocol/Url/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic WebClientProtocol.Url Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Web.Services.Protocols/WebClientProtocol/Url/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml b/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml
index 9b1375d5f9e..d49f11895d2 100644
--- a/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml
+++ b/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml
@@ -174,7 +174,7 @@
  The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType%28System.String%2CSystem.String%2CSystem.Xml.Schema.XmlSchemaObject%2CSystem.Xml.Serialization.XmlSchemas%2CSystem.Xml.Serialization.XmlSchemaImporter%2CSystem.CodeDom.CodeCompileUnit%2CSystem.CodeDom.CodeNamespace%2CSystem.Xml.Serialization.CodeGenerationOptions%2CSystem.CodeDom.Compiler.CodeDomProvider%29> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaImporterExtensionExample/VB/SchemaImporterExtensionExample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -224,7 +224,7 @@
  The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType%28System.String%2CSystem.String%2CSystem.Xml.Schema.XmlSchemaObject%2CSystem.Xml.Serialization.XmlSchemas%2CSystem.Xml.Serialization.XmlSchemaImporter%2CSystem.CodeDom.CodeCompileUnit%2CSystem.CodeDom.CodeNamespace%2CSystem.Xml.Serialization.CodeGenerationOptions%2CSystem.CodeDom.Compiler.CodeDomProvider%29> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaImporterExtensionExample/VB/SchemaImporterExtensionExample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
@@ -281,7 +281,7 @@
  The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType%28System.String%2CSystem.String%2CSystem.Xml.Schema.XmlSchemaObject%2CSystem.Xml.Serialization.XmlSchemas%2CSystem.Xml.Serialization.XmlSchemaImporter%2CSystem.CodeDom.CodeCompileUnit%2CSystem.CodeDom.CodeNamespace%2CSystem.Xml.Serialization.CodeGenerationOptions%2CSystem.CodeDom.Compiler.CodeDomProvider%29> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.  
   
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SchemaImporterExtensionExample/VB/SchemaImporterExtensionExample.vb" id="Snippet1":::  
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::  
   
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapAttributeAttribute.xml b/xml/System.Xml.Serialization/SoapAttributeAttribute.xml
index 2371659a662..12d2bed59a6 100644
--- a/xml/System.Xml.Serialization/SoapAttributeAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapAttributeAttribute.xml
@@ -74,7 +74,7 @@
  The following example serializes a class that contains several fields to which a <xref:System.Xml.Serialization.SoapAttributeAttribute> is applied.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribute/VB/soapattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -145,7 +145,7 @@
  The following example creates a new <xref:System.Xml.Serialization.SoapAttributeAttribute> that is used to override the serialization of a field. After creating a <xref:System.Xml.Serialization.SoapAttributeAttribute> and setting its properties, the object is set to the <xref:System.Xml.Serialization.SoapAttributes.SoapAttribute%2A> property of a <xref:System.Xml.Serialization.SoapAttributes>. The <xref:System.Xml.Serialization.SoapAttributes> is then added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeAttribute/.ctor/soapattributeex2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeAttributeEx2/VB/soapattributeex2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/.ctor/soapattributeex2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -209,7 +209,7 @@
  The following example serializes a class that contains several fields to which a <xref:System.Xml.Serialization.SoapAttributeAttribute> is applied.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribute/VB/soapattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -271,7 +271,7 @@
  The following example serializes a class that contains several fields to which the <xref:System.Xml.Serialization.SoapAttributeAttribute> is applied. The <xref:System.Xml.Serialization.SoapAttributeAttribute.AttributeName%2A> property is set for the `Today` field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribute/VB/soapattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -392,7 +392,7 @@
  The following example serializes a class that contains several fields to which a <xref:System.Xml.Serialization.SoapAttributeAttribute> is applied. The <xref:System.Xml.Serialization.SoapAttributeAttribute.DataType%2A> property is set for the `GroupNumber` and the `Today` fields.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribute/VB/soapattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -466,7 +466,7 @@
  The following example serializes a class that contains several fields to which a <xref:System.Xml.Serialization.SoapAttributeAttribute> is applied. The <xref:System.Xml.Serialization.SoapAttributeAttribute.Namespace%2A> property is set for the `GroupName` the field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribute/VB/soapattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeAttribute/Overview/soapattribute.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapAttributeOverrides.xml b/xml/System.Xml.Serialization/SoapAttributeOverrides.xml
index c593354fc2e..b7d7076ebfe 100644
--- a/xml/System.Xml.Serialization/SoapAttributeOverrides.xml
+++ b/xml/System.Xml.Serialization/SoapAttributeOverrides.xml
@@ -81,7 +81,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -133,7 +133,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -287,7 +287,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@
  The following example creates a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to override the serialization of an instance of the `Group` class. The example also uses the <xref:System.Xml.Serialization.SoapAttributeOverrides.Item%2A> property to retrieve the <xref:System.Xml.Serialization.SoapAttributes> that is used to specify how the serialization is being overridden.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeOverrides.Item property 2/VB/attadd2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -435,7 +435,7 @@
  The following example creates a <xref:System.Xml.Serialization.SoapAttributeOverrides> used to override the serialization of an instance of the `Group` class. The example also uses the <xref:System.Xml.Serialization.SoapAttributeOverrides.Item%2A> property to retrieve the <xref:System.Xml.Serialization.SoapAttributes> that is used to specify how the serialization is being overridden.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributeOverrides.Item property 1/VB/attadd.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Item/attadd.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapAttributes.xml b/xml/System.Xml.Serialization/SoapAttributes.xml
index a2ed22130e9..198e76edd30 100644
--- a/xml/System.Xml.Serialization/SoapAttributes.xml
+++ b/xml/System.Xml.Serialization/SoapAttributes.xml
@@ -65,7 +65,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -136,7 +136,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -249,7 +249,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
  The following example serializes a class named `Group` that includes a field named `GroupName`. The default value is set with the <xref:System.ComponentModel.DefaultValueAttribute> to ".NET". By either not setting the field, or by setting it to ".NET", the value is not serialized (because the default value is already known). The sample also overrides the default value in the `CreateOverrideSerializer` method, which is called by the `SerializeOverride` method. The example calls both methods, `SerializeOriginal` and `SerializeOverride`, and sets the same value (".NET") for the `GroupName` field. Because of the override, the value is serialized only when calling the `SerializeOverride` method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapDefaultValue/defvalue.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttribues.SoapDefaultValue/VB/defvalue.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapDefaultValue/defvalue.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -391,7 +391,7 @@
  The following example serializes a class named `Transportation`. The serialization of the `Vehicle` field is overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -463,7 +463,7 @@
  The following example serializes two classes named `Food` and `FoodType`. The `FoodType` class contains two enumerations that are overridden, and for each enumeration, the example creates a <xref:System.Xml.Serialization.SoapEnumAttribute> that it assigns to the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum%2A> property of a <xref:System.Xml.Serialization.SoapAttributes>. The example then adds the <xref:System.Xml.Serialization.SoapAttributes> to a <xref:System.Xml.Serialization.SoapAttributeOverrides>, which is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapEnumOverrides/VB/soapenumoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -537,7 +537,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -607,7 +607,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapElementAttribute.xml b/xml/System.Xml.Serialization/SoapElementAttribute.xml
index cb05d575bd6..510a8a05cae 100644
--- a/xml/System.Xml.Serialization/SoapElementAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapElementAttribute.xml
@@ -71,7 +71,7 @@
  The following example serializes an instance of a class named `Transportation` that contains a field named `Vehicle`. A <xref:System.Xml.Serialization.SoapElementAttribute> is applied to the field. When the field is serialized, the XML element name is "Wheels" instead of "Vehicle". The `SerializeOverride` method creates a <xref:System.Xml.Serialization.SoapElementAttribute> and sets the <xref:System.Xml.Serialization.SoapAttributes.SoapElement%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapElementAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlTypeMapping>. An <xref:System.Xml.Serialization.XmlSerializer> is constructed with the <xref:System.Xml.Serialization.XmlTypeMapping>, and an instance of the `Transportation` class is again serialized. Because the <xref:System.Xml.Serialization.SoapElementAttribute> is used to override the serialization, the generated XML element name is now "Truck" instead of "Wheels".
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -134,7 +134,7 @@
  The following example serializes an instance of a class named `Transportation` that contains a field named `Vehicle`. A <xref:System.Xml.Serialization.SoapElementAttribute> is applied to the field. When the field is serialized, the XML element name is "Wheels" instead of "Vehicle". The `SerializeOverride` method creates a <xref:System.Xml.Serialization.SoapElementAttribute> and sets the <xref:System.Xml.Serialization.SoapAttributes.SoapElement%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapElementAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlTypeMapping>. An <xref:System.Xml.Serialization.XmlSerializer> is constructed with the <xref:System.Xml.Serialization.XmlTypeMapping>, and an instance of the `Transportation` class is again serialized. Because the <xref:System.Xml.Serialization.SoapElementAttribute> is used to override the serialization, the generated XML element name is now "Truck" instead of "Wheels".
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  The following example serializes an instance of a class named `Transportation` that contains a field named `Vehicle`. A <xref:System.Xml.Serialization.SoapElementAttribute> is applied to the field. When the field is serialized, the XML element name is "Wheels" instead of "Vehicle". The `SerializeOverride` method creates a <xref:System.Xml.Serialization.SoapElementAttribute> and sets the <xref:System.Xml.Serialization.SoapAttributes.SoapElement%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapElementAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlTypeMapping>. An <xref:System.Xml.Serialization.XmlSerializer> is constructed with the <xref:System.Xml.Serialization.XmlTypeMapping>, and an instance of the `Transportation` class is again serialized. Because the <xref:System.Xml.Serialization.SoapElementAttribute> is used to override the serialization, the generated XML element name is now "Truck" instead of "Wheels".
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -313,7 +313,7 @@
  The following example serializes an instance of a class named `Transportation` that contains a field named `Vehicle`. A <xref:System.Xml.Serialization.SoapElementAttribute> is applied to the field. When the field is serialized, the XML element name is "Wheels" instead of "Vehicle". The `SerializeOverride` method creates a <xref:System.Xml.Serialization.SoapElementAttribute> and sets the <xref:System.Xml.Serialization.SoapAttributes.SoapElement%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapElementAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlTypeMapping>. An <xref:System.Xml.Serialization.XmlSerializer> is constructed with the <xref:System.Xml.Serialization.XmlTypeMapping>, and an instance of the `Transportation` class is again serialized. Because the <xref:System.Xml.Serialization.SoapElementAttribute> is used to override the serialization, the generated XML element name is now "Truck" instead of "Wheels".
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
  The following example serializes an instance of a class named `Transportation` that contains a field named `Vehicle`. A <xref:System.Xml.Serialization.SoapElementAttribute> is applied to the field. When the field is serialized, the XML element name is "Wheels" instead of "Vehicle". The `SerializeOverride` method creates a <xref:System.Xml.Serialization.SoapElementAttribute> and sets the <xref:System.Xml.Serialization.SoapAttributes.SoapElement%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapElementAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlTypeMapping>. An <xref:System.Xml.Serialization.XmlSerializer> is constructed with the <xref:System.Xml.Serialization.XmlTypeMapping>, and an instance of the `Transportation` class is again serialized. Because the <xref:System.Xml.Serialization.SoapElementAttribute> is used to override the serialization, the generated XML element name is now "Truck" instead of "Wheels".
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapEnumAttribute.xml b/xml/System.Xml.Serialization/SoapEnumAttribute.xml
index 4e62bcefc71..d69c68bc645 100644
--- a/xml/System.Xml.Serialization/SoapEnumAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapEnumAttribute.xml
@@ -78,7 +78,7 @@
  The following example uses the <xref:System.Xml.Serialization.XmlSerializer> to serialize a class named `Food` that includes an enumeration named `FoodType`. The `FoodType` enumeration is overridden by creating a <xref:System.Xml.Serialization.SoapEnumAttribute> for each enumeration and setting the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapEnumAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapEnumOverrides/VB/soapenumoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -149,7 +149,7 @@
  The following example uses the <xref:System.Xml.Serialization.XmlSerializer> to serialize a class named `Food` that includes an enumeration named `FoodType`. The `FoodType` enumeration is overridden by creating a <xref:System.Xml.Serialization.SoapEnumAttribute> for each enumeration and setting the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapEnumAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapEnumOverrides/VB/soapenumoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
  The following example uses the <xref:System.Xml.Serialization.XmlSerializer> to serialize a class named `Food` that includes an enumeration named `FoodType`. The `FoodType` enumeration is overridden by creating a <xref:System.Xml.Serialization.SoapEnumAttribute> for each enumeration and setting the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapEnumAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapEnumOverrides/VB/soapenumoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -279,7 +279,7 @@
  The following example uses the <xref:System.Xml.Serialization.XmlSerializer> to serialize a class named `Food` that includes an enumeration named `FoodType`. The `FoodType` enumeration is overridden by creating a <xref:System.Xml.Serialization.SoapEnumAttribute> for each enumeration and setting the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapEnumAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapEnumOverrides/VB/soapenumoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapEnum/soapenumoverrides.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml b/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml
index b169ba0b6c9..c4421080995 100644
--- a/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml
@@ -70,7 +70,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -123,7 +123,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapReflectionImporter.xml b/xml/System.Xml.Serialization/SoapReflectionImporter.xml
index 64661fd9b44..074968c6265 100644
--- a/xml/System.Xml.Serialization/SoapReflectionImporter.xml
+++ b/xml/System.Xml.Serialization/SoapReflectionImporter.xml
@@ -61,7 +61,7 @@
  The following example serializes a class named `Group`. The serialization of the `GroupName` and `IgnoreThis` fields and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. An <xref:System.Xml.Serialization.XmlTypeMapping> is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides>, and that <xref:System.Xml.Serialization.XmlTypeMapping> is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml.Serialization/SoapTypeAttribute.xml b/xml/System.Xml.Serialization/SoapTypeAttribute.xml
index 628f3c51f6a..fb0af40cbcf 100644
--- a/xml/System.Xml.Serialization/SoapTypeAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapTypeAttribute.xml
@@ -73,7 +73,7 @@
  The following example serializes a class named `Group`. The <xref:System.Xml.Serialization.SoapTypeAttribute> is applied to the class, with the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> set to "SoapGroupType". The <xref:System.Xml.Serialization.SoapTypeAttribute> is also overridden, changing the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> to "Team". Both versions are serialized, resulting in two files: SoapType.xml and SoapType2.xml.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
  The following example serializes a class named `Group`. The <xref:System.Xml.Serialization.SoapTypeAttribute> is applied to the class with the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> set to "SoapGroupType". The <xref:System.Xml.Serialization.SoapTypeAttribute> is also overridden, changing the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> to "Team". Both versions are serialized, resulting in two files: SoapType.xml and SoapType2.xml.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -192,7 +192,7 @@
  The following example serializes a class named `Group`. The <xref:System.Xml.Serialization.SoapTypeAttribute> is applied to the class with the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> set to "SoapGroupType". The <xref:System.Xml.Serialization.SoapTypeAttribute> is also overridden, changing the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> to "Team". Both versions are serialized, resulting in two files: SoapType.xml and SoapType2.xml.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -253,7 +253,7 @@
  The following example serializes a class named `Group`. The <xref:System.Xml.Serialization.SoapTypeAttribute> is applied to the class with the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> set to "SoapGroupType". The <xref:System.Xml.Serialization.SoapTypeAttribute> is also overridden, changing the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> to "Team". Both versions are serialized, resulting in two files: SoapType.xml and SoapType2.xml.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -320,7 +320,7 @@
  The following example serializes a class named `Group`. The <xref:System.Xml.Serialization.SoapTypeAttribute> is applied to the class with the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> set to "SoapGroupType". The <xref:System.Xml.Serialization.SoapTypeAttribute> is also overridden, changing the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> to "Team". Both versions are serialized, resulting in two files: SoapType.xml and SoapType2.xml.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -387,7 +387,7 @@
  The following example serializes a class named `Group`. The <xref:System.Xml.Serialization.SoapTypeAttribute> is applied to the class with the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> set to "SoapGroupType". The <xref:System.Xml.Serialization.SoapTypeAttribute> is also overridden, changing the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> to "Team". Both versions are serialized, resulting in two files: SoapType.xml and SoapType2.xml.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -453,7 +453,7 @@
  The following example serializes a class named `Group`. The <xref:System.Xml.Serialization.SoapTypeAttribute> is applied to the class with the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> set to "SoapGroupType". The <xref:System.Xml.Serialization.SoapTypeAttribute> is also overridden, changing the <xref:System.Xml.Serialization.SoapTypeAttribute.TypeName%2A> to "Team". Both versions are serialized, resulting in two files: SoapType.xml and SoapType2.xml.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapTypeAttribute Example/VB/soaptype.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapTypeAttribute/Overview/soaptype.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml b/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml
index dce71fba80c..949858ac446 100644
--- a/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml
+++ b/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml
@@ -76,7 +76,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -149,7 +149,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -227,7 +227,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -305,7 +305,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml b/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml
index f05d8e09765..da2eba80264 100644
--- a/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml
+++ b/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml
@@ -86,7 +86,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml b/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml
index 5057e7ba332..56ba36097f0 100644
--- a/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml
@@ -102,7 +102,7 @@ GroupType = 'Technical' GroupNumber = '42' GroupBase = 'Red'>
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyAttributeAttribute/Overview/anyattribute.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAnyAttributeAttribute Example/VB/anyattribute.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyAttributeAttribute/Overview/anyattribute.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -177,7 +177,7 @@ GroupType = 'Technical' GroupNumber = '42' GroupBase = 'Red'>
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyAttributeAttribute/.ctor/anyattover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAnyAttributeAttribute_ctor Example/VB/anyattover.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyAttributeAttribute/.ctor/anyattover.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml b/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml
index 78bd53c8035..db6650cbb45 100644
--- a/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml
@@ -103,7 +103,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlAnyElementAttribute> to a field named `AllElements` that returns an array of <xref:System.Xml.XmlElement> objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyElementAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAnyElementAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -354,7 +354,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyElementAttribute/Name/anyelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAnyElementAttribute Example/VB/anyelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttribute/Name/anyelement.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyElementAttribute/Name/anyelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAnyElementAttribute Example/VB/anyelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttribute/Name/anyelement.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml b/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml
index 36b2b3f3f9a..f91702d1bc4 100644
--- a/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml
+++ b/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml
@@ -102,7 +102,7 @@
  The following example creates a new <xref:System.Xml.Serialization.XmlAnyElementAttribute> and adds it to the collection of objects accessed through the <xref:System.Xml.Serialization.XmlAttributes.XmlAnyElements%2A> property. The <xref:System.Xml.Serialization.XmlAttributes> is then added to a <xref:System.Xml.Serialization.XmlAttributeOverrides>, which is used to create an <xref:System.Xml.Serialization.XmlSerializer>. The <xref:System.Xml.Serialization.XmlSerializer> is used to serialize or deserialize an object. To see the effect of using the <xref:System.Xml.Serialization.XmlAnyElementAttributes> property, create an XML document named UnknownElements.xml by running the `SerializeObject` method in the `Main` method. Edit the resulting document to include other (unknown) elements. Comment out the `SerializeObject` call in the `Main` method, and uncomment the call to the `DeserializeObject` method, which prints out the name and value of any unknown XML element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.XmlAnyElements/VB/xmlanyover.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -209,7 +209,7 @@
  The following example creates a new <xref:System.Xml.Serialization.XmlAnyElementAttribute> and adds it to the collection of objects accessed through the <xref:System.Xml.Serialization.XmlAttributes.XmlAnyElements%2A> property. The <xref:System.Xml.Serialization.XmlAttributes> is then added to an <xref:System.Xml.Serialization.XmlAttributeOverrides>, which is used to create an <xref:System.Xml.Serialization.XmlSerializer>. The <xref:System.Xml.Serialization.XmlSerializer> is used to serialize or deserialize an object. To see the effect of using the <xref:System.Xml.Serialization.XmlAnyElementAttributes> property, create an XML document named UnknownElements.xml by running the `SerializeObject` method in the `Main` method. Edit the resulting document to include other (unknown) elements. Comment out the `SerializeObject` call in the `Main` method, and uncomment the call to the `DeserializeObject` method, which prints out the name and value of any unknown XML element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.XmlAnyElements/VB/xmlanyover.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlArrayAttribute.xml b/xml/System.Xml.Serialization/XmlArrayAttribute.xml
index 845c874c165..dd40909f1c9 100644
--- a/xml/System.Xml.Serialization/XmlArrayAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlArrayAttribute.xml
@@ -85,7 +85,7 @@
  The following example serializes a class instance into an XML document that contains several object arrays. The <xref:System.Xml.Serialization.XmlArrayAttribute> is applied to the members that become XML element arrays.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -160,7 +160,7 @@
  The following example assigns the <xref:System.Xml.Serialization.XmlArrayAttribute> to two arrays.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.XmlArrayAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -223,7 +223,7 @@
  The following example assigns the <xref:System.Xml.Serialization.XmlArrayAttribute> to two arrays, and serializes a class instance that contains those arrays.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayAttribute/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.XmlArrayAttribute1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/.ctor/source1.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlArrayAttribute.XmlArrayAttribute1 Example/Common/MyClass1.xml" id="Snippet1":::
 
  ]]></format>
@@ -298,7 +298,7 @@
  The following example serializes an instance of the `Library` class that contains a property named `Books` that returns an array of `Book` items. The example uses the <xref:System.Xml.Serialization.XmlArrayAttribute.ElementName%2A> property to specify that the array of XML elements should be named `My_Books` rather than `Books`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayAttribute/ElementName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.ElementName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/ElementName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@ attributeFormDefault="unqualified"... >
  The following example serializes an instance of the `Enterprises` class. Two XML elements have the same local name (`Company`) but different prefixes. The example sets the <xref:System.Xml.Serialization.XmlArrayAttribute.Form%2A> property is set to `XmlForm.Qualified` to ensure that the qualified names occur in the XML instance.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayAttribute/Form/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.Form Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Form/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -471,7 +471,7 @@ attributeFormDefault="unqualified"... >
  The following example contains two arrays: one with the <xref:System.Xml.Serialization.XmlArrayAttribute.IsNullable%2A> property set to `true`, and another with the <xref:System.Xml.Serialization.XmlArrayAttribute.IsNullable%2A> property set to `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayAttribute/IsNullable/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.IsNullable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/IsNullable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -544,7 +544,7 @@ attributeFormDefault="unqualified"... >
  The following example serializes an instance of the `Library` class that contains two members, one that contain book titles, and another that contain periodical titles. Although both XML elements are named `Titles`, each contains a different prefix. The example also includes an instance of the <xref:System.Xml.Serialization.XmlSerializerNamespaces> class that contains the namespaces and prefixes used to qualify the two element names.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayAttribute/Namespace/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayAttribute.Namespace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayAttribute/Namespace/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlArrayItemAttribute.xml b/xml/System.Xml.Serialization/XmlArrayItemAttribute.xml
index c1805187430..7bf766ca69e 100644
--- a/xml/System.Xml.Serialization/XmlArrayItemAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlArrayItemAttribute.xml
@@ -87,7 +87,7 @@
  The following example serializes a class named `Group` that contains a field named `Employees` that returns an array of `Employee` objects. The example applies the <xref:System.Xml.Serialization.XmlArrayItemAttribute> to the field, thereby instructing the <xref:System.Xml.Serialization.XmlSerializer> that it can insert objects of both the base class (`Employee`) type and derived class type (`Manager`) into the serialized array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -164,7 +164,7 @@
  The following example serializes a class named `Transportation` that contains a field named `MyVehicles` that returns an array of `Vehicle` objects. The example applies the <xref:System.Xml.Serialization.XmlArrayItemAttribute> to the field, allowing the <xref:System.Xml.Serialization.XmlSerializer> to insert instances of the `Car` class, which is derived from the `Vehicle` class, into the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -235,7 +235,7 @@
  The following example serializes a class named `Transportation` that contains a field named `MyVehicles` that returns an array of `Vehicle` objects. The example applies the <xref:System.Xml.Serialization.XmlArrayItemAttribute> to the field, allowing the <xref:System.Xml.Serialization.XmlSerializer> to insert instances of the `Car` class, which is derived from the `Vehicle` class, into the array. While applying the attribute, the example sets the <xref:System.Xml.Serialization.XmlArrayItemAttribute.ElementName%2A> property using the `elementName` parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -297,7 +297,7 @@
  The following example serializes a class named `Transportation` that contains a field named `MyVehicles` that returns an array of `Vehicle` objects. The example applies the <xref:System.Xml.Serialization.XmlArrayItemAttribute> to the field, allowing the <xref:System.Xml.Serialization.XmlSerializer> to insert instances of the `Car` class, which is derived from the `Vehicle` class, into the array. While applying the attribute, the example sets the <xref:System.Xml.Serialization.XmlArrayItemAttribute.Type%2A> property using the `type` parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -370,7 +370,7 @@
  The following example serializes a class named `Transportation` that contains a field named `MyVehicles` that returns an array of `Vehicle` objects. The example applies the <xref:System.Xml.Serialization.XmlArrayItemAttribute> to the field, allowing the <xref:System.Xml.Serialization.XmlSerializer> to insert instances of the `Car` class, which is derived from the `Vehicle` class, into the array. While applying the attribute, the example sets the <xref:System.Xml.Serialization.XmlArrayItemAttribute.ElementName%2A> property using the `elementName` parameter, and the <xref:System.Xml.Serialization.XmlArrayItemAttribute.Type%2A> property using the `type` parameter.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.XmlArrayItemAttribute3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -499,7 +499,7 @@
  The following example serializes a class named `PurchaseOrder`. Several instances of the <xref:System.Xml.Serialization.XmlArrayItemAttribute> class are applied to three members, and the <xref:System.Xml.Serialization.XmlArrayItemAttribute.DataType%2A> property for each instance is set to a type allowed in the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/DataType/arrayitem.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlArrayItemAttribute Example/VB/arrayitem.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/DataType/arrayitem.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -571,7 +571,7 @@
  The following example sets the <xref:System.Xml.Serialization.XmlArrayItemAttribute.ElementName%2A> property for the `Vehicle` and `Car` class--thereby changing the names of XML elements that the <xref:System.Xml.Serialization.XmlSerializer> generates for those classes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/ElementName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.ElementName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/ElementName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -653,7 +653,7 @@ attributeFormDefault="unqualified">
  The following example sets the <xref:System.Xml.Serialization.XmlArrayItemAttribute.Form%2A> property for the `Vehicle` class to `XmlSchemaForm.Unqualified`, and the <xref:System.Xml.Serialization.XmlArrayItemAttribute.Form%2A> property for the `Car` class to `XmlSchemaForm.Qualified`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/Form/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Form Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Form/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -732,7 +732,7 @@ attributeFormDefault="unqualified">
  The following example serializes a class named `Group`, which contains a field named `Employees` that returns an array of `Employee` objects. A second class named `Manager` derives from `Employee`. An <xref:System.Xml.Serialization.XmlArrayItemAttribute> specifies that the <xref:System.Xml.Serialization.XmlSerializer> can insert both `Employee` and `Manager` objects into the array. The example sets the <xref:System.Xml.Serialization.XmlArrayItemAttribute.IsNullable%2A> property, thereby telling the <xref:System.Xml.Serialization.XmlSerializer> not to generate the `xsi:nil` attribute objects in the array set to `null`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/IsNullable/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.IsNullable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/IsNullable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -805,7 +805,7 @@ attributeFormDefault="unqualified">
  The following example applies an <xref:System.Xml.Serialization.XmlArrayItemAttribute> and sets the <xref:System.Xml.Serialization.XmlArrayItemAttribute.Namespace%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/Namespace/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Namespace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Namespace/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1008,7 +1008,7 @@ public class Arrays{
  The following example serializes an array of objects. The field that returns the array is attributed with two <xref:System.Xml.Serialization.XmlArrayItemAttribute> instances. Each instance instructs the <xref:System.Xml.Serialization.XmlSerializer> to accept the specified <xref:System.Xml.Serialization.XmlArrayItemAttribute.Type%2A> in the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlArrayItemAttribute/Type/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlArrayItemAttribute.Type Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlArrayItemAttribute/Type/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAttributeAttribute.xml b/xml/System.Xml.Serialization/XmlAttributeAttribute.xml
index 03c4ca3424b..6b82c09216e 100644
--- a/xml/System.Xml.Serialization/XmlAttributeAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlAttributeAttribute.xml
@@ -113,7 +113,7 @@
  The following example serializes a class that contains several fields to which the <xref:System.Xml.Serialization.XmlAttributeAttribute> is applied.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -180,7 +180,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeAttribute/.ctor/xmlattributeattribute_ctr1_2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XMLAttributeAttribute_ctr1_2/VB/xmlattributeattribute_ctr1_2.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/.ctor/xmlattributeattribute_ctr1_2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -243,7 +243,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeAttribute/.ctor/xmlattributeattribute_ctr1_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XMLAttributeAttribute_ctr1_2/VB/xmlattributeattribute_ctr1_2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/.ctor/xmlattributeattribute_ctr1_2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -428,7 +428,7 @@
  The following example sets the <xref:System.Xml.Serialization.XmlAttributeAttribute.AttributeName%2A> property of an <xref:System.Xml.Serialization.XmlAttributeAttribute>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeAttribute/AttributeName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.AttributeName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/AttributeName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -561,7 +561,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlAttributeAttribute> to two members, and sets the <xref:System.Xml.Serialization.XmlAttributeAttribute.DataType%2A> property set to different values.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeAttribute/DataType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.DataType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/DataType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -648,7 +648,7 @@ attributeFormDefault="unqualified"... >
  The following example applies the <xref:System.Xml.Serialization.XmlAttributeAttribute> to two fields contained in a class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeAttribute/Form/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.Form Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Form/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -724,7 +724,7 @@ attributeFormDefault="unqualified"... >
  The following example applies the <xref:System.Xml.Serialization.XmlAttributeAttribute> to two fields contained in a class. The example sets the <xref:System.Xml.Serialization.XmlAttributeAttribute.Namespace%2A> property for each attribute to a value different from the member identifier.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeAttribute/Namespace/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeAttribute.Namespace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeAttribute/Namespace/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml b/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml
index 9f60d700c33..ca0e70b78a4 100644
--- a/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml
+++ b/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml
@@ -70,7 +70,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -135,7 +135,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -241,7 +241,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -305,7 +305,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -367,7 +367,7 @@
  The following example prints the value returned by the <xref:System.Object.ToString%2A> method when the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method encounters an unknown attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/ObjectBeingDeserialized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeEventArgs.ObjectBeingDeserialized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/ObjectBeingDeserialized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml b/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml
index f6f32f211c9..e30d1d542aa 100644
--- a/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml
+++ b/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml
@@ -80,7 +80,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAttributeOverrides.xml b/xml/System.Xml.Serialization/XmlAttributeOverrides.xml
index c5386f35a2b..bbe8421728d 100644
--- a/xml/System.Xml.Serialization/XmlAttributeOverrides.xml
+++ b/xml/System.Xml.Serialization/XmlAttributeOverrides.xml
@@ -86,7 +86,7 @@
  The following example serializes a class named `Orchestra`, which contains a single field named `Instruments` that returns an array of `Instrument` objects. A second class named `Brass` inherits from the `Instrument` class. The example uses an instance of the <xref:System.Xml.Serialization.XmlAttributeOverrides> class to override the `Instrument` field, allowing the field to accept `Brass` objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeOverrides/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -213,7 +213,7 @@
  The following example serializes a class named `Band`, which is derived from a class named `Orchestra`. The example creates an <xref:System.Xml.Serialization.XmlRootAttribute> object, and assigns it to the <xref:System.Xml.Serialization.XmlAttributes.XmlRoot%2A> property of an <xref:System.Xml.Serialization.XmlAttributes> object. The example then calls the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> method to add the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeOverrides/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -292,7 +292,7 @@
  The following example creates an <xref:System.Xml.Serialization.XmlAttributeAttribute> object, and assigns it to the <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute%2A> property of an <xref:System.Xml.Serialization.XmlAttributes> object. The example then adds the <xref:System.Xml.Serialization.XmlAttributes> object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, before creating an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeOverrides/Add/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.Add1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Add/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -377,7 +377,7 @@
  The following example creates an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, an <xref:System.Xml.Serialization.XmlAttributes> object, and an <xref:System.Xml.Serialization.XmlRootAttribute> object. The example assigns the <xref:System.Xml.Serialization.XmlRootAttribute> to the <xref:System.Xml.Serialization.XmlAttributes.XmlRoot%2A> property of the <xref:System.Xml.Serialization.XmlAttributes> object, and adds the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. Lastly, the example gets the <xref:System.Xml.Serialization.XmlAttributes> object by passing the <xref:System.Type> of the serialized class to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. In this example, the <xref:System.Type> is `Group`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeOverrides/Item/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.this Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Item/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@
  The following example creates an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, an <xref:System.Xml.Serialization.XmlAttributes>, and an <xref:System.Xml.Serialization.XmlAttributeAttribute> object. The example assigns the <xref:System.Xml.Serialization.XmlAttributeAttribute> to the <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute%2A> property of the <xref:System.Xml.Serialization.XmlAttributes> object and adds the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. Lastly, the example gets the <xref:System.Xml.Serialization.XmlAttributes> object by passing the <xref:System.Type> of the serialized class and member name to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeOverrides/Item/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributeOverrides.this1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Item/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAttributes.xml b/xml/System.Xml.Serialization/XmlAttributes.xml
index edcc29756e1..bf6a940eea8 100644
--- a/xml/System.Xml.Serialization/XmlAttributes.xml
+++ b/xml/System.Xml.Serialization/XmlAttributes.xml
@@ -70,7 +70,7 @@
  The following example serializes an instance of a class named `Orchestra`, which contains a single field named `Instruments` that returns an array of `Instrument` objects. A second class named `Brass` inherits from the `Instrument` class. The example creates an <xref:System.Xml.Serialization.XmlAttributes> object to override the `Instrument` field--allowing the field to accept `Brass` objects--and adds the <xref:System.Xml.Serialization.XmlAttributes> object to an instance of the <xref:System.Xml.Serialization.XmlAttributeOverrides> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -138,7 +138,7 @@
  The following example serializes an instance of a class named `Orchestra`, which contains a single field named `Instruments` that returns an array of `Instrument` objects. A second class named `Brass` inherits from the `Instrument` class. The example creates an <xref:System.Xml.Serialization.XmlAttributes> object to override the `Instrument` field--allowing the field to accept `Brass` objects--and adds the <xref:System.Xml.Serialization.XmlAttributes> object to an instance of the <xref:System.Xml.Serialization.XmlAttributeOverrides> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -324,7 +324,7 @@
  The following example creates a new <xref:System.Xml.Serialization.XmlAnyElementAttribute> object and adds it to the collection of objects accessed through the <xref:System.Xml.Serialization.XmlAttributes.XmlAnyElements%2A> property. The <xref:System.Xml.Serialization.XmlAttributes> object is then added to a <xref:System.Xml.Serialization.XmlAttributeOverrides> object which is used to create an <xref:System.Xml.Serialization.XmlSerializer> object. The <xref:System.Xml.Serialization.XmlSerializer> is used to serialize or deserialize an object. To see the effect of using the <xref:System.Xml.Serialization.XmlAnyElementAttributes> property, create an XML document named "UnknownElements.xml" by running the `SerializeObject` method in the `Main` method. Edit the resulting document to include other (unknown) elements. Comment out the `SerializeObject` call in the `Main` method, and uncomment the call to the `DeserializeObject` method, which prints out the name and value of any unknown XML element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.XmlAnyElements/VB/xmlanyover.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAnyElementAttributes/Overview/xmlanyover.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -402,7 +402,7 @@
  The following example serializes a class that contains a field named `Members` that returns an array of objects. The <xref:System.Xml.Serialization.XmlArrayAttribute> is used to override the serialization of the field, and rename the element name to `Staff`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlArray/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlArray Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlArray/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -470,7 +470,7 @@
  The following example serializes a class that contains a field named `Members` that returns an array of objects. Two <xref:System.Xml.Serialization.XmlArrayItemAttribute> objects are created to allow the field to accept objects that derive from the base class named `Member`. Each object is added to the <xref:System.Xml.Serialization.XmlAttributes> through the <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlArrayItems/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlArrayItems Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlArrayItems/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -541,7 +541,7 @@
  The following example serializes a class named `Group` that contains a property named `GroupName`; the `GroupName` property is serialized as an XML attribute. The example creates an <xref:System.Xml.Serialization.XmlAttributeOverrides> and an <xref:System.Xml.Serialization.XmlAttributes> object to override the default serialization of the field. The example then creates an <xref:System.Xml.Serialization.XmlAttributeAttribute> to specifically override the property, and the object is set to the <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute%2A> property The <xref:System.Xml.Serialization.XmlAttributes> object is added to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object with the name of the overridden member specified. Finally, an <xref:System.Xml.Serialization.XmlSerializer> is constructed and returned using the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlAttribute/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlAttribute/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -683,7 +683,7 @@
  The following example shows a class named `Pet` that contains a field that has a default value set to "Dog". However, the example also creates an <xref:System.Xml.Serialization.XmlAttributes> object, and sets its <xref:System.Xml.Serialization.XmlAttributes.XmlDefaultValue%2A> property to a new default value ("Cat"). This overrides the original default value. Thus, if the field value is set to "Cat", the <xref:System.Xml.Serialization.XmlSerializer> treats it as the default value, and not serialize it. If it is set to any other value, the <xref:System.Xml.Serialization.XmlSerializer> serializes the value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlDefaultValue/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlDefaultValue Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlDefaultValue/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -751,7 +751,7 @@
  The following example serializes the `Transportation` class, which contains a single field named `Vehicles` that returns an <xref:System.Collections.ArrayList>. The example applies two <xref:System.Xml.Serialization.XmlElementAttribute> attributes to the `Vehicles` field. The example creates two <xref:System.Xml.Serialization.XmlElementAttribute> objects and adds them to the <xref:System.Xml.Serialization.XmlElementAttributes> collection of an <xref:System.Xml.Serialization.XmlAttributes> object. To allow the array to accept different object types, the <xref:System.Xml.Serialization.XmlAttributes> object is added to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlElements/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlElements Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlElements/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -820,7 +820,7 @@
  The following example serializes two classes named `Food` and `FoodType`. The `FoodType` class contains two enumerations that are overridden and, for each enumeration, the example creates an <xref:System.Xml.Serialization.XmlEnumAttribute> object that it assigns to the <xref:System.Xml.Serialization.XmlAttributes.XmlEnum%2A> property of an <xref:System.Xml.Serialization.XmlAttributes> object. The example then adds the <xref:System.Xml.Serialization.XmlAttributes> object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, which is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlEnum/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlEnum Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlEnum/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -893,7 +893,7 @@
  The following example serializes a class named `Group`, which contains a member named `Comment` to which the <xref:System.Xml.Serialization.XmlIgnoreAttribute> is applied. The example creates an <xref:System.Xml.Serialization.XmlAttributes> object, and sets the <xref:System.Xml.Serialization.XmlAttributes.XmlIgnore%2A> property to `false`, thereby overriding the <xref:System.Xml.Serialization.XmlIgnoreAttribute>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlIgnore/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlIgnore Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlIgnore/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -960,7 +960,7 @@
  The following example contains a class named `Student`. The class contains a member named `MyNamespaces` that returns an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object. The example creates an <xref:System.Xml.Serialization.XmlAttributes> object that is added to an instance of the <xref:System.Xml.Serialization.XmlAttributeOverrides> class. The <xref:System.Xml.Serialization.XmlAttributes.Xmlns%2A> property is set to `true`, which instructs the <xref:System.Xml.Serialization.XmlSerializer> to preserve the namespaces when the serialization of the `Student` object is overridden.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/Xmlns/xmlns.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlAttributes.Xmlns property example/VB/xmlns.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/Xmlns/xmlns.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1026,7 +1026,7 @@
  The following example creates an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, an <xref:System.Xml.Serialization.XmlAttributes> object, and an <xref:System.Xml.Serialization.XmlRootAttribute> object. The example assigns the <xref:System.Xml.Serialization.XmlRootAttribute> to the <xref:System.Xml.Serialization.XmlAttributes.XmlRoot%2A> property of the <xref:System.Xml.Serialization.XmlAttributes> object, and adds the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. Lastly, the example gets the <xref:System.Xml.Serialization.XmlAttributes> object by passing the <xref:System.Type> of the serialized class to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. (In this example, the <xref:System.Type> is `Group`.)
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlRoot/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlRoot Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlRoot/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1100,7 +1100,7 @@
  The following example serializes the class named `Group`, which contains a field named `Comment`. To override the default way the <xref:System.Xml.Serialization.XmlSerializer> serializes the field, the example creates an <xref:System.Xml.Serialization.XmlAttributeOverrides> and an <xref:System.Xml.Serialization.XmlAttributes> object. The example then creates an <xref:System.Xml.Serialization.XmlTextAttribute> object, which it assigns to the <xref:System.Xml.Serialization.XmlAttributes.XmlText%2A> property, and adds the <xref:System.Xml.Serialization.XmlAttributes> object (with the name of the field to be serialized as XML text) to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. Lastly the example creates an <xref:System.Xml.Serialization.XmlSerializer> using the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlText/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlText Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlText/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1169,7 +1169,7 @@
  The following example creates an <xref:System.Xml.Serialization.XmlTypeAttribute> object, and assigns it to the <xref:System.Xml.Serialization.XmlAttributes.XmlType%2A> property of an <xref:System.Xml.Serialization.XmlAttributes> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributes/XmlType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlAttributes.XmlType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributes/XmlType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlChoiceIdentifierAttribute.xml b/xml/System.Xml.Serialization/XmlChoiceIdentifierAttribute.xml
index 3835a711151..d07bb5e29d1 100644
--- a/xml/System.Xml.Serialization/XmlChoiceIdentifierAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlChoiceIdentifierAttribute.xml
@@ -165,7 +165,7 @@ public enum ItemsChoiceType {
  The following example serializes a class named `Choices` that includes two fields, `MyChoice` and `ManyChoices`. The <xref:System.Xml.Serialization.XmlChoiceIdentifierAttribute> is applied to each field that specifies (through the <xref:System.Xml.Serialization.XmlChoiceIdentifierAttribute.MemberName%2A> property) another class member that gets or sets an enumeration that detects the member value. The `MyChoice` field can be set to a single value, with a corresponding enumeration member found in the `EnumType` field. The `ManyChoices` field returns an array of objects. The `ChoiceArray` field returns an array of enumeration values. For each array member in the `ManyChoices` field, a corresponding member is found in the array returned by the `ChoiceArray` field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlChoiceIdentifierAttribute Example/VB/choice.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -238,7 +238,7 @@ public enum ItemsChoiceType {
  The following example serializes a class named `Choices` that includes two fields, `MyChoice` and `ManyChoices`. The <xref:System.Xml.Serialization.XmlChoiceIdentifierAttribute> is applied to each field that specifies (through the <xref:System.Xml.Serialization.XmlChoiceIdentifierAttribute.MemberName%2A> property) another class member that gets or sets an enumeration that detects the member value. The `MyChoice` field can be set to a single value, with a corresponding enumeration member found in the `EnumType` field. The `ManyChoices` field returns an array of objects. The `ChoiceArray` field returns an array of enumeration values. For each array member in the `ManyChoices` field, a corresponding member is found in the array returned by the `ChoiceArray` field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlChoiceIdentifierAttribute Example/VB/choice.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@ public enum ItemsChoiceType {
  The following example serializes a class named `Choices` that includes two fields, `MyChoice` and `ManyChoices`. The <xref:System.Xml.Serialization.XmlChoiceIdentifierAttribute> is applied to each field that specifies (through the <xref:System.Xml.Serialization.XmlChoiceIdentifierAttribute.MemberName%2A> property) another class member that gets or sets an enumeration that detects the member value. The `MyChoice` field can be set to a single value, with a corresponding enumeration member found in the `EnumType` field. The `ManyChoices` field returns an array of objects. The `ChoiceArray` field returns an array of enumeration values. For each array member in the `ManyChoices` field, a corresponding member is found in the array returned by the `ChoiceArray` field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlChoiceIdentifierAttribute Example/VB/choice.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlChoiceIdentifierAttribute/Overview/choice.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlElementAttribute.xml b/xml/System.Xml.Serialization/XmlElementAttribute.xml
index bc4693ae13b..68e6baf1fda 100644
--- a/xml/System.Xml.Serialization/XmlElementAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlElementAttribute.xml
@@ -123,7 +123,7 @@ public class Things{
  The following example serializes a class named `Group` and applies the <xref:System.Xml.Serialization.XmlElementAttribute> to several of its members. The field named `Employees` returns an array of `Employee` objects. In this case, the <xref:System.Xml.Serialization.XmlElementAttribute> specifies that the resulting XML will not be nested (which is the default behavior of items in an array).
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -198,7 +198,7 @@ public class Things{
  The following example applies the <xref:System.Xml.Serialization.XmlElementAttribute> to a class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -262,7 +262,7 @@ public class Things{
  The following example shows a simple class that contains a single field named `Vehicles`. The example applies the <xref:System.Xml.Serialization.XmlElementAttribute> to the field and includes the `elementName` parameter, thereby instructing the <xref:System.Xml.Serialization.XmlSerializer> to generate XML elements named "Cars" rather than "Vehicles".
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -326,7 +326,7 @@ public class Things{
  The following example serializes a class named `Orchestra` that contains a single field named `Instruments`, which returns an array of `Instrument` objects. A second class named `Brass` inherits from the `Instrument` class. The example applies the <xref:System.Xml.Serialization.XmlElementAttribute> to the `Instruments` field, and specifies the `Brass` type, allowing the `Instruments` field to accept `Brass` objects. The example also specifies the name of the XML element by setting the <xref:System.Xml.Serialization.XmlElementAttribute.ElementName%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/.ctor/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -394,7 +394,7 @@ public class Things{
  The following example serializes a class named `Orchestra` that contains a single field named `Instruments`, which returns an array of `Instrument` objects. A second class named `Brass` inherits from the `Instrument` class. The example applies the <xref:System.Xml.Serialization.XmlElementAttribute> to the `Instruments` field, and specifies the `Brass` type, allowing the `Instruments` field to accept `Brass` objects. The example also specifies the name of the XML element by setting the <xref:System.Xml.Serialization.XmlElementAttribute.ElementName%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/.ctor/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.XmlElementAttribute2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -526,7 +526,7 @@ public class Things{
  The following example serializes a class named `Group` that contains a field named `ExtraInfo`, which returns an <xref:System.Collections.ArrayList>. The example applies two instances of the <xref:System.Xml.Serialization.XmlElementAttribute> to the field and specifies different <xref:System.Xml.Serialization.XmlElementAttribute.DataType%2A> values for each instance. Each instance enables the <xref:System.Xml.Serialization.XmlSerializer> to serialize the specified types inserted into the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/DataType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.DataType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/DataType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -602,7 +602,7 @@ public class Things{
  The following example sets the <xref:System.Xml.Serialization.XmlElementAttribute.ElementName%2A> property of an <xref:System.Xml.Serialization.XmlElementAttribute> to a new value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/ElementName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.ElementName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/ElementName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -688,7 +688,7 @@ attributeFormDefault="unqualified"... >
  The following example sets the <xref:System.Xml.Serialization.XmlElementAttribute.Form%2A> property to `XmlSchemaForm.Unqualified`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/Form/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.Form Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Form/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -769,7 +769,7 @@ attributeFormDefault="unqualified"... >
  The following example shows a field with the <xref:System.Xml.Serialization.XmlElementAttribute> applied to it, and the <xref:System.Xml.Serialization.XmlElementAttribute.IsNullable%2A> property set to `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/IsNullable/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.IsNullable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/IsNullable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -976,7 +976,7 @@ attributeFormDefault="unqualified"... >
  The following example uses the <xref:System.Xml.Serialization.XmlElementAttribute.Type%2A> property to specify a derived object for an <xref:System.Xml.Serialization.XmlElementAttribute>. The example also applies three instances of the <xref:System.Xml.Serialization.XmlElementAttribute> to a field that returns an <xref:System.Collections.ArrayList>. Each instance specifies a type allowed in the field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttribute/Type/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttribute.Type Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttribute/Type/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlElementAttributes.xml b/xml/System.Xml.Serialization/XmlElementAttributes.xml
index 17a9070436f..535b473bfd0 100644
--- a/xml/System.Xml.Serialization/XmlElementAttributes.xml
+++ b/xml/System.Xml.Serialization/XmlElementAttributes.xml
@@ -84,7 +84,7 @@
  The following example serializes the `Transportation` class, which contains a single field named `Vehicles` that returns an <xref:System.Collections.ArrayList>. The example first applies two instances of the <xref:System.Xml.Serialization.XmlElementAttribute> class to the `Vehicles` field that specifies the types of objects the <xref:System.Xml.Serialization.XmlSerializer> inserts into the array. The example then creates two <xref:System.Xml.Serialization.XmlElementAttribute> objects to override the behavior of the attributes applied to the `Vehicles` property. The two overriding objects are added to the <xref:System.Xml.Serialization.XmlElementAttributes> collection of an <xref:System.Xml.Serialization.XmlAttributes>. Lastly, the example adds the <xref:System.Xml.Serialization.XmlAttributes> to an <xref:System.Xml.Serialization.XmlAttributeOverrides>, allowing the <xref:System.Xml.Serialization.XmlSerializer> to insert the new object types into the <xref:System.Collections.ArrayList> returned by the `Vehicles` field.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttributes/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttributes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttributes/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -197,7 +197,7 @@
  The following example creates two <xref:System.Xml.Serialization.XmlElementAttribute> objects and calls the <xref:System.Xml.Serialization.XmlElementAttributes.Add%2A> method to add them to an <xref:System.Xml.Serialization.XmlElementAttributes>. The example then adds the <xref:System.Xml.Serialization.XmlElementAttributes> to an <xref:System.Xml.Serialization.XmlAttributeOverrides>, which is used to create an <xref:System.Xml.Serialization.XmlSerializer> that can serialize an instance of the `Transportation` class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttributes/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlElementAttributes.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttributes/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlElementEventArgs.xml b/xml/System.Xml.Serialization/XmlElementEventArgs.xml
index 1f0b5c8d75a..f869aed3a2e 100644
--- a/xml/System.Xml.Serialization/XmlElementEventArgs.xml
+++ b/xml/System.Xml.Serialization/XmlElementEventArgs.xml
@@ -73,7 +73,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -140,7 +140,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -252,7 +252,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlElementEventHandler.xml b/xml/System.Xml.Serialization/XmlElementEventHandler.xml
index ea6a8dec8fe..1c2cf19a73f 100644
--- a/xml/System.Xml.Serialization/XmlElementEventHandler.xml
+++ b/xml/System.Xml.Serialization/XmlElementEventHandler.xml
@@ -83,7 +83,7 @@
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml.Serialization/XmlEnumAttribute.xml b/xml/System.Xml.Serialization/XmlEnumAttribute.xml
index f72900459aa..2a943b2507b 100644
--- a/xml/System.Xml.Serialization/XmlEnumAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlEnumAttribute.xml
@@ -91,7 +91,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlEnumAttribute> to the members of an enumeration. When the <xref:System.Xml.Serialization.XmlSerializer> generates XML data for this enumeration, the data conforms to the values of the <xref:System.Xml.Serialization.XmlEnumAttribute.Name%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlEnumAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/Overview/source.vb" id="Snippet1":::
 
 > [!NOTE]
 > You can use the word `XmlEnum` in your code instead of the longer <xref:System.Xml.Serialization.XmlEnumAttribute>.
@@ -182,7 +182,7 @@
  The following example serializes two classes named `Food` and `FoodType`. The `FoodType` class contains two enumerations that are overridden and, for each enumeration, the example creates an <xref:System.Xml.Serialization.XmlEnumAttribute> object that is assigned to the <xref:System.Xml.Serialization.XmlAttributes.XmlEnum%2A> property of an <xref:System.Xml.Serialization.XmlAttributes> object. The example then adds the <xref:System.Xml.Serialization.XmlAttributes> object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, which is used to create an <xref:System.Xml.Serialization.XmlSerializer>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlEnumAttribute/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute.XmlEnumAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -257,7 +257,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlEnumAttribute> to the members of an enumeration. When the <xref:System.Xml.Serialization.XmlSerializer> generates XML data for this enumeration, the data conforms to the values of the <xref:System.Xml.Serialization.XmlEnumAttribute.Name%2A> properties.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlEnumAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute.Name Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlEnumAttribute> attribute to members of an enumeration. The generated XML data conforms to the values set for the <xref:System.Xml.Serialization.XmlEnumAttribute.Name%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlEnumAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlEnumAttribute.Name Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlEnumAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml b/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml
index 911fbe8bf18..825025dcd21 100644
--- a/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml
@@ -89,7 +89,7 @@
  The following example shows a class named `Group`, which contains a field named `Comment`. The example assigns the <xref:System.Xml.Serialization.XmlIgnoreAttribute> to the field, thereby instructing the <xref:System.Xml.Serialization.XmlSerializer> to ignore the field when serializing or deserializing an instance of the class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlIgnoreAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIgnoreAttribute.XmlIgnoreAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlIgnoreAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -158,7 +158,7 @@
  The following example shows a class named `Group`, which contains a field named `Comment`. The example assigns the <xref:System.Xml.Serialization.XmlIgnoreAttribute> to the field, thereby instructing the <xref:System.Xml.Serialization.XmlSerializer> to ignore the field when serializing or deserializing an instance of the class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlIgnoreAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIgnoreAttribute.XmlIgnoreAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlIgnoreAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlIncludeAttribute.xml b/xml/System.Xml.Serialization/XmlIncludeAttribute.xml
index dbed8356f55..39d3e233c0e 100644
--- a/xml/System.Xml.Serialization/XmlIncludeAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlIncludeAttribute.xml
@@ -150,7 +150,7 @@
  The following example shows three classes, two of which inherit from the third. The example applies the <xref:System.Xml.Serialization.XmlIncludeAttribute> to a method that returns an instance of one of the two derived classes. The example sets the <xref:System.Xml.Serialization.XmlIncludeAttribute.Type%2A> property to the type of the returned object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlIncludeAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIncludeAttribute.XmlIncludeAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlIncludeAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
  The following example defines a class named `Group`, which contains a field named `Employees` that returns an array of `Employee` objects. The example derives the `Manager` class from the `Employee` class, and applies the <xref:System.Xml.Serialization.XmlIncludeAttribute> to the `Employee` class. When the example creates a `Group` object, it inserts a `Manager` object into the `Employee` array. Lastly, the example serializes the `Group` object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlIncludeAttribute/Type/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlIncludeAttribute.Type Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlIncludeAttribute/Type/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlNodeEventArgs.xml b/xml/System.Xml.Serialization/XmlNodeEventArgs.xml
index 1165792d6d7..4cbc14db28d 100644
--- a/xml/System.Xml.Serialization/XmlNodeEventArgs.xml
+++ b/xml/System.Xml.Serialization/XmlNodeEventArgs.xml
@@ -63,7 +63,7 @@
  The following example uses the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event of the <xref:System.Xml.Serialization.XmlSerializer> to print various properties of an unknown XML node that is encountered when calling the <xref:System.Xml.Serialization.XmlSerializer> class's <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownNode Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -121,7 +121,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownNode Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -176,7 +176,7 @@
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownNode Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -232,7 +232,7 @@
  The following example prints the <xref:System.Xml.Serialization.XmlNodeEventArgs.LocalName%2A> of an unknown XML node that is encountered when calling the <xref:System.Xml.Serialization.XmlSerializer> class's <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/LocalName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.LocalName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/LocalName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -285,7 +285,7 @@
  The following example prints the name of the unknown node that caused the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event to occur.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/Name/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.Name Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Name/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -338,7 +338,7 @@
  The following example prints the URI of the unknown XML node that caused the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event to occur.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/NamespaceURI/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.NamespaceURI Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/NamespaceURI/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@
  The following example prints a description of the unknown node that caused the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event to occur.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/NodeType/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.NodeType Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/NodeType/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -460,7 +460,7 @@
  The following example prints the value returned by the <xref:System.Object.ToString%2A> method when the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method encounters an unknown XML node.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/ObjectBeingDeserialized/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.ObjectBeingDeserialized Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/ObjectBeingDeserialized/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -520,7 +520,7 @@
  The following example prints the text of the unknown XML node that caused the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event to occur.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/Text/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventArgs.Text Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Text/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlNodeEventHandler.xml b/xml/System.Xml.Serialization/XmlNodeEventHandler.xml
index cbf78cafeea..7225a0b37ae 100644
--- a/xml/System.Xml.Serialization/XmlNodeEventHandler.xml
+++ b/xml/System.Xml.Serialization/XmlNodeEventHandler.xml
@@ -73,7 +73,7 @@
  The following example creates an <xref:System.Xml.Serialization.XmlSerializer>, adds an event handler for the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event, and deserializes an object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventHandler/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlNodeEventHandler Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventHandler/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml.Serialization/XmlRootAttribute.xml b/xml/System.Xml.Serialization/XmlRootAttribute.xml
index 25c84e93788..b4b508da8a7 100644
--- a/xml/System.Xml.Serialization/XmlRootAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlRootAttribute.xml
@@ -93,7 +93,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlRootAttribute> to a class. The attribute specifies the element name, namespace, and whether the element is qualified, and whether the `xsi:nil` attribute is generated if the class is set to `null`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlRootAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -165,7 +165,7 @@
  The following example creates an instance of an <xref:System.Xml.Serialization.XmlRootAttribute> and assigns it to the <xref:System.Xml.Serialization.XmlAttributes.XmlRoot%2A> property of an <xref:System.Xml.Serialization.XmlAttributes> object. When the <xref:System.Xml.Serialization.XmlSerializer> serializes the `MyClass` object, it uses the <xref:System.Xml.Serialization.XmlRootAttribute> object to override the default root element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlRootAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.XmlRootAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@
  The following example creates an instance of the XmlRootAttribute and uses it to override the serialization of an instance of a class named "Student".
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlRootAttribute/.ctor/xmlrootattribute_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XMLRootAttribute_Constructor/VB/xmlrootattribute_constructor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/.ctor/xmlrootattribute_constructor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -416,7 +416,7 @@
  The following example creates an instance of the <xref:System.Xml.Serialization.XmlRootAttribute> class and sets the <xref:System.Xml.Serialization.XmlRootAttribute.ElementName%2A> property to a new value. The object is then used to create an <xref:System.Xml.Serialization.XmlAttributeOverrides> object used to override the serialization of an object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlRootAttribute/ElementName/xmlrootattribute_elementname.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XMLRootAttribute_ElementName/VB/xmlrootattribute_elementname.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/ElementName/xmlrootattribute_elementname.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -502,7 +502,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
  The following example serializes a class named `Group`. The example applies the <xref:System.Xml.Serialization.XmlRootAttribute> to the class, and sets the <xref:System.Xml.Serialization.XmlRootAttribute.IsNullable%2A> property to `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlRootAttribute/IsNullable/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.IsNullable Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/IsNullable/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -582,7 +582,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
  The following example applies the <xref:System.Xml.Serialization.XmlRootAttribute> to a class and sets the <xref:System.Xml.Serialization.XmlRootAttribute.Namespace%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlRootAttribute/Namespace/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlRootAttribute.Namespace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlRootAttribute/Namespace/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSchemaProviderAttribute.xml b/xml/System.Xml.Serialization/XmlSchemaProviderAttribute.xml
index 98b37b989eb..32619ea7d3e 100644
--- a/xml/System.Xml.Serialization/XmlSchemaProviderAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlSchemaProviderAttribute.xml
@@ -93,7 +93,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlSchemaProviderAttribute> to a server-side class. When invoked, the method named by the <xref:System.Xml.Serialization.XmlSchemaProviderAttribute.MethodName%2A> property creates the schema. This simple implementation reads an existing schema off the disk. However, you can also create a custom schema, if necessary, using the types found in the <xref:System.Xml.Schema> namespace.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSchemaProviderAttribute/Overview/SerializationChunk.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/HowToChunkSerializedData/VB/SerializationChunk.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSchemaProviderAttribute/Overview/SerializationChunk.vb" id="Snippet2":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSerializer.xml b/xml/System.Xml.Serialization/XmlSerializer.xml
index 7336051a080..d21c926e0e3 100644
--- a/xml/System.Xml.Serialization/XmlSerializer.xml
+++ b/xml/System.Xml.Serialization/XmlSerializer.xml
@@ -63,7 +63,7 @@
 The following example contains two main classes: `PurchaseOrder` and `Test`. The `PurchaseOrder` class contains information about a single purchase. The `Test` class contains the methods that create the purchase order, and that read the created purchase order.
 
 :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Overview/source.cs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Overview/source.vb" id="Snippet1":::
       ]]></format>
     </example>
     <threadsafe>This type is thread safe.</threadsafe>
@@ -199,7 +199,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example constructs an <xref:System.Xml.Serialization.XmlSerializer> that serializes an object named `Widget`. The example sets various properties of the object before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer6 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source5.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -276,7 +276,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes a class named `Group`. The serialization of the `GroupName`, `IgnoreThis` fields, and the members of the `GroupType` enumeration are overridden. In the `CreateOverrideSerializer` method, a <xref:System.Xml.Serialization.SoapAttributeOverrides> object is created, and for each overridden member or enumeration, a <xref:System.Xml.Serialization.SoapAttributes> object is created with the appropriate property set and added to the <xref:System.Xml.Serialization.SoapAttributeOverrides> object. An <xref:System.Xml.Serialization.XmlMapping> object is created using the <xref:System.Xml.Serialization.SoapAttributeOverrides> object, and that <xref:System.Xml.Serialization.XmlMapping> object is used to create the <xref:System.Xml.Serialization.XmlSerializer> that overrides the default serialization.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributeOverrides/Overview/soapover.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapAttributesOverrides/VB/SoapOver.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributeOverrides/Overview/SoapOver.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -357,7 +357,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example constructs an <xref:System.Xml.Serialization.XmlSerializer> that serializes an object named `Widget`. The example sets various properties of the object before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -449,7 +449,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an instance of a class that contains a public field that returns an array of objects. The `extraTypes` parameter of the <xref:System.Xml.Serialization.XmlSerializer> constructor specifies the types of the objects that can be serialized in the array.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -535,7 +535,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an instance of a class that is defined in a DLL and to do so, overrides the public members found in the DLL.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source4.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -622,7 +622,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example constructs an <xref:System.Xml.Serialization.XmlSerializer> that uses an <xref:System.Xml.Serialization.XmlRootAttribute> that contains various properties of the XML root element, such as its namespace and element name.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -729,7 +729,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an instance of a class that is defined in a DLL and to do so, overrides the public members found in the class. The example also specifies an array of extra types, the default namespace for all XML elements, and the class to use that provides the XML root element information. The example assumes that the code at the beginning has been compiled into a DLL named `HighSchool`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.XmlSerializer Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -934,7 +934,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example calls the <xref:System.Xml.Serialization.XmlSerializer.CanDeserialize%2A> method to check whether an XML document can be deserialized.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/CanDeserialize/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.CanDeserialize Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/CanDeserialize/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1127,7 +1127,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example deserializes an object using a <xref:System.IO.Stream> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Deserialize/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize Example/Common/simple.xml" id="Snippet1":::
 
  ]]></format>
@@ -1221,7 +1221,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example deserializes an object using a <xref:System.IO.TextReader> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Deserialize/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1365,7 +1365,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example deserializes an object using an <xref:System.Xml.XmlReader>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Deserialize/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Deserialize/source2.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlSerializer.Deserialize2 Example/Common/simple.xml" id="Snippet1":::
 
  ]]></format>
@@ -1905,7 +1905,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example uses the <xref:System.Xml.Serialization.XmlSerializer.FromTypes%2A> method to return an array of <xref:System.Xml.Serialization.XmlSerializer> objects. The code includes three class definitions that are each used to create an array of <xref:System.Type> objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/FromTypes/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.FromTypes Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/FromTypes/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2260,7 +2260,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an object using a <xref:System.IO.Stream> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Serialize/source2.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize2 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source2.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlSerializer.Serialize2 Example/Common/simple.xml" id="Snippet1":::
 
  ]]></format>
@@ -2367,7 +2367,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an object using a <xref:System.IO.TextWriter>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Serialize/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlSerializer.Serialize Example/Common/simple.xml" id="Snippet1":::
 
  ]]></format>
@@ -2524,7 +2524,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an object using an <xref:System.Xml.XmlWriter>.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Serialize/source4.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source4.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlSerializer.Serialize4 Example/Common/simple.xml" id="Snippet1":::
 
  ]]></format>
@@ -2633,7 +2633,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an object with a <xref:System.IO.Stream> object. The example also creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> and adds two namespaces to the object. The class that defines the serialized object is also attributed with <xref:System.Xml.Serialization.XmlElementAttribute> attributes to specify the namespace for each element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Serialize/source3.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2733,7 +2733,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an object with a <xref:System.IO.TextWriter>. The example also creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object and adds two namespaces to the object. The class that defines the serialized object is also attributed with <xref:System.Xml.Serialization.XmlElementAttribute> attributes to specify the namespace for each element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Serialize/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source1.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlSerializer.Serialize1 Example/Common/simple.xml" id="Snippet1":::
 
  ]]></format>
@@ -2833,7 +2833,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example serializes an object with an <xref:System.Xml.XmlWriter>. The example also creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> and adds two namespaces to the object. Several instances of the <xref:System.Xml.Serialization.XmlElementAttribute> class are applied to the class members to specify the namespace for each element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/Serialize/source5.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.Serialize5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/Serialize/source5.vb" id="Snippet1":::
  :::code language="xml" source="~/snippets/common/VS_Snippets_Remoting/Classic XmlSerializer.Serialize5 Example/Common/simple.xml" id="Snippet1":::
 
  ]]></format>
@@ -3077,7 +3077,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example prints information about any unknown attributes encountered while deserializing an XML document.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3158,7 +3158,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializer.UnknownElement Example/VB/unknownelement.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementEventArgs/Overview/unknownelement.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3225,7 +3225,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The following example prints the type of any encountered unknown node.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializer.UnknownNode Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3323,7 +3323,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
 ```
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/UnreferencedObject Event Example/VB/unrefobj.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/UnreferencedObjectEventArgs/Overview/unrefobj.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml b/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml
index 2d1dca18383..d84d39f0c2e 100644
--- a/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml
+++ b/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml
@@ -121,7 +121,7 @@ ns.Add("", "")
  The following example creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, and adds two prefix and namespace pairs to it. The example then passes the <xref:System.Xml.Serialization.XmlSerializerNamespaces> to the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method, which serializes a `Books` object into an XML document. Using the <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method qualifies each XML element and attribute with one of the two namespaces.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializerNamespaces/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -196,7 +196,7 @@ ns.Add("", "")
  The following example creates an instance of the <xref:System.Xml.Serialization.XmlSerializerNamespaces> class, and adds a prefix and namespace pair to the object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/xmlserializernamespaces_constructor.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlSerializerNameSpaces_Constructor/VB/xmlserializernamespaces_constructor.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/xmlserializernamespaces_constructor.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@ ns.Add("", "")
  The following example creates two <xref:System.Xml.XmlQualifiedName> objects, and creates a new <xref:System.Xml.Serialization.XmlSerializerNamespaces> instance from them.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.XmlSerializerNamespaces1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -380,7 +380,7 @@ ns.Add("", "")
  The following example creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, and adds three prefix and namespace pairs to it by calling the <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add%2A> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializerNamespaces/Add/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.Add Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Add/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -487,7 +487,7 @@ ns.Add("", "")
  The following example prints each <xref:System.Xml.XmlQualifiedName.Name%2A> and <xref:System.Xml.XmlQualifiedName.Namespace%2A> in an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializerNamespaces/ToArray/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlSerializerNamespaces.ToArray Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/ToArray/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlTextAttribute.xml b/xml/System.Xml.Serialization/XmlTextAttribute.xml
index 7216f0a6e7c..854173e1db2 100644
--- a/xml/System.Xml.Serialization/XmlTextAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlTextAttribute.xml
@@ -107,7 +107,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema">
  the following class is generated (extra spaces and remarks have been removed):
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTextAttribute/Overview/source1.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlTextAttribute/vb/source.vb" id="Snippet0":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source1.vb" id="Snippet0":::
 
  For more information about using attributes, see [Attributes](/dotnet/standard/attributes/).
 
@@ -118,7 +118,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTextAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -201,7 +201,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema">
  The following example serializes a class that contains a public field, named `Comment`. The example applies an <xref:System.Xml.Serialization.XmlTextAttribute> to the field, thereby overriding its serialization as an XML element, and instead serializing it as XML text.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTextAttribute/.ctor/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute.XmlTextAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -269,7 +269,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTextAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -403,7 +403,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTextAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -481,7 +481,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTextAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTextAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTextAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlTypeAttribute.xml b/xml/System.Xml.Serialization/XmlTypeAttribute.xml
index 32c237d3c9a..981a3ca71ed 100644
--- a/xml/System.Xml.Serialization/XmlTypeAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlTypeAttribute.xml
@@ -84,7 +84,7 @@
  The following example shows two classes to which the <xref:System.Xml.Serialization.XmlTypeAttribute> has been applied.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeAttribute/Overview/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/Overview/source.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -153,7 +153,7 @@
  The following example creates two instances of the <xref:System.Xml.Serialization.XmlTypeAttribute> class that are used to override the serialization of the two classes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeAttribute/.ctor/xmltypeattribute1_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XMLTypeAttribute1_2/VB/xmltypeattribute1_2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/.ctor/xmltypeattribute1_2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -214,7 +214,7 @@
  The following example creates two instances of the <xref:System.Xml.Serialization.XmlTypeAttribute> class that are used to override the serialization of the two classes.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeAttribute/.ctor/xmltypeattribute1_2.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XMLTypeAttribute1_2/VB/xmltypeattribute1_2.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/.ctor/xmltypeattribute1_2.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlTypeAttribute> to the `ExtraneousInfo` class, setting the <xref:System.Xml.Serialization.XmlTypeAttribute.IncludeInSchema%2A> property to `false`.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeAttribute/IncludeInSchema/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.IncludeInSchema Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/IncludeInSchema/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -406,7 +406,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlTypeAttribute> to a class while setting the <xref:System.Xml.Serialization.XmlTypeAttribute.Namespace%2A> property.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeAttribute/Namespace/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.Namespace Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/Namespace/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -476,7 +476,7 @@
  The following example applies the <xref:System.Xml.Serialization.XmlTypeAttribute> to the `Person` and `Job` classes. If you compile the class and pass the resulting executable file to the XML Schema Definition tool, the schema is displayed in the Output section.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeAttribute/TypeName/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic XmlTypeAttribute.TypeName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeAttribute/TypeName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlTypeMapping.xml b/xml/System.Xml.Serialization/XmlTypeMapping.xml
index 5d62c8a89f5..edb58eec41b 100644
--- a/xml/System.Xml.Serialization/XmlTypeMapping.xml
+++ b/xml/System.Xml.Serialization/XmlTypeMapping.xml
@@ -65,7 +65,7 @@
  The following example serializes an instance of a class named `Transportation` that contains a field named `Vehicle`. A <xref:System.Xml.Serialization.SoapElementAttribute> is applied to the field. When the field is serialized, the XML element name is "Wheels" instead of "Vehicle". The `SerializeOverride` method creates a <xref:System.Xml.Serialization.SoapElementAttribute> and sets the <xref:System.Xml.Serialization.SoapAttributes.SoapElement%2A> property of a <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapElementAttribute>. The <xref:System.Xml.Serialization.SoapAttributes> is added to a <xref:System.Xml.Serialization.SoapAttributeOverrides> that is used to create an <xref:System.Xml.Serialization.XmlTypeMapping>. An <xref:System.Xml.Serialization.XmlSerializer> is constructed with the <xref:System.Xml.Serialization.XmlTypeMapping>, and an instance of the `Transportation` class is again serialized. Because the <xref:System.Xml.Serialization.SoapElementAttribute> is used to override the serialization, the generated XML element name is now "Truck" instead of "Wheels".
   
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SoapElementOverrides/VB/soapelementoverrides.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/SoapAttributes/SoapElement/soapelementoverrides.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
@@ -190,7 +190,7 @@ To set a namespace name of an object, apply a <xref:System.Xml.Serialization.Soa
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlTypeMapping Example/VB/mapping.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -249,7 +249,7 @@ To set a namespace name of an object, apply a <xref:System.Xml.Serialization.Soa
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlTypeMapping Example/VB/mapping.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@ To set a namespace name of an object, apply a <xref:System.Xml.Serialization.Soa
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlTypeMapping Example/VB/mapping.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -375,7 +375,7 @@ To set a namespace name of an object, apply a <xref:System.Xml.Serialization.Soa
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/XmlTypeMapping Example/VB/mapping.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlTypeMapping/TypeFullName/mapping.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/NonSerializedAttribute.xml b/xml/System/NonSerializedAttribute.xml
index d7047ce1383..1e37e4d9f51 100644
--- a/xml/System/NonSerializedAttribute.xml
+++ b/xml/System/NonSerializedAttribute.xml
@@ -106,7 +106,7 @@ public event ChangedEventHandler Changed;
   
  :::code language="csharp" source="~/snippets/csharp/System/NonSerializedAttribute/Overview/s.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/NonSerializedAttribute/Overview/s.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SerializationAttributes/VB/s.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/NonSerializedAttribute/Overview/s.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/SerializableAttribute.xml b/xml/System/SerializableAttribute.xml
index 7dde21553eb..0606f4e86e2 100644
--- a/xml/System/SerializableAttribute.xml
+++ b/xml/System/SerializableAttribute.xml
@@ -94,7 +94,7 @@
   
  :::code language="csharp" source="~/snippets/csharp/System/NonSerializedAttribute/Overview/s.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/NonSerializedAttribute/Overview/s.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/SerializationAttributes/VB/s.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/NonSerializedAttribute/Overview/s.vb" id="Snippet1":::
 
  ]]></format>
     </remarks>
diff --git a/xml/System/Uri.xml b/xml/System/Uri.xml
index 7b9fda102ac..4b6a15573bb 100644
--- a/xml/System/Uri.xml
+++ b/xml/System/Uri.xml
@@ -106,7 +106,7 @@ The following example creates an instance of the <xref:System.Uri> class and use
 
 :::code language="csharp" source="~/snippets/csharp/System/Uri/Overview/source.cs" id="Snippet1":::
 :::code language="fsharp" source="~/snippets/fsharp/System/Uri/Overview/source.fs" id="Snippet1":::
-:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri Example/VB/source.vb" id="Snippet1":::
+:::code language="vb" source="~/snippets/visualbasic/System/Uri/Overview/source.vb" id="Snippet1":::
 
 The following code snippet shows example values of the various properties on the class.
 
@@ -204,7 +204,7 @@ The following code snippet shows example values of the various properties on the
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -453,7 +453,7 @@ The following code snippet shows example values of the various properties on the
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/source1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/source1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri1 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -750,7 +750,7 @@ The following code snippet shows example values of the various properties on the
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/source2.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/source2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -871,7 +871,7 @@ The following code snippet shows example values of the various properties on the
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/nclurienhancements.cs" interactive="try-dotnet-method" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/nclurienhancements.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -1014,7 +1014,7 @@ The URI formed by combining <paramref name="baseUri" /> and <paramref name="rela
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/source3.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/source3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Uri4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1131,7 +1131,7 @@ The URI formed by combining <paramref name="baseUri" /> and <paramref name="rela
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/AbsolutePath/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/AbsolutePath/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.AbsolutePath Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/AbsolutePath/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1191,7 +1191,7 @@ The URI formed by combining <paramref name="baseUri" /> and <paramref name="rela
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/AbsoluteUri/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/AbsoluteUri/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.AbsoluteUri Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/AbsoluteUri/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1251,7 +1251,7 @@ The URI formed by combining <paramref name="baseUri" /> and <paramref name="rela
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/Authority/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/Authority/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Authority Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/Authority/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1380,7 +1380,7 @@ The URI formed by combining <paramref name="baseUri" /> and <paramref name="rela
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckHostName/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckHostName/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.CheckHostName Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckHostName/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -1454,7 +1454,7 @@ The URI formed by combining <paramref name="baseUri" /> and <paramref name="rela
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet9":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -1694,7 +1694,7 @@ If you used an escaped string to construct this instance (for example, `"http://
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/nclurienhancements.cs" interactive="try-dotnet-method" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/nclurienhancements.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb" id="Snippet4":::
 
  As explained in Remarks, unescape the host name before resolving it. You can use the <xref:System.Uri.UnescapeDataString%2A> method to unescape the host name, and you can resolve it by calling the <xref:System.Net.Dns.GetHostEntry%2A> method.
 
@@ -1779,7 +1779,7 @@ If you used an escaped string to construct this instance (for example, `"http://
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet8":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet8":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet8":::
 
  ]]></format>
         </remarks>
@@ -2199,7 +2199,7 @@ If you used an escaped string to construct this instance (for example, `"http://
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2259,7 +2259,7 @@ If you used an escaped string to construct this instance (for example, `"http://
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2387,7 +2387,7 @@ If you used an escaped string to construct this instance (for example, `"http://
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2471,7 +2471,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -2574,7 +2574,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2634,7 +2634,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -2695,7 +2695,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/Host/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/Host/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Host Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/Host/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -2752,7 +2752,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet9":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -3003,7 +3003,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/nclurienhancements.cs" interactive="try-dotnet-method" id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/nclurienhancements.fs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -3062,7 +3062,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet4":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet4":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet4":::
 
  ]]></format>
         </remarks>
@@ -3183,7 +3183,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs"  id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs"  id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -3244,7 +3244,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -3306,7 +3306,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -3366,7 +3366,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -3487,7 +3487,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -3707,7 +3707,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs"  id="Snippet6":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs"  id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet6":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet6":::
 
  ]]></format>
         </remarks>
@@ -3796,7 +3796,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3872,7 +3872,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -3941,7 +3941,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/nclurienhancements.cs" interactive="try-dotnet-method" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/nclurienhancements.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -4007,7 +4007,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/nclurienhancements.cs" interactive="try-dotnet-method" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/nclurienhancements.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -4073,7 +4073,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/.ctor/nclurienhancements.cs" interactive="try-dotnet-method" id="Snippet3":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/.ctor/nclurienhancements.fs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriEnhancements/VB/nclurienhancements.vb" id="Snippet3":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/.ctor/nclurienhancements.vb" id="Snippet3":::
 
  ]]></format>
         </remarks>
@@ -4192,7 +4192,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/PathAndQuery/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/PathAndQuery/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.PathAndQuery Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/PathAndQuery/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4252,7 +4252,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/Port/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/Port/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Port Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/Port/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4316,7 +4316,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/PathAndQuery/source.cs" interactive="try-dotnet-method" id="Snippet2":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/PathAndQuery/source.fs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.PathAndQuery Example/VB/source.vb" id="Snippet2":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/PathAndQuery/source.vb" id="Snippet2":::
 
  ]]></format>
         </remarks>
@@ -4394,7 +4394,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/Scheme/source.cs" interactive="try-dotnet-method" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/Scheme/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic Uri.Scheme Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/Scheme/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -4446,7 +4446,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet17":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet17":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet17":::
 
  ]]></format>
         </remarks>
@@ -4535,7 +4535,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet5":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet5":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet5":::
 
  ]]></format>
         </remarks>
@@ -4740,7 +4740,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet7":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet7":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet7":::
 
  ]]></format>
         </remarks>
@@ -5365,7 +5365,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet10":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet10":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet10":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet10":::
 
  ]]></format>
         </remarks>
@@ -5416,7 +5416,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet15":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet15":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet15":::
 
  ]]></format>
         </remarks>
@@ -5497,7 +5497,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet14":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet14":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet14":::
 
  ]]></format>
         </remarks>
@@ -5548,7 +5548,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet9":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet9":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet9":::
 
  ]]></format>
         </remarks>
@@ -5599,7 +5599,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet16":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet16":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet16":::
 
  ]]></format>
         </remarks>
@@ -5650,7 +5650,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet11":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet11":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet11":::
 
  ]]></format>
         </remarks>
@@ -5779,7 +5779,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet12":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet12":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet12":::
 
  ]]></format>
         </remarks>
@@ -5833,7 +5833,7 @@ The following examples show a URI and the results of calling <xref:System.Uri.Ge
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet13":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet13":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet13":::
 
  ]]></format>
         </remarks>
@@ -6044,7 +6044,7 @@ The <xref:System.Uri.UserEscaped> property was originally designed to indicate t
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet18":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
@@ -6103,7 +6103,7 @@ The <xref:System.Uri.UserEscaped> property was originally designed to indicate t
 
  :::code language="csharp" source="~/snippets/csharp/System/Uri/CheckSchemeName/uriexamples.cs" interactive="try-dotnet-method" id="Snippet18":::
  :::code language="fsharp" source="~/snippets/fsharp/System/Uri/CheckSchemeName/uriexamples.fs" id="Snippet18":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/NCLUriExamples/VB/uriexamples.vb" id="Snippet18":::
+ :::code language="vb" source="~/snippets/visualbasic/System/Uri/CheckSchemeName/uriexamples.vb" id="Snippet18":::
 
  ]]></format>
         </remarks>
diff --git a/xml/System/UriBuilder.xml b/xml/System/UriBuilder.xml
index 33c6b913197..0ce687f7a08 100644
--- a/xml/System/UriBuilder.xml
+++ b/xml/System/UriBuilder.xml
@@ -345,7 +345,7 @@ Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.
   
  :::code language="csharp" source="~/snippets/csharp/System/UriBuilder/.ctor/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UriBuilder/.ctor/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder3 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UriBuilder/.ctor/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -413,7 +413,7 @@ Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.
 
  :::code language="csharp" source="~/snippets/csharp/System/UriBuilder/.ctor/source1.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UriBuilder/.ctor/source1.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder4 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UriBuilder/.ctor/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@ Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.
 
  :::code language="csharp" source="~/snippets/csharp/System/UriBuilder/.ctor/source2.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UriBuilder/.ctor/source2.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder5 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UriBuilder/.ctor/source2.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -559,7 +559,7 @@ Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.
 
  :::code language="csharp" source="~/snippets/csharp/System/UriBuilder/.ctor/source3.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UriBuilder/.ctor/source3.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.UriBuilder6 Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UriBuilder/.ctor/source3.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -704,7 +704,7 @@ The <xref:System.UriBuilder.Fragment> property contains any text following a fra
 
  :::code language="csharp" source="~/snippets/csharp/System/UriBuilder/Fragment/source.cs" id="Snippet1":::
  :::code language="fsharp" source="~/snippets/fsharp/System/UriBuilder/Fragment/source.fs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Remoting/Classic UriBuilder.Fragment Example/VB/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System/UriBuilder/Fragment/source.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>