diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/astoria custom feeds.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/astoria custom feeds.csproj.user
deleted file mode 100644
index f058df60b98..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/astoria custom feeds.csproj.user
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- Default.aspx
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj.user
deleted file mode 100644
index fe9e9b582e3..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj.user
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
-
- en-US
- false
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/linqprovidercs.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/linqprovidercs.csproj.user
deleted file mode 100644
index 6efc8abb166..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/linqprovidercs.csproj.user
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- Northwind.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj.user
deleted file mode 100644
index a6b4976ec34..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj.user
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
- en-US
- false
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/upgradelog.xml b/snippets/csharp/VS_Snippets_Misc/astoria linq provider/upgradelog.xml
deleted file mode 100644
index 04b68921c80..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/upgradelog.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclientcs.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclientcs.csproj.user
deleted file mode 100644
index 6a1726839a7..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclientcs.csproj.user
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- ShowAllFiles
- publish\
-
-
-
-
-
- en-US
- false
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/clientbin/silverlightclient.xap b/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/clientbin/silverlightclient.xap
deleted file mode 100644
index 09fa5743aff..00000000000
Binary files a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/clientbin/silverlightclient.xap and /dev/null differ
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.bad.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.bad.csproj.user
deleted file mode 100644
index 6efc8abb166..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.bad.csproj.user
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- Northwind.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.user
deleted file mode 100644
index 92efe0a5a5d..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.user
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- Northwind2.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog.xml b/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog.xml
deleted file mode 100644
index baf4a7596bd..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog2.xml b/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog2.xml
deleted file mode 100644
index 387c0db6c95..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog3.xml b/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog3.xml
deleted file mode 100644
index f9eb13642e8..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog3.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog4.xml b/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog4.xml
deleted file mode 100644
index 9b557df972f..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/upgradelog4.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photostreamingclient.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photostreamingclient.csproj.user
deleted file mode 100644
index deebd3055ca..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photostreamingclient.csproj.user
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- true
-
-
-
-
-
-
-
-
- en-US
- false
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoservice.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoservice.csproj.user
deleted file mode 100644
index b8eaa1d9985..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoservice.csproj.user
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
- PhotoData.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/northwindclient.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/northwindclient.csproj.user
deleted file mode 100644
index 590636011df..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/northwindclient.csproj.user
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
-
- en-US
- false
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart service/cs/northwindservice.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria quickstart service/cs/northwindservice.csproj.user
deleted file mode 100644
index 6efc8abb166..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria quickstart service/cs/northwindservice.csproj.user
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- Northwind.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria reflection provider/cs/customdataservice.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria reflection provider/cs/customdataservice.csproj.user
deleted file mode 100644
index 6a189754315..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria reflection provider/cs/customdataservice.csproj.user
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- OrderItems.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj.user
deleted file mode 100644
index 6a34e7dcdf5..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj.user
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria streaming client/cs/northwindstreamingclient.csproj.user b/snippets/csharp/VS_Snippets_Misc/astoria streaming client/cs/northwindstreamingclient.csproj.user
deleted file mode 100644
index deebd3055ca..00000000000
--- a/snippets/csharp/VS_Snippets_Misc/astoria streaming client/cs/northwindstreamingclient.csproj.user
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- true
-
-
-
-
-
-
-
-
- en-US
- false
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/astoria custom feeds.sln b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/astoria custom feeds.sln
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/astoria custom feeds.sln
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/astoria custom feeds.sln
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/astoria custom feeds.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/astoria custom feeds.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/astoria custom feeds.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/astoria custom feeds.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/default.aspx b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/default.aspx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/default.aspx
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/default.aspx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/default.aspx.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/default.aspx.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/default.aspx.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/default.aspx.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/default.aspx.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/default.aspx.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/default.aspx.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/default.aspx.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/iupdatable.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/iupdatable.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/iupdatable.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/iupdatable.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.objects.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.objects.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.objects.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.objects.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.svc b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.svc
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.svc
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.svc
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.svc.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.svc.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/northwind.svc.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/northwind.svc.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/orderitems.svc b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/orderitems.svc
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/orderitems.svc
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/orderitems.svc
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/orderitems.svc.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/orderitems.svc.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/orderitems.svc.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/orderitems.svc.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/web.config b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/web.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/cs/web.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/cs/web.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/app.config b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/app.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/app.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/app.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/custom feed client.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/custom feed client.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/program.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/program.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/program.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/program.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.cs b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.datasvcmap b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.datasvcmap
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.datasvcmap
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/service.edmx b/snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/service.edmx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/service.edmx
rename to snippets/csharp/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/service.edmx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/astoria linq provider.sln b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/astoria linq provider.sln
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/astoria linq provider.sln
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/astoria linq provider.sln
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/default.aspx b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/default.aspx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/default.aspx
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/default.aspx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/default.aspx.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/default.aspx.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/default.aspx.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/default.aspx.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/default.aspx.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/default.aspx.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/default.aspx.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/default.aspx.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/linqprovidercs.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/linqprovidercs.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/linqprovidercs.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/linqprovidercs.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.dbml b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.dbml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.dbml
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.dbml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.dbml.diagram b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.dbml.diagram
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.dbml.diagram
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.dbml.diagram
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.dbml.layout b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.dbml.layout
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.dbml.layout
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.dbml.layout
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.svc b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.svc
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.svc
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.svc
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.svc.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.svc.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/northwind.svc.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/northwind.svc.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/web.config b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/web.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/web.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/web.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/web.debug.config b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/web.debug.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/web.debug.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/web.debug.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/web.release.config b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/web.release.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/cs/web.release.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/cs/web.release.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/linqproviderclientcs.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/linqproviderclientcs.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/program.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/program.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/program.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/program.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.cs b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.datasvcmap b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.datasvcmap
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.datasvcmap
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/service.edmx b/snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/service.edmx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/service.edmx
rename to snippets/csharp/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/service.edmx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/codegenclasses.bat b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/codegenclasses.bat
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/codegenclasses.bat
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/codegenclasses.bat
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/app.config b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/app.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/app.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/app.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/app.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/app.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/app.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/app.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/app.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/app.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/app.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/app.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentials.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentials.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentials.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentials.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentials.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentials.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentials.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentials.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentialslogin.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentialslogin.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentialslogin.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentialslogin.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentialslogin.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentialslogin.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/clientcredentialslogin.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/clientcredentialslogin.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customeraddress.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customeraddress.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customeraddress.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customeraddress.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders.resx b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders.resx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders.resx
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders.resx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders2.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders2.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders2.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders2.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders2.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders2.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders2.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders2.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders2.resx b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders2.resx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorders2.resx
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorders2.resx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerordersasync.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerordersasync.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerordersasync.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerordersasync.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerordersasync.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerordersasync.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerordersasync.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerordersasync.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderscustom.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderscustom.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderscustom.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderscustom.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderscustom.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderscustom.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderscustom.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderscustom.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf2.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf2.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf2.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf2.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf2.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf2.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf2.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf2.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf3.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf3.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf3.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf3.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf3.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf3.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/customerorderswpf3.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/customerorderswpf3.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwind.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwind.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwind.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwind.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwind1.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwind1.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwind1.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwind1.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclient.northwind.northwindentities.datasource b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwindclient.northwind.northwindentities.datasource
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclient.northwind.northwindentities.datasource
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwindclient.northwind.northwindentities.datasource
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclient.northwind.northwindentities1.datasource b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwindclient.northwind.northwindentities1.datasource
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclient.northwind.northwindentities1.datasource
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwindclient.northwind.northwindentities1.datasource
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclientcs.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwindclientcs.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/northwindclientcs.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/northwindclientcs.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/pagedresult.xml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/pagedresult.xml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/pagedresult.xml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/pagedresult.xml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/program.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/program.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/program.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/program.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/assemblyinfo1.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/assemblyinfo1.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/assemblyinfo1.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/assemblyinfo1.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/datasources/northwindclient.northwind.customers.datasource b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/datasources/northwindclient.northwind.customers.datasource
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/datasources/northwindclient.northwind.customers.datasource
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/datasources/northwindclient.northwind.customers.datasource
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/datasources/northwindclient.northwind.northwindentities.datasource b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/datasources/northwindclient.northwind.northwindentities.datasource
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/properties/datasources/northwindclient.northwind.northwindentities.datasource
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/properties/datasources/northwindclient.northwind.northwindentities.datasource
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/regendataservicereference.bat b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/regendataservicereference.bat
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/regendataservicereference.bat
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/regendataservicereference.bat
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/regenobjectlayer.bat b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/regenobjectlayer.bat
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/regenobjectlayer.bat
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/regenobjectlayer.bat
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/salesorders.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/salesorders.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/salesorders.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/salesorders.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/salesorders.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/salesorders.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/salesorders.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/salesorders.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/service references/northwind/reference.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/service references/northwind/reference.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/service references/northwind/reference.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/service references/northwind/reference.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/service references/northwind/reference.datasvcmap b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/service references/northwind/reference.datasvcmap
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/service references/northwind/reference.datasvcmap
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/service references/northwind/service.edmx b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/service references/northwind/service.edmx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/service references/northwind/service.edmx
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/service references/northwind/service.edmx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/source.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/source.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind client/cs/source.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_client/cs/source.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoria.sln b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoria.sln
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoria.sln
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoria.sln
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoria.vsmdi b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoria.vsmdi
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoria.vsmdi
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoria.vsmdi
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoria1.vsmdi b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoria1.vsmdi
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoria1.vsmdi
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoria1.vsmdi
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/astoriasnippetscs.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/astoriasnippetscs.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/astoriasnippetscs.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/astoriasnippetscs.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddressnonentitytest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddressnonentitytest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddressnonentitytest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddressnonentitytest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddresstest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddresstest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddresstest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddresstest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorders2test.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorders2test.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorders2test.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorders2test.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerordersasynctest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerordersasynctest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerordersasynctest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerordersasynctest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderscustomtest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderscustomtest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderscustomtest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderscustomtest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderstest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderstest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderstest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderstest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf2test.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf2test.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf2test.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf2test.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf3test.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf3test.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf3test.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf3test.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpftest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpftest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpftest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpftest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/salesorderstest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/salesorderstest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/salesorderstest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/salesorderstest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/sourcetest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/sourcetest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/sourcetest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/sourcetest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/applicationtest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/applicationtest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/applicationtest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/applicationtest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/astoriasnippetsvb.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/astoriasnippetsvb.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/astoriasnippetsvb.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/astoriasnippetsvb.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddressnonentitytest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddressnonentitytest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddressnonentitytest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddressnonentitytest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddresstest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddresstest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddresstest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddresstest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorders2test.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorders2test.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorders2test.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorders2test.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerordersasynctest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerordersasynctest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerordersasynctest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerordersasynctest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderscustomtest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderscustomtest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderscustomtest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderscustomtest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderstest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderstest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderstest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderstest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf2test.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf2test.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf2test.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf2test.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf3test.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf3test.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf3test.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf3test.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpftest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpftest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpftest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpftest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/salesorderstest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/salesorderstest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/salesorderstest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/salesorderstest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/sourcevbtest.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/sourcevbtest.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/sourcevbtest.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/sourcevbtest.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/default.aspx b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/default.aspx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/default.aspx
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/default.aspx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/default.aspx.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/default.aspx.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/default.aspx.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/default.aspx.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/default.aspx.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/default.aspx.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/default.aspx.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/default.aspx.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.edmx b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.edmx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.edmx
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.edmx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.svc b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.svc
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.svc
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.svc
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.svc.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.svc.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind.svc.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind.svc.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind2.svc b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind2.svc
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind2.svc
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind2.svc
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind2.svc.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind2.svc.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwind2.svc.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwind2.svc.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwinddataservicecs.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwinddataservicecs.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.bad.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwinddataservicecs.csproj.bad.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/northwinddataservicecs.csproj.bad.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/northwinddataservicecs.csproj.bad.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/properties/resources.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/properties/resources.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/properties/resources.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/properties/resources.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/properties/resources.resx b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/properties/resources.resx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/properties/resources.resx
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/properties/resources.resx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/web.config b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/web.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/cs/web.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/cs/web.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria northwind service/localtestrun.testrunconfig b/snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/localtestrun.testrunconfig
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria northwind service/localtestrun.testrunconfig
rename to snippets/csharp/VS_Snippets_Misc/astoria_northwind_service/localtestrun.testrunconfig
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/app.config b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/app.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/app.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/app.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/app.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/app.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/app.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/app.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/app.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/app.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/app.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/app.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/datasvcutil.exe.config b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/datasvcutil.exe.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/datasvcutil.exe.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/datasvcutil.exe.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/generatedataclasses.bat b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/generatedataclasses.bat
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/generatedataclasses.bat
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/generatedataclasses.bat
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photodata.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photodata.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photodata.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photodata.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photodetailswindow.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photodetailswindow.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photodetailswindow.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photodetailswindow.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photodetailswindow.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photodetailswindow.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photodetailswindow.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photodetailswindow.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photostreamingclient.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photostreamingclient.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photostreamingclient.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photostreamingclient.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photowindow.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photowindow.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photowindow.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photowindow.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photowindow.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photowindow.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/photowindow.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/photowindow.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/properties/settings.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/properties/settings.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/properties/settings.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/properties/settings.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/properties/settings.settings b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/properties/settings.settings
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/properties/settings.settings
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/properties/settings.settings
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/service references/photodata/reference.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/service references/photodata/reference.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/service references/photodata/reference.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/service references/photodata/reference.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/service references/photodata/reference.datasvcmap b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/service references/photodata/reference.datasvcmap
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/service references/photodata/reference.datasvcmap
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/service references/photodata/reference.datasvcmap
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/service references/photodata/service.edmx b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/service references/photodata/service.edmx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming client/cs/service references/photodata/service.edmx
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_client/cs/service references/photodata/service.edmx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image1 b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image1
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image1
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image1
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image1_thumb b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image1_thumb
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image1_thumb
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image1_thumb
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image2 b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image2
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image2
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image2
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image2_thumb b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image2_thumb
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image2_thumb
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image2_thumb
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image3 b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image3
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image3
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image3
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image3_thumb b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image3_thumb
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image3_thumb
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image3_thumb
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image4 b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image4
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image4
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image4
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image4_thumb b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image4_thumb
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image4_thumb
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image4_thumb
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image5 b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image5
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image5
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image5
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image5_thumb b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image5_thumb
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/app_data/image5_thumb
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/app_data/image5_thumb
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/customcompression.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/customcompression.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/customcompression.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/customcompression.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photodata.svc b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photodata.svc
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photodata.svc
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photodata.svc
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photodata.svc.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photodata.svc.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photodata.svc.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photodata.svc.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photoinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photoinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoservice.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photoservice.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoservice.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photoservice.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoservicestreamprovider.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photoservicestreamprovider.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/photoservicestreamprovider.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/photoservicestreamprovider.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/settings.cs b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/settings.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/settings.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/settings.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/web.config b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/web.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/cs/web.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/cs/web.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/photoservice.sln b/snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/photoservice.sln
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria photo streaming service/photoservice.sln
rename to snippets/csharp/VS_Snippets_Misc/astoria_photo_streaming_service/photoservice.sln
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/app.config b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/app.config
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/app.config
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/app.config
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/app.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/app.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/app.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/app.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/app.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/app.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/app.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/app.xaml.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/northwind.cs b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/northwind.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/northwind.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/northwind.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/northwindclient.csproj b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/northwindclient.csproj
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/northwindclient.csproj
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/northwindclient.csproj
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/assemblyinfo.cs b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/assemblyinfo.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/assemblyinfo.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/resources.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/resources.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/resources.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/resources.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/resources.resx b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/resources.resx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/resources.resx
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/resources.resx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/settings.designer.cs b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/settings.designer.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/settings.designer.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/settings.designer.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/settings.settings b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/settings.settings
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/properties/settings.settings
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/properties/settings.settings
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/regendataclasses.bat b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/regendataclasses.bat
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/regendataclasses.bat
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/regendataclasses.bat
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/service references/northwind/reference.cs b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/service references/northwind/reference.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/service references/northwind/reference.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/service references/northwind/reference.cs
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/service references/northwind/reference.datasvcmap b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/service references/northwind/reference.datasvcmap
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/service references/northwind/reference.datasvcmap
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/service references/northwind/service.edmx b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/service references/northwind/service.edmx
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/service references/northwind/service.edmx
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/service references/northwind/service.edmx
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/window1.xaml b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/window1.xaml
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/window1.xaml
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/window1.xaml
diff --git a/snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/window1.xaml.cs b/snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/window1.xaml.cs
similarity index 100%
rename from snippets/csharp/VS_Snippets_Misc/astoria quickstart client/cs/window1.xaml.cs
rename to snippets/csharp/VS_Snippets_Misc/astoria_quickstart_client/cs/window1.xaml.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj.user
deleted file mode 100644
index fe9e9b582e3..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj.user
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
-
- en-US
- false
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/astoria custom feeds vb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/astoria custom feeds vb.vbproj.user
deleted file mode 100644
index 75fd5b88472..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/astoria custom feeds vb.vbproj.user
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
- Default.aspx
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj.user
deleted file mode 100644
index a6b4976ec34..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj.user
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
- en-US
- false
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/upgradelog.xml b/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/upgradelog.xml
deleted file mode 100644
index 04b68921c80..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/upgradelog.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/linqprovidervb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/linqprovidervb.vbproj.user
deleted file mode 100644
index 9f4a4ee0a9f..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/linqprovidervb.vbproj.user
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
- Northwind.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/northwindclientvb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/northwindclientvb.vbproj.user
deleted file mode 100644
index 6687a9d1714..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/northwindclientvb.vbproj.user
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
-
- en-US
- false
- C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog.xml b/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog.xml
deleted file mode 100644
index baf4a7596bd..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog2.xml b/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog2.xml
deleted file mode 100644
index 387c0db6c95..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog3.xml b/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog3.xml
deleted file mode 100644
index f9eb13642e8..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog3.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog4.xml b/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog4.xml
deleted file mode 100644
index 9b557df972f..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/upgradelog4.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/clientbin/silverlightclient.xap b/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/clientbin/silverlightclient.xap
deleted file mode 100644
index 8d6d7f68baa..00000000000
Binary files a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/clientbin/silverlightclient.xap and /dev/null differ
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwinddataservicevb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwinddataservicevb.vbproj.user
deleted file mode 100644
index 9f4a4ee0a9f..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwinddataservicevb.vbproj.user
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
- Northwind.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photostreamingclientvb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photostreamingclientvb.vbproj.user
deleted file mode 100644
index 55f44b95fec..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photostreamingclientvb.vbproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoservicevb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoservicevb.vbproj.user
deleted file mode 100644
index a73b9180eba..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoservicevb.vbproj.user
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- PhotoData.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/northwindclientvb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/northwindclientvb.vbproj.user
deleted file mode 100644
index fe9e9b582e3..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/northwindclientvb.vbproj.user
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
-
- en-US
- false
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwindservicevb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwindservicevb.vbproj.user
deleted file mode 100644
index 9f4a4ee0a9f..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwindservicevb.vbproj.user
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
- Northwind.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj.user
deleted file mode 100644
index 6a34e7dcdf5..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj.user
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/customdataservicevb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/customdataservicevb.vbproj.user
deleted file mode 100644
index b8cb65a41a9..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/customdataservicevb.vbproj.user
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- ShowAllFiles
-
-
-
-
-
- OrderItems.svc
- SpecificPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/northwindstreamingclientvb.vbproj.user b/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/northwindstreamingclientvb.vbproj.user
deleted file mode 100644
index 55f44b95fec..00000000000
--- a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/northwindstreamingclientvb.vbproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/astoria custom feeds.sln b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/astoria custom feeds.sln
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/astoria custom feeds.sln
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/astoria custom feeds.sln
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/app.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/app.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/custom feed client.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/custom feed client.csproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/custom feed client.csproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/program.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/program.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/program.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/program.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/properties/assemblyinfo.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/properties/assemblyinfo.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/properties/assemblyinfo.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.datasvcmap b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/reference.datasvcmap
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/reference.datasvcmap
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/service.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/service.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/custom feed client/service references/northwind/service.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/custom feed client/service references/northwind/service.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/astoria custom feeds vb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/astoria custom feeds vb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/astoria custom feeds vb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/astoria custom feeds vb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/default.aspx b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/default.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/default.aspx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/default.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/default.aspx.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/default.aspx.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/default.aspx.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/default.aspx.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/default.aspx.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/default.aspx.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/default.aspx.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/default.aspx.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/application.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/application.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/application.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/application.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/application.myapp b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/application.myapp
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/myextensions/mywebextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/myextensions/mywebextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/myextensions/mywebextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/myextensions/mywebextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.objects.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.objects.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.objects.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.objects.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/northwind.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/northwind.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/orderitems.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/orderitems.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/orderitems.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/orderitems.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/orderitems.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/orderitems.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/orderitems.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/orderitems.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/web.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/web.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria custom feeds/vb/web.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_custom_feeds/vb/web.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/astoria linq provider.sln b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/astoria linq provider.sln
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/astoria linq provider.sln
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/astoria linq provider.sln
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/linqproviderclientcs.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/linqproviderclientcs.csproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/linqproviderclientcs.csproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/program.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/program.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/program.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/program.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/properties/assemblyinfo.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/properties/assemblyinfo.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/properties/assemblyinfo.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.datasvcmap b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/reference.datasvcmap
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/reference.datasvcmap
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/service.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/service.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/linqproviderclientcs/service references/northwind/service.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/linqproviderclientcs/service references/northwind/service.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/default.aspx b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/default.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/default.aspx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/default.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/default.aspx.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/default.aspx.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/default.aspx.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/default.aspx.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/default.aspx.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/default.aspx.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/default.aspx.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/default.aspx.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/linqprovidervb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/linqprovidervb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/linqprovidervb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/linqprovidervb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/application.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/application.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/application.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/application.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/application.myapp b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/application.myapp
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/myextensions/mywebextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/myextensions/mywebextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/myextensions/mywebextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/myextensions/mywebextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.dbml b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.dbml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.dbml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.dbml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.dbml.diagram b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.dbml.diagram
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.dbml.diagram
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.dbml.diagram
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.dbml.layout b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.dbml.layout
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.dbml.layout
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.dbml.layout
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/northwind.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/northwind.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/web.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/web.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria linq provider/vb/web.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_linq_provider/vb/web.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/codegenclasses.bat b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/codegenclasses.bat
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/codegenclasses.bat
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/codegenclasses.bat
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/app.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/app.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/application.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/application.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/application.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/application.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentials.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentials.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentials.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentials.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentials.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentials.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentials.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentials.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentialslogin.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentialslogin.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentialslogin.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentialslogin.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentialslogin.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentialslogin.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/clientcredentialslogin.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/clientcredentialslogin.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customeraddress.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customeraddress.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customeraddress.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customeraddress.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders2.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders2.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders2.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders2.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders2.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders2.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders2.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders2.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders2.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders2.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorders2.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorders2.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerordersasync.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerordersasync.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerordersasync.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerordersasync.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerordersasync.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerordersasync.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerordersasync.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerordersasync.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderscustom.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderscustom.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderscustom.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderscustom.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderscustom.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderscustom.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderscustom.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderscustom.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderscustom2.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderscustom2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderscustom2.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderscustom2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf2.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf2.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf2.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf2.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf2.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf2.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf2.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf2.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf3.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf3.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf3.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf3.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf3.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf3.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/customerorderswpf3.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/customerorderswpf3.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/application.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/application.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/application.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/application.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/application.myapp b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/application.myapp
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/datasources/northwindclient.northwindmodel.customers.datasource b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/datasources/northwindclient.northwindmodel.customers.datasource
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/datasources/northwindclient.northwindmodel.customers.datasource
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/datasources/northwindclient.northwindmodel.customers.datasource
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/northwind.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/northwind.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/northwind.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/northwind.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/northwindclientvb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/northwindclientvb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/northwindclientvb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/northwindclientvb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/program.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/program.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/program.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/program.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/salesorders.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/salesorders.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/salesorders.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/salesorders.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/salesorders.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/salesorders.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/salesorders.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/salesorders.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/service references/northwind/reference.datasvcmap b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/service references/northwind/reference.datasvcmap
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/service references/northwind/reference.datasvcmap
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/service references/northwind/reference.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/service references/northwind/reference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/service references/northwind/reference.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/service references/northwind/reference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/service references/northwind/service.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/service references/northwind/service.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/service references/northwind/service.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/service references/northwind/service.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/source.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/source.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind client/vb/source.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_client/vb/source.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoria.sln b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoria.sln
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoria.sln
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoria.sln
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoria.vsmdi b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoria.vsmdi
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoria.vsmdi
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoria.vsmdi
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoria1.vsmdi b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoria1.vsmdi
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoria1.vsmdi
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoria1.vsmdi
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/astoriasnippetscs.csproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/astoriasnippetscs.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/astoriasnippetscs.csproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/astoriasnippetscs.csproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddressnonentitytest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddressnonentitytest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddressnonentitytest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddressnonentitytest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddresstest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddresstest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customeraddresstest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customeraddresstest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorders2test.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorders2test.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorders2test.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorders2test.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerordersasynctest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerordersasynctest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerordersasynctest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerordersasynctest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderscustomtest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderscustomtest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderscustomtest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderscustomtest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderstest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderstest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderstest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderstest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf2test.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf2test.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf2test.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf2test.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf3test.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf3test.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpf3test.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpf3test.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpftest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpftest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/customerorderswpftest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/customerorderswpftest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/properties/assemblyinfo.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/properties/assemblyinfo.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/properties/assemblyinfo.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/salesorderstest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/salesorderstest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/salesorderstest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/salesorderstest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/sourcetest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/sourcetest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetscs/sourcetest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetscs/sourcetest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/applicationtest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/applicationtest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/applicationtest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/applicationtest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/astoriasnippetsvb.csproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/astoriasnippetsvb.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/astoriasnippetsvb.csproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/astoriasnippetsvb.csproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddressnonentitytest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddressnonentitytest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddressnonentitytest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddressnonentitytest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddresstest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddresstest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customeraddresstest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customeraddresstest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorders2test.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorders2test.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorders2test.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorders2test.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerordersasynctest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerordersasynctest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerordersasynctest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerordersasynctest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderscustomtest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderscustomtest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderscustomtest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderscustomtest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderstest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderstest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderstest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderstest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf2test.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf2test.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf2test.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf2test.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf3test.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf3test.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpf3test.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpf3test.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpftest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpftest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/customerorderswpftest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/customerorderswpftest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/properties/assemblyinfo.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/properties/assemblyinfo.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/properties/assemblyinfo.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/salesorderstest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/salesorderstest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/salesorderstest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/salesorderstest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/sourcevbtest.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/sourcevbtest.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/astoriasnippetsvb/sourcevbtest.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/astoriasnippetsvb/sourcevbtest.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/localtestrun.testrunconfig b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/localtestrun.testrunconfig
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/localtestrun.testrunconfig
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/localtestrun.testrunconfig
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/default.aspx b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/default.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/default.aspx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/default.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/default.aspx.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/default.aspx.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/default.aspx.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/default.aspx.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/default.aspx.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/default.aspx.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/default.aspx.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/default.aspx.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/application.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/application.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/application.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/application.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/application.myapp b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/application.myapp
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/myextensions/mywebextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/myextensions/mywebextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/myextensions/mywebextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/myextensions/mywebextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind2.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind2.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind2.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind2.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind2.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind2.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwind2.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwind2.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwinddataservicevb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwinddataservicevb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/northwinddataservicevb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/northwinddataservicevb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/web.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/web.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria northwind service/vb/web.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_northwind_service/vb/web.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/app.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/app.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/application.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/application.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/application.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/application.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/datasvcutil.exe.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/datasvcutil.exe.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/datasvcutil.exe.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/datasvcutil.exe.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/generatedataclasses.bat b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/generatedataclasses.bat
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/generatedataclasses.bat
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/generatedataclasses.bat
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/mainwindow.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/mainwindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/mainwindow.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/mainwindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/mainwindow.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/mainwindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/mainwindow.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/mainwindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photodata.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photodata.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photodata.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photodata.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photodetailswindow.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photodetailswindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photodetailswindow.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photodetailswindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photodetailswindow.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photodetailswindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photodetailswindow.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photodetailswindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photostreamingclientvb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photostreamingclientvb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photostreamingclientvb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photostreamingclientvb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photowindow.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photowindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photowindow.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photowindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photowindow.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photowindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/photowindow.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/photowindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/service references/photodata/reference.datasvcmap b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/service references/photodata/reference.datasvcmap
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/service references/photodata/reference.datasvcmap
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/service references/photodata/reference.datasvcmap
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/service references/photodata/reference.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/service references/photodata/reference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/service references/photodata/reference.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/service references/photodata/reference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/service references/photodata/service.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/service references/photodata/service.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming client/vb/service references/photodata/service.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_client/vb/service references/photodata/service.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/photoservice.sln b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/photoservice.sln
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/photoservice.sln
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/photoservice.sln
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image1 b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image1
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image1
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image1
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image1_thumb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image1_thumb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image1_thumb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image1_thumb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image2 b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image2
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image2
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image2
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image2_thumb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image2_thumb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image2_thumb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image2_thumb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image3 b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image3
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image3
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image3
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image3_thumb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image3_thumb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image3_thumb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image3_thumb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image4 b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image4
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image4
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image4
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image4_thumb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image4_thumb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/app_data/image4_thumb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/app_data/image4_thumb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/global.asax b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/global.asax
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/global.asax
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/global.asax
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/global.asax.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/global.asax.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/global.asax.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/global.asax.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/application.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/application.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/application.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/application.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/application.myapp b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/application.myapp
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/myextensions/mywebextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/myextensions/mywebextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/myextensions/mywebextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/myextensions/mywebextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photodata.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photodata.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photodata.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photodata.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photodata.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photodata.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photodata.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photodata.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photoinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photoinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoservicestreamprovider.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photoservicestreamprovider.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoservicestreamprovider.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photoservicestreamprovider.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoservicevb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photoservicevb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/photoservicevb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/photoservicevb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/web.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/web.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/web.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/web.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/web.debug.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/web.debug.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/web.debug.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/web.debug.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/web.release.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/web.release.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria photo streaming service/vb/web.release.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_photo_streaming_service/vb/web.release.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/app.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/app.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/app.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/app.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/application.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/application.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/application.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/application.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/northwind.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/northwind.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/northwind.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/northwind.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/northwindclientvb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/northwindclientvb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/northwindclientvb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/northwindclientvb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/regendataclasses.bat b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/regendataclasses.bat
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/regendataclasses.bat
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/regendataclasses.bat
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/service references/northwind/reference.datasvcmap b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/service references/northwind/reference.datasvcmap
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/service references/northwind/reference.datasvcmap
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/service references/northwind/reference.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/service references/northwind/reference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/service references/northwind/reference.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/service references/northwind/reference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/service references/northwind/service.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/service references/northwind/service.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/service references/northwind/service.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/service references/northwind/service.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/window1.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/window1.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/window1.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/window1.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/window1.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/window1.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart client/vb/window1.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_client/vb/window1.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/astoria quickstart.sln b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/astoria quickstart.sln
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/astoria quickstart.sln
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/astoria quickstart.sln
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/default.aspx b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/default.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/default.aspx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/default.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/default.aspx.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/default.aspx.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/default.aspx.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/default.aspx.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/default.aspx.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/default.aspx.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/default.aspx.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/default.aspx.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/application.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/application.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/application.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/application.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/application.myapp b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/application.myapp
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/myextensions/mywebextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/myextensions/mywebextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/myextensions/mywebextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/myextensions/mywebextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwind.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwind.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwindservicevb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwindservicevb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/northwindservicevb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/northwindservicevb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/web.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/web.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria quickstart service/vb/web.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_quickstart_service/vb/web.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/astoria reflection provider.sln b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/astoria reflection provider.sln
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/astoria reflection provider.sln
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/astoria reflection provider.sln
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/customdataserviceclient.csproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/customdataserviceclient.csproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/customdataserviceclient.csproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/program.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/program.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/program.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/program.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/properties/assemblyinfo.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/properties/assemblyinfo.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/properties/assemblyinfo.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/properties/assemblyinfo.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/service references/orderitems/reference.cs b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/service references/orderitems/reference.cs
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/service references/orderitems/reference.cs
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/service references/orderitems/reference.cs
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/service references/orderitems/reference.datasvcmap b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/service references/orderitems/reference.datasvcmap
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/service references/orderitems/reference.datasvcmap
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/service references/orderitems/reference.datasvcmap
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/service references/orderitems/service.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/service references/orderitems/service.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/customdataserviceclient/service references/orderitems/service.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/customdataserviceclient/service references/orderitems/service.edmx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/customdataservicevb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/customdataservicevb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/customdataservicevb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/customdataservicevb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/default.aspx b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/default.aspx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/default.aspx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/default.aspx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/default.aspx.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/default.aspx.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/default.aspx.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/default.aspx.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/default.aspx.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/default.aspx.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/default.aspx.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/default.aspx.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/iupdatable.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/iupdatable.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/iupdatable.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/iupdatable.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/application.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/application.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/application.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/application.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/application.myapp b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/application.myapp
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/application.myapp
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/application.myapp
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/myextensions/mywebextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/myextensions/mywebextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/myextensions/mywebextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/myextensions/mywebextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/orderitems.svc b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/orderitems.svc
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/orderitems.svc
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/orderitems.svc
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/orderitems.svc.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/orderitems.svc.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/orderitems.svc.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/orderitems.svc.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/web.config b/snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/web.config
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria reflection provider/vb/web.config
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_reflection_provider/vb/web.config
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/application.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/application.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/application.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/application.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/application.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/application.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/application.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/application.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/customerphotowindow.xaml b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/customerphotowindow.xaml
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/customerphotowindow.xaml
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/customerphotowindow.xaml
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/customerphotowindow.xaml.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/customerphotowindow.xaml.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/customerphotowindow.xaml.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/customerphotowindow.xaml.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/app.manifest b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/app.manifest
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/app.manifest
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/app.manifest
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/assemblyinfo.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/assemblyinfo.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/assemblyinfo.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/assemblyinfo.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/myextensions/mywpfextension.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/myextensions/mywpfextension.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/myextensions/mywpfextension.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/myextensions/mywpfextension.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/resources.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/resources.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/resources.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/resources.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/resources.resx b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/resources.resx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/resources.resx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/resources.resx
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/settings.designer.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/settings.designer.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/settings.designer.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/settings.designer.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/settings.settings b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/settings.settings
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/my project/settings.settings
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/my project/settings.settings
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/northwindstreamingclientvb.vbproj b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/northwindstreamingclientvb.vbproj
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/northwindstreamingclientvb.vbproj
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/northwindstreamingclientvb.vbproj
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/service references/northwind/reference.datasvcmap b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/service references/northwind/reference.datasvcmap
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/service references/northwind/reference.datasvcmap
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/service references/northwind/reference.datasvcmap
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/service references/northwind/reference.vb b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/service references/northwind/reference.vb
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/service references/northwind/reference.vb
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/service references/northwind/reference.vb
diff --git a/snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/service references/northwind/service.edmx b/snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/service references/northwind/service.edmx
similarity index 100%
rename from snippets/visualbasic/VS_Snippets_Misc/astoria streaming client/vb/service references/northwind/service.edmx
rename to snippets/visualbasic/VS_Snippets_Misc/astoria_streaming_client/vb/service references/northwind/service.edmx