diff --git a/solutions/Virtual-Assistant/src/csharp/NuGet.Config b/skills/src/csharp/NuGet.Config
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/NuGet.Config
rename to skills/src/csharp/NuGet.Config
diff --git a/skills/src/csharp/Skills.sln b/skills/src/csharp/Skills.sln
new file mode 100644
index 0000000000..a4882d2735
--- /dev/null
+++ b/skills/src/csharp/Skills.sln
@@ -0,0 +1,185 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28606.126
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skills", "Skills", "{34280F2E-60EB-4566-9ECD-56F114372037}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{15B08548-1311-4749-8816-186C3268386E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{B001AB8C-3458-44CD-962B-E1F4D5CABF46}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experimental", "Experimental", "{3665D242-1A88-4860-B148-BAB695B7B5E4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewsSkill", "experimental\newsskill\NewsSkill.csproj", "{ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RestaurantBooking", "experimental\restaurantbooking\RestaurantBooking.csproj", "{341E0642-7E94-474C-96A5-6ACE02F254A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Skills", "..\..\..\lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills\Microsoft.Bot.Builder.Skills.csproj", "{95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Solutions", "..\..\..\lib\csharp\microsoft.bot.builder.solutions\microsoft.bot.builder.solutions\Microsoft.Bot.Builder.Solutions.csproj", "{F7B1079A-AC52-4737-BE77-C47EFD1AE965}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkill", "automotiveskill\automotiveskill\AutomotiveSkill.csproj", "{F5F254ED-D82B-47AF-A894-B45507787C71}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkillTest", "automotiveskill\automotiveskilltest\AutomotiveSkillTest.csproj", "{43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkill", "calendarskill\calendarskill\CalendarSkill.csproj", "{699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkillTest", "calendarskill\calendarskilltest\CalendarSkillTest.csproj", "{89E89E9E-C897-4890-A0BC-48D4EE6931D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkill", "emailskill\emailskill\EmailSkill.csproj", "{C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkillTest", "emailskill\emailskilltest\EmailSkillTest.csproj", "{5147C192-12C7-4D10-9F80-4EE17838A5A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkill", "pointofinterestskill\pointofinterestskill\PointOfInterestSkill.csproj", "{ABA18EBC-03B6-4FD7-928C-AFD3C3365621}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkillTests", "pointofinterestskill\pointofinterestskilltests\PointOfInterestSkillTests.csproj", "{30E3BEA1-CC07-4E0E-9671-28DC0C32F828}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkill", "todoskill\todoskill\ToDoSkill.csproj", "{3E44915A-1A7A-4229-9B7F-291FFC0EC075}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkillTest", "todoskill\todoskilltest\ToDoSkillTest.csproj", "{9A2677E6-21E5-47EE-A42F-9D25079496D8}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug - NuGet Packages|Any CPU = Debug - NuGet Packages|Any CPU
+ Debug|Any CPU = Debug|Any CPU
+ Documentation|Any CPU = Documentation|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {341E0642-7E94-474C-96A5-6ACE02F254A4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug - NuGet Packages|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Debug - NuGet Packages|Any CPU.Build.0 = Debug - NuGet Packages|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug - NuGet Packages|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Debug - NuGet Packages|Any CPU.Build.0 = Debug - NuGet Packages|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F5F254ED-D82B-47AF-A894-B45507787C71}.Release|Any CPU.Build.0 = Release|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621}.Release|Any CPU.Build.0 = Release|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5} = {3665D242-1A88-4860-B148-BAB695B7B5E4}
+ {341E0642-7E94-474C-96A5-6ACE02F254A4} = {3665D242-1A88-4860-B148-BAB695B7B5E4}
+ {95D8C049-3D9B-4A75-96DA-DB68D1BE5DB8} = {B001AB8C-3458-44CD-962B-E1F4D5CABF46}
+ {F7B1079A-AC52-4737-BE77-C47EFD1AE965} = {B001AB8C-3458-44CD-962B-E1F4D5CABF46}
+ {F5F254ED-D82B-47AF-A894-B45507787C71} = {34280F2E-60EB-4566-9ECD-56F114372037}
+ {43F6EEC7-E7BA-40A3-A895-DD9C9EC93FF0} = {15B08548-1311-4749-8816-186C3268386E}
+ {699B06B9-5F06-49F1-B63B-4E7F4BE49B9C} = {34280F2E-60EB-4566-9ECD-56F114372037}
+ {89E89E9E-C897-4890-A0BC-48D4EE6931D2} = {15B08548-1311-4749-8816-186C3268386E}
+ {C0CE241E-B86B-43D1-A3DE-14FF6137ECD4} = {34280F2E-60EB-4566-9ECD-56F114372037}
+ {5147C192-12C7-4D10-9F80-4EE17838A5A4} = {15B08548-1311-4749-8816-186C3268386E}
+ {ABA18EBC-03B6-4FD7-928C-AFD3C3365621} = {34280F2E-60EB-4566-9ECD-56F114372037}
+ {30E3BEA1-CC07-4E0E-9671-28DC0C32F828} = {15B08548-1311-4749-8816-186C3268386E}
+ {3E44915A-1A7A-4229-9B7F-291FFC0EC075} = {34280F2E-60EB-4566-9ECD-56F114372037}
+ {9A2677E6-21E5-47EE-A42F-9D25079496D8} = {15B08548-1311-4749-8816-186C3268386E}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {7B849B7E-CCF5-4031-91F7-CA835433B457}
+ EndGlobalSection
+EndGlobal
diff --git a/skills/src/csharp/VirtualAssistant.ruleset b/skills/src/csharp/VirtualAssistant.ruleset
new file mode 100644
index 0000000000..a157021297
--- /dev/null
+++ b/skills/src/csharp/VirtualAssistant.ruleset
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/.filenesting.json b/skills/src/csharp/automotiveskill/automotiveskill/.filenesting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/.filenesting.json
rename to skills/src/csharp/automotiveskill/automotiveskill/.filenesting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Adapters/AutomotiveSkillAdapter.cs b/skills/src/csharp/automotiveskill/automotiveskill/Adapters/AutomotiveSkillAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Adapters/AutomotiveSkillAdapter.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Adapters/AutomotiveSkillAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Adapters/DefaultAdapter.cs b/skills/src/csharp/automotiveskill/automotiveskill/Adapters/DefaultAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Adapters/DefaultAdapter.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Adapters/DefaultAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj b/skills/src/csharp/automotiveskill/automotiveskill/AutomotiveSkill.csproj
similarity index 94%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj
rename to skills/src/csharp/automotiveskill/automotiveskill/AutomotiveSkill.csproj
index 191f645256..a5f44750fd 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj
+++ b/skills/src/csharp/automotiveskill/automotiveskill/AutomotiveSkill.csproj
@@ -3,7 +3,7 @@
netcoreapp2.2
6a3184c3-074e-45b9-ad93-eceb8268ec01
- ..\..\..\VirtualAssistant.ruleset
+ ..\..\VirtualAssistant.ruleset
@@ -105,8 +105,8 @@
-
-
+
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Bots/DialogBot.cs b/skills/src/csharp/automotiveskill/automotiveskill/Bots/DialogBot.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Bots/DialogBot.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Bots/DialogBot.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Content/ListSelection.json b/skills/src/csharp/automotiveskill/automotiveskill/Content/ListSelection.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Content/ListSelection.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Content/ListSelection.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Content/SettingChoice.json b/skills/src/csharp/automotiveskill/automotiveskill/Content/SettingChoice.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Content/SettingChoice.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Content/SettingChoice.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Controllers/BotController.cs b/skills/src/csharp/automotiveskill/automotiveskill/Controllers/BotController.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Controllers/BotController.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Controllers/BotController.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/available_settings.yaml b/skills/src/csharp/automotiveskill/automotiveskill/Data/available_settings.yaml
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/available_settings.yaml
rename to skills/src/csharp/automotiveskill/automotiveskill/Data/available_settings.yaml
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/normalization/amount_percentage.tsv b/skills/src/csharp/automotiveskill/automotiveskill/Data/normalization/amount_percentage.tsv
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/normalization/amount_percentage.tsv
rename to skills/src/csharp/automotiveskill/automotiveskill/Data/normalization/amount_percentage.tsv
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/normalization/amount_type.tsv b/skills/src/csharp/automotiveskill/automotiveskill/Data/normalization/amount_type.tsv
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/normalization/amount_type.tsv
rename to skills/src/csharp/automotiveskill/automotiveskill/Data/normalization/amount_type.tsv
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/normalization/amount_unit.tsv b/skills/src/csharp/automotiveskill/automotiveskill/Data/normalization/amount_unit.tsv
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/normalization/amount_unit.tsv
rename to skills/src/csharp/automotiveskill/automotiveskill/Data/normalization/amount_unit.tsv
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/setting_alternative_names.yaml b/skills/src/csharp/automotiveskill/automotiveskill/Data/setting_alternative_names.yaml
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Data/setting_alternative_names.yaml
rename to skills/src/csharp/automotiveskill/automotiveskill/Data/setting_alternative_names.yaml
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs b/skills/src/csharp/automotiveskill/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Dialogs/MainDialog.cs b/skills/src/csharp/automotiveskill/automotiveskill/Dialogs/MainDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Dialogs/MainDialog.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Dialogs/MainDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Dialogs/VehicleSettingsDialog.cs b/skills/src/csharp/automotiveskill/automotiveskill/Dialogs/VehicleSettingsDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Dialogs/VehicleSettingsDialog.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Dialogs/VehicleSettingsDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AutomotiveSkillState.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/AutomotiveSkillState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AutomotiveSkillState.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/AutomotiveSkillState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AvailableSetting.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/AvailableSetting.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AvailableSetting.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/AvailableSetting.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AvailableSettingAmount.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/AvailableSettingAmount.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AvailableSettingAmount.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/AvailableSettingAmount.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AvailableSettingValue.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/AvailableSettingValue.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/AvailableSettingValue.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/AvailableSettingValue.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/MatchResult.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/MatchResult.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/MatchResult.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/MatchResult.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/MatchableBagOfTokens.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/MatchableBagOfTokens.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/MatchableBagOfTokens.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/MatchableBagOfTokens.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/OAuthConnection.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/OAuthConnection.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/OAuthConnection.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/OAuthConnection.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/ScoredMatchableBagOfTokens.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/ScoredMatchableBagOfTokens.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/ScoredMatchableBagOfTokens.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/ScoredMatchableBagOfTokens.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SelectableSettingValue.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SelectableSettingValue.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SelectableSettingValue.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SelectableSettingValue.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingAlternativeNames.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SettingAlternativeNames.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingAlternativeNames.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SettingAlternativeNames.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingAmount.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SettingAmount.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingAmount.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SettingAmount.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingChange.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SettingChange.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingChange.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SettingChange.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingMatch.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SettingMatch.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingMatch.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SettingMatch.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingOperation.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SettingOperation.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingOperation.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SettingOperation.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingOperationStatus.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SettingOperationStatus.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingOperationStatus.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SettingOperationStatus.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingStatus.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/SettingStatus.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/SettingStatus.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/SettingStatus.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/Validation.cs b/skills/src/csharp/automotiveskill/automotiveskill/Models/Validation.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Models/Validation.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Models/Validation.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Program.cs b/skills/src/csharp/automotiveskill/automotiveskill/Program.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Program.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Program.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Properties/launchSettings.json b/skills/src/csharp/automotiveskill/automotiveskill/Properties/launchSettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Properties/launchSettings.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Properties/launchSettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/ResponseIdCollection.t4 b/skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/ResponseIdCollection.t4
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/ResponseIdCollection.t4
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/Shared/ResponseIdCollection.t4
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx b/skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx
rename to skills/src/csharp/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/BotServices.cs b/skills/src/csharp/automotiveskill/automotiveskill/Services/BotServices.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/BotServices.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Services/BotServices.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/BotSettings.cs b/skills/src/csharp/automotiveskill/automotiveskill/Services/BotSettings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/BotSettings.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Services/BotSettings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsChangeConfirmationLuis.cs b/skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsChangeConfirmationLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsChangeConfirmationLuis.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsChangeConfirmationLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsLuis.cs b/skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsLuis.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsNameSelectionLuis.cs b/skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsNameSelectionLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsNameSelectionLuis.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsNameSelectionLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsValueSelectionLuis.cs b/skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsValueSelectionLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Services/VehicleSettingsValueSelectionLuis.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Services/VehicleSettingsValueSelectionLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/SkillWhitelist.cs b/skills/src/csharp/automotiveskill/automotiveskill/SkillWhitelist.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/SkillWhitelist.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/SkillWhitelist.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Startup.cs b/skills/src/csharp/automotiveskill/automotiveskill/Startup.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Startup.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Startup.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Actions.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/Actions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Actions.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/Actions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Chunk.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/Chunk.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Chunk.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/Chunk.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/EntityNormalizer.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/EntityNormalizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/EntityNormalizer.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/EntityNormalizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/NumberNormalizer.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/NumberNormalizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/NumberNormalizer.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/NumberNormalizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Parser.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/Parser.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Parser.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/Parser.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingFilter.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingFilter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingFilter.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingFilter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingList.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingList.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingList.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingList.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingMatcher.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingMatcher.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingMatcher.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingMatcher.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingsEvents.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingsEvents.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/SettingsEvents.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/SettingsEvents.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Util.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/Util.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/Util.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/Util.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/YamlParseException.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/YamlParseException.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/YamlParseException.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/YamlParseException.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/YamlParseUtil.cs b/skills/src/csharp/automotiveskill/automotiveskill/Utilities/YamlParseUtil.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Utilities/YamlParseUtil.cs
rename to skills/src/csharp/automotiveskill/automotiveskill/Utilities/YamlParseUtil.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/appsettings.json b/skills/src/csharp/automotiveskill/automotiveskill/appsettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/appsettings.json
rename to skills/src/csharp/automotiveskill/automotiveskill/appsettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/cognitivemodels.json b/skills/src/csharp/automotiveskill/automotiveskill/cognitivemodels.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/cognitivemodels.json
rename to skills/src/csharp/automotiveskill/automotiveskill/cognitivemodels.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/manifestTemplate.json b/skills/src/csharp/automotiveskill/automotiveskill/manifestTemplate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/manifestTemplate.json
rename to skills/src/csharp/automotiveskill/automotiveskill/manifestTemplate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/readme.md b/skills/src/csharp/automotiveskill/automotiveskill/readme.md
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/readme.md
rename to skills/src/csharp/automotiveskill/automotiveskill/readme.md
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/default.htm b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/default.htm
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/default.htm
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/default.htm
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_Car.png b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_Car.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_Car.png
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_Car.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_Climate.png b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_Climate.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_Climate.png
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_Climate.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_House.png b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_House.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_House.png
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_House.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_Music.png b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_Music.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_Music.png
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_Music.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_phone.png b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_phone.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Black_phone.png
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Black_phone.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Navigation_Car.png b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Navigation_Car.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/Navigation_Car.png
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/Navigation_Car.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/settingcog.jpg b/skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/settingcog.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/wwwroot/images/settingcog.jpg
rename to skills/src/csharp/automotiveskill/automotiveskill/wwwroot/images/settingcog.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/API/SettingFilterTests.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/API/SettingFilterTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/API/SettingFilterTests.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/API/SettingFilterTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj b/skills/src/csharp/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
similarity index 84%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
rename to skills/src/csharp/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
index 99b5c0a995..29e5c223a0 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
+++ b/skills/src/csharp/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
@@ -25,7 +25,6 @@
-
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/AutomotiveSkillTestBase.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/AutomotiveSkillTestBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/AutomotiveSkillTestBase.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Flow/AutomotiveSkillTestBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockGeneralIntent.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockGeneralIntent.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockGeneralIntent.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockGeneralIntent.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockLuisRecognizer.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockLuisRecognizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockLuisRecognizer.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockLuisRecognizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsIntent.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsIntent.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsIntent.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsIntent.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsNameIntent.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsNameIntent.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsNameIntent.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsNameIntent.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsValueIntent.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsValueIntent.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsValueIntent.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsValueIntent.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Yaml/YamlParseUtilTests.cs b/skills/src/csharp/automotiveskill/automotiveskilltest/Yaml/YamlParseUtilTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Yaml/YamlParseUtilTests.cs
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Yaml/YamlParseUtilTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Yaml/test_available_settings.yaml b/skills/src/csharp/automotiveskill/automotiveskilltest/Yaml/test_available_settings.yaml
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Yaml/test_available_settings.yaml
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Yaml/test_available_settings.yaml
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Yaml/test_setting_alternative_names.yaml b/skills/src/csharp/automotiveskill/automotiveskilltest/Yaml/test_setting_alternative_names.yaml
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskilltest/Yaml/test_setting_alternative_names.yaml
rename to skills/src/csharp/automotiveskill/automotiveskilltest/Yaml/test_setting_alternative_names.yaml
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/.filenesting.json b/skills/src/csharp/calendarskill/calendarskill/.filenesting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/.filenesting.json
rename to skills/src/csharp/calendarskill/calendarskill/.filenesting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Adapters/CalendarSkillAdapter.cs b/skills/src/csharp/calendarskill/calendarskill/Adapters/CalendarSkillAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Adapters/CalendarSkillAdapter.cs
rename to skills/src/csharp/calendarskill/calendarskill/Adapters/CalendarSkillAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Adapters/DefaultAdapter.cs b/skills/src/csharp/calendarskill/calendarskill/Adapters/DefaultAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Adapters/DefaultAdapter.cs
rename to skills/src/csharp/calendarskill/calendarskill/Adapters/DefaultAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Bots/DialogBot.cs b/skills/src/csharp/calendarskill/calendarskill/Bots/DialogBot.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Bots/DialogBot.cs
rename to skills/src/csharp/calendarskill/calendarskill/Bots/DialogBot.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj b/skills/src/csharp/calendarskill/calendarskill/CalendarSkill.csproj
similarity index 97%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj
rename to skills/src/csharp/calendarskill/calendarskill/CalendarSkill.csproj
index c85630913f..b07056b952 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj
+++ b/skills/src/csharp/calendarskill/calendarskill/CalendarSkill.csproj
@@ -3,7 +3,7 @@
netcoreapp2.2
2bdd896c-393e-47c4-b6b9-a47238550b83
- ..\..\..\VirtualAssistant.ruleset
+ ..\..\VirtualAssistant.ruleset
@@ -183,8 +183,8 @@
-
-
+
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarCard.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarCard.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarCardNoJoinButton.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarCardNoJoinButton.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarCardNoJoinButton.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarCardNoJoinButton.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDate.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDate.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarDate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetail.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetail.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetail.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetail.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetailNoJoinButton.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailNoJoinButton.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarDetailNoJoinButton.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailNoJoinButton.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarItem.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarItem.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarItem.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarItem.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarOverview.json b/skills/src/csharp/calendarskill/calendarskill/Content/CalendarOverview.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Content/CalendarOverview.json
rename to skills/src/csharp/calendarskill/calendarskill/Content/CalendarOverview.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Controllers/BotController.cs b/skills/src/csharp/calendarskill/calendarskill/Controllers/BotController.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Controllers/BotController.cs
rename to skills/src/csharp/calendarskill/calendarskill/Controllers/BotController.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/CalendarSkillDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/CalendarSkillDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/CalendarSkillDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/CalendarSkillDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/ChangeEventStatusDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/ChangeEventStatusDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/ChangeEventStatusDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/ChangeEventStatusDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/ConnectToMeetingDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/ConnectToMeetingDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/ConnectToMeetingDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/ConnectToMeetingDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/FindContactDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/FindContactDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/FindContactDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/FindContactDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/MainDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/MainDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/MainDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/MainDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/SummaryDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/SummaryDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/SummaryDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/SummaryDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/TimeRemainingDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/TimeRemainingDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/TimeRemainingDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/TimeRemainingDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/UpcomingEventDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/UpcomingEventDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/UpcomingEventDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/UpcomingEventDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs b/skills/src/csharp/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs
rename to skills/src/csharp/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Extensions/UserEx.cs b/skills/src/csharp/calendarskill/calendarskill/Extensions/UserEx.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Extensions/UserEx.cs
rename to skills/src/csharp/calendarskill/calendarskill/Extensions/UserEx.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/AskParameterModel.cs b/skills/src/csharp/calendarskill/calendarskill/Models/AskParameterModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/AskParameterModel.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/AskParameterModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarCardData.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarCardData.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarDateCardData.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarDateCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarDateCardData.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarDateCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarDetailCardData.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarDetailCardData.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarDetailContainerCardData.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailContainerCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarDetailContainerCardData.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailContainerCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarItemCardData.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarItemCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarItemCardData.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarItemCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarMeetingListCardData.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarMeetingListCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarMeetingListCardData.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarMeetingListCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarSkillDialogOptions.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarSkillDialogOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarSkillDialogOptions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarSkillDialogOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarSkillState.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CalendarSkillState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CalendarSkillState.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CalendarSkillState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CreateEventStateModel.cs b/skills/src/csharp/calendarskill/calendarskill/Models/CreateEventStateModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/CreateEventStateModel.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/CreateEventStateModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/EventModel.cs b/skills/src/csharp/calendarskill/calendarskill/Models/EventModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/EventModel.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/EventModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/GoogleAttendeeStatus.cs b/skills/src/csharp/calendarskill/calendarskill/Models/GoogleAttendeeStatus.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/GoogleAttendeeStatus.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/GoogleAttendeeStatus.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/PersonModel.cs b/skills/src/csharp/calendarskill/calendarskill/Models/PersonModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/PersonModel.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/PersonModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/ShowMeetingsDialogOptions.cs b/skills/src/csharp/calendarskill/calendarskill/Models/ShowMeetingsDialogOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/ShowMeetingsDialogOptions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/ShowMeetingsDialogOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/UpdateAddressDialogOptions.cs b/skills/src/csharp/calendarskill/calendarskill/Models/UpdateAddressDialogOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/UpdateAddressDialogOptions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/UpdateAddressDialogOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/UpdateDateTimeDialogOptions.cs b/skills/src/csharp/calendarskill/calendarskill/Models/UpdateDateTimeDialogOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/UpdateDateTimeDialogOptions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/UpdateDateTimeDialogOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/UpdateUserNameDialogOptions.cs b/skills/src/csharp/calendarskill/calendarskill/Models/UpdateUserNameDialogOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Models/UpdateUserNameDialogOptions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Models/UpdateUserNameDialogOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Proactive/CheckUpcomingEventHandler.cs b/skills/src/csharp/calendarskill/calendarskill/Proactive/CheckUpcomingEventHandler.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Proactive/CheckUpcomingEventHandler.cs
rename to skills/src/csharp/calendarskill/calendarskill/Proactive/CheckUpcomingEventHandler.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Program.cs b/skills/src/csharp/calendarskill/calendarskill/Program.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Program.cs
rename to skills/src/csharp/calendarskill/calendarskill/Program.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/DatePrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/DatePrompt.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/DatePrompt.cs
rename to skills/src/csharp/calendarskill/calendarskill/Prompts/DatePrompt.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/DurationPrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/DurationPrompt.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/DurationPrompt.cs
rename to skills/src/csharp/calendarskill/calendarskill/Prompts/DurationPrompt.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/GetEventPrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/GetEventPrompt.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/GetEventPrompt.cs
rename to skills/src/csharp/calendarskill/calendarskill/Prompts/GetEventPrompt.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/GetRecreateInfoPrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/GetRecreateInfoPrompt.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/GetRecreateInfoPrompt.cs
rename to skills/src/csharp/calendarskill/calendarskill/Prompts/GetRecreateInfoPrompt.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/Options/GetEventOptions.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/Options/GetEventOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/Options/GetEventOptions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Prompts/Options/GetEventOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/Options/NoSkipPromptOptions.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/Options/NoSkipPromptOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/Options/NoSkipPromptOptions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Prompts/Options/NoSkipPromptOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/TimePrompt.cs b/skills/src/csharp/calendarskill/calendarskill/Prompts/TimePrompt.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Prompts/TimePrompt.cs
rename to skills/src/csharp/calendarskill/calendarskill/Prompts/TimePrompt.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Properties/launchSettings.json b/skills/src/csharp/calendarskill/calendarskill/Properties/launchSettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Properties/launchSettings.json
rename to skills/src/csharp/calendarskill/calendarskill/Properties/launchSettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.resx b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.resx
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/ResponseIdCollection.t4 b/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/ResponseIdCollection.t4
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/Responses/Shared/ResponseIdCollection.t4
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Shared/ResponseIdCollection.t4
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Summary/SummaryResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json b/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json
rename to skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/BotServices.cs b/skills/src/csharp/calendarskill/calendarskill/Services/BotServices.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/BotServices.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/BotServices.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/BotSettings.cs b/skills/src/csharp/calendarskill/calendarskill/Services/BotSettings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/BotSettings.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/BotSettings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/CalendarLuis.cs b/skills/src/csharp/calendarskill/calendarskill/Services/CalendarLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/CalendarLuis.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/CalendarLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/CalendarService.cs b/skills/src/csharp/calendarskill/calendarskill/Services/CalendarService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/CalendarService.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/CalendarService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs b/skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/GoogleAPI/GoogleClient.cs b/skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/GoogleAPI/GoogleClient.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/GoogleAPI/GooglePeopleService.cs b/skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GooglePeopleService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/GoogleAPI/GooglePeopleService.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GooglePeopleService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/ICalendarService.cs b/skills/src/csharp/calendarskill/calendarskill/Services/ICalendarService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/ICalendarService.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/ICalendarService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/IServiceManager.cs b/skills/src/csharp/calendarskill/calendarskill/Services/IServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/IServiceManager.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/IServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/IUserService.cs b/skills/src/csharp/calendarskill/calendarskill/Services/IUserService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/IUserService.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/IUserService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/MSGraphAPI/GraphClient.cs b/skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/GraphClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/MSGraphAPI/GraphClient.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/GraphClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs b/skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs b/skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/ServiceManager.cs b/skills/src/csharp/calendarskill/calendarskill/Services/ServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/ServiceManager.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/ServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/UserService.cs b/skills/src/csharp/calendarskill/calendarskill/Services/UserService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Services/UserService.cs
rename to skills/src/csharp/calendarskill/calendarskill/Services/UserService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/SkillWhitelist.cs b/skills/src/csharp/calendarskill/calendarskill/SkillWhitelist.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/SkillWhitelist.cs
rename to skills/src/csharp/calendarskill/calendarskill/SkillWhitelist.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Startup.cs b/skills/src/csharp/calendarskill/calendarskill/Startup.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Startup.cs
rename to skills/src/csharp/calendarskill/calendarskill/Startup.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/Actions.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/Actions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/Actions.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/Actions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/AdaptiveCardHelper.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/AdaptiveCardHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/AdaptiveCardHelper.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/AdaptiveCardHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/AskParameterTemplate.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/AskParameterTemplate.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/AskParameterTemplate.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/AskParameterTemplate.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/CalendarCommonUtil.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarCommonUtil.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/CalendarCommonUtil.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarCommonUtil.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/CalendarConfigData.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarConfigData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/CalendarConfigData.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarConfigData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/CreateEventWhiteList.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/CreateEventWhiteList.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/CreateEventWhiteList.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/CreateEventWhiteList.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/DateTimeHelper.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/DateTimeHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/DateTimeHelper.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/DateTimeHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/DisplayHelper.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/DisplayHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/DisplayHelper.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/DisplayHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/SpeakHelper.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/SpeakHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/SpeakHelper.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/SpeakHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/TimeConverter.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/TimeConverter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/TimeConverter.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/TimeConverter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/TimeZoneConverter.cs b/skills/src/csharp/calendarskill/calendarskill/Utilities/TimeZoneConverter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/TimeZoneConverter.cs
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/TimeZoneConverter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/WindowsIanaMapping b/skills/src/csharp/calendarskill/calendarskill/Utilities/WindowsIanaMapping
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Utilities/WindowsIanaMapping
rename to skills/src/csharp/calendarskill/calendarskill/Utilities/WindowsIanaMapping
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/appsettings.json b/skills/src/csharp/calendarskill/calendarskill/appsettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/appsettings.json
rename to skills/src/csharp/calendarskill/calendarskill/appsettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/cognitivemodels.json b/skills/src/csharp/calendarskill/calendarskill/cognitivemodels.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/cognitivemodels.json
rename to skills/src/csharp/calendarskill/calendarskill/cognitivemodels.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/manifestTemplate.json b/skills/src/csharp/calendarskill/calendarskill/manifestTemplate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/manifestTemplate.json
rename to skills/src/csharp/calendarskill/calendarskill/manifestTemplate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/readme.md b/skills/src/csharp/calendarskill/calendarskill/readme.md
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/readme.md
rename to skills/src/csharp/calendarskill/calendarskill/readme.md
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/wwwroot/default.htm b/skills/src/csharp/calendarskill/calendarskill/wwwroot/default.htm
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/wwwroot/default.htm
rename to skills/src/csharp/calendarskill/calendarskill/wwwroot/default.htm
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/CalendarServiceBaseTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceBaseTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/CalendarServiceBaseTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceBaseTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/CalendarServiceGoogleTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceGoogleTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/CalendarServiceGoogleTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceGoogleTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/CalendarServiceMSGrapghTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceMSGrapghTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/CalendarServiceMSGrapghTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceMSGrapghTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseServiceClient.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseServiceClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseServiceClient.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseServiceClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseUserClient.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseUserClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseUserClient.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseUserClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/ServiceManagerTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/ServiceManagerTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/ServiceManagerTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/ServiceManagerTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/UserServiceBaseTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceBaseTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/UserServiceBaseTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceBaseTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/UserServiceGoogleTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceGoogleTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/UserServiceGoogleTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceGoogleTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/UserServiceMSGraphTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceMSGraphTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/API/UserServiceMSGraphTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceMSGraphTests.cs
diff --git a/skills/src/csharp/calendarskill/calendarskilltest/CalendarSkillTest.csproj b/skills/src/csharp/calendarskill/calendarskilltest/CalendarSkillTest.csproj
new file mode 100644
index 0000000000..11e0a5a26c
--- /dev/null
+++ b/skills/src/csharp/calendarskill/calendarskilltest/CalendarSkillTest.csproj
@@ -0,0 +1,25 @@
+
+
+
+ netcoreapp2.2
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Common/TimeConverterTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Common/TimeConverterTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Common/TimeConverterTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Common/TimeConverterTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Common/TimeZoneConverterTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Common/TimeZoneConverterTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Common/TimeZoneConverterTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Common/TimeZoneConverterTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/CalendarBotTestBase.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/CalendarBotTestBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/CalendarBotTestBase.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/CalendarBotTestBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/DeleteCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/DeleteCalendarFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/DeleteCalendarFlowTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/DeleteCalendarFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarService.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarService.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarServiceManager.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarServiceManager.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockLuisRecognizer.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockLuisRecognizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockLuisRecognizer.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockLuisRecognizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockServiceManager.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockServiceManager.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockSkillConfiguration.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockSkillConfiguration.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockSkillConfiguration.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockSkillConfiguration.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockUserService.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockUserService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Fakes/MockUserService.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockUserService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Models/MeetingAdaptiveCard.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Models/MeetingAdaptiveCard.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Models/MeetingAdaptiveCard.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Models/MeetingAdaptiveCard.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Strings/Strings.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Strings/Strings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Strings/Strings.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Strings/Strings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/BaseTestUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/BaseTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/BaseTestUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/BaseTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/ConnectToMeetingUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ConnectToMeetingUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/ConnectToMeetingUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ConnectToMeetingUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/CreateMeetingTestUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/CreateMeetingTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/CreateMeetingTestUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/CreateMeetingTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/DeleteMeetingTestUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/DeleteMeetingTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/DeleteMeetingTestUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/DeleteMeetingTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/FindMeetingTestUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/FindMeetingTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/FindMeetingTestUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/FindMeetingTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/GeneralTestUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/GeneralTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/GeneralTestUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/GeneralTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/TimeRemainingUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/TimeRemainingUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/TimeRemainingUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/TimeRemainingUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/UpdateMeetingTestUtterances.cs b/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/UpdateMeetingTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/Flow/Utterances/UpdateMeetingTestUtterances.cs
rename to skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/UpdateMeetingTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/.filenesting.json b/skills/src/csharp/emailskill/emailskill/.filenesting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/.filenesting.json
rename to skills/src/csharp/emailskill/emailskill/.filenesting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Adapters/DefaultAdapter.cs b/skills/src/csharp/emailskill/emailskill/Adapters/DefaultAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Adapters/DefaultAdapter.cs
rename to skills/src/csharp/emailskill/emailskill/Adapters/DefaultAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Adapters/EmailSkillAdapter.cs b/skills/src/csharp/emailskill/emailskill/Adapters/EmailSkillAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Adapters/EmailSkillAdapter.cs
rename to skills/src/csharp/emailskill/emailskill/Adapters/EmailSkillAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Bots/DialogBot.cs b/skills/src/csharp/emailskill/emailskill/Bots/DialogBot.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Bots/DialogBot.cs
rename to skills/src/csharp/emailskill/emailskill/Bots/DialogBot.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.json b/skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.json
rename to skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json b/skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json
rename to skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.json b/skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.json
rename to skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.json b/skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.json
rename to skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailCard.json b/skills/src/csharp/emailskill/emailskill/Content/EmailCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailCard.json
rename to skills/src/csharp/emailskill/emailskill/Content/EmailCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailContentPreview.json b/skills/src/csharp/emailskill/emailskill/Content/EmailContentPreview.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailContentPreview.json
rename to skills/src/csharp/emailskill/emailskill/Content/EmailContentPreview.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailDetailCard.json b/skills/src/csharp/emailskill/emailskill/Content/EmailDetailCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailDetailCard.json
rename to skills/src/csharp/emailskill/emailskill/Content/EmailDetailCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailOverviewByCondition.json b/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewByCondition.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailOverviewByCondition.json
rename to skills/src/csharp/emailskill/emailskill/Content/EmailOverviewByCondition.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailOverviewCard.json b/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailOverviewCard.json
rename to skills/src/csharp/emailskill/emailskill/Content/EmailOverviewCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailOverviewItem.json b/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewItem.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailOverviewItem.json
rename to skills/src/csharp/emailskill/emailskill/Content/EmailOverviewItem.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailWithOutButtonCard.json b/skills/src/csharp/emailskill/emailskill/Content/EmailWithOutButtonCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Content/EmailWithOutButtonCard.json
rename to skills/src/csharp/emailskill/emailskill/Content/EmailWithOutButtonCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Controllers/BotController.cs b/skills/src/csharp/emailskill/emailskill/Controllers/BotController.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Controllers/BotController.cs
rename to skills/src/csharp/emailskill/emailskill/Controllers/BotController.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/DeleteEmailDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/DeleteEmailDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/DeleteEmailDialog.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/DeleteEmailDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/EmailSkillDialogBase.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/EmailSkillDialogBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/EmailSkillDialogBase.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/EmailSkillDialogBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/FindContactDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/FindContactDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/FindContactDialog.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/FindContactDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/ForwardEmailDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/ForwardEmailDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/ForwardEmailDialog.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/ForwardEmailDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/MainDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/MainDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/MainDialog.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/MainDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/ReplyEmailDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/ReplyEmailDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/ReplyEmailDialog.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/ReplyEmailDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/SendEmailDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/SendEmailDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/SendEmailDialog.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/SendEmailDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/ShowEmailDialog.cs b/skills/src/csharp/emailskill/emailskill/Dialogs/ShowEmailDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Dialogs/ShowEmailDialog.cs
rename to skills/src/csharp/emailskill/emailskill/Dialogs/ShowEmailDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj b/skills/src/csharp/emailskill/emailskill/EmailSkill.csproj
similarity index 96%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj
rename to skills/src/csharp/emailskill/emailskill/EmailSkill.csproj
index b4332da48f..1441672f88 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj
+++ b/skills/src/csharp/emailskill/emailskill/EmailSkill.csproj
@@ -3,7 +3,7 @@
netcoreapp2.2
3383fcc5-4017-4e0a-9103-68603b68fe1d
- ..\..\..\VirtualAssistant.ruleset
+ ..\..\VirtualAssistant.ruleset
@@ -166,8 +166,8 @@
-
-
+
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Extensions/DateTimeEx.cs b/skills/src/csharp/emailskill/emailskill/Extensions/DateTimeEx.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Extensions/DateTimeEx.cs
rename to skills/src/csharp/emailskill/emailskill/Extensions/DateTimeEx.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Extensions/UserEx.cs b/skills/src/csharp/emailskill/emailskill/Extensions/UserEx.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Extensions/UserEx.cs
rename to skills/src/csharp/emailskill/emailskill/Extensions/UserEx.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailCardData.cs b/skills/src/csharp/emailskill/emailskill/Models/EmailCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailCardData.cs
rename to skills/src/csharp/emailskill/emailskill/Models/EmailCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailCardDataNoButtons.cs b/skills/src/csharp/emailskill/emailskill/Models/EmailCardDataNoButtons.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailCardDataNoButtons.cs
rename to skills/src/csharp/emailskill/emailskill/Models/EmailCardDataNoButtons.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailOverviewData.cs b/skills/src/csharp/emailskill/emailskill/Models/EmailOverviewData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailOverviewData.cs
rename to skills/src/csharp/emailskill/emailskill/Models/EmailOverviewData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailSearchType.cs b/skills/src/csharp/emailskill/emailskill/Models/EmailSearchType.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailSearchType.cs
rename to skills/src/csharp/emailskill/emailskill/Models/EmailSearchType.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailSkillDialogOptions.cs b/skills/src/csharp/emailskill/emailskill/Models/EmailSkillDialogOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailSkillDialogOptions.cs
rename to skills/src/csharp/emailskill/emailskill/Models/EmailSkillDialogOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailSkillState.cs b/skills/src/csharp/emailskill/emailskill/Models/EmailSkillState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/EmailSkillState.cs
rename to skills/src/csharp/emailskill/emailskill/Models/EmailSkillState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/MailSource.cs b/skills/src/csharp/emailskill/emailskill/Models/MailSource.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/MailSource.cs
rename to skills/src/csharp/emailskill/emailskill/Models/MailSource.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/PersonModel.cs b/skills/src/csharp/emailskill/emailskill/Models/PersonModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/PersonModel.cs
rename to skills/src/csharp/emailskill/emailskill/Models/PersonModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/SendEmailStateModel.cs b/skills/src/csharp/emailskill/emailskill/Models/SendEmailStateModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/SendEmailStateModel.cs
rename to skills/src/csharp/emailskill/emailskill/Models/SendEmailStateModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/UpdateUserDialogOptions.cs b/skills/src/csharp/emailskill/emailskill/Models/UpdateUserDialogOptions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Models/UpdateUserDialogOptions.cs
rename to skills/src/csharp/emailskill/emailskill/Models/UpdateUserDialogOptions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Program.cs b/skills/src/csharp/emailskill/emailskill/Program.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Program.cs
rename to skills/src/csharp/emailskill/emailskill/Program.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Prompts/GetRecreateInfoPrompt.cs b/skills/src/csharp/emailskill/emailskill/Prompts/GetRecreateInfoPrompt.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Prompts/GetRecreateInfoPrompt.cs
rename to skills/src/csharp/emailskill/emailskill/Prompts/GetRecreateInfoPrompt.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Properties/launchSettings.json b/skills/src/csharp/emailskill/emailskill/Properties/launchSettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Properties/launchSettings.json
rename to skills/src/csharp/emailskill/emailskill/Properties/launchSettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/FindContact/FindContactResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Main/EmailMainResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.de.resx b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.de.resx
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.es.resx b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.es.resx
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.fr.resx b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.fr.resx
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.it.resx b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.it.resx
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.resx b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.resx
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.zh.resx b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailCommonStrings.zh.resx
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/EmailSharedResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/ResponseIdCollection.t4 b/skills/src/csharp/emailskill/emailskill/Responses/Shared/ResponseIdCollection.t4
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/Shared/ResponseIdCollection.t4
rename to skills/src/csharp/emailskill/emailskill/Responses/Shared/ResponseIdCollection.t4
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.cs b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.cs
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.json b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.tt b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.tt
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json b/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json
rename to skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/BotServices.cs b/skills/src/csharp/emailskill/emailskill/Services/BotServices.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/BotServices.cs
rename to skills/src/csharp/emailskill/emailskill/Services/BotServices.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/BotSettings.cs b/skills/src/csharp/emailskill/emailskill/Services/BotSettings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/BotSettings.cs
rename to skills/src/csharp/emailskill/emailskill/Services/BotSettings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/EmailLuis.cs b/skills/src/csharp/emailskill/emailskill/Services/EmailLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/EmailLuis.cs
rename to skills/src/csharp/emailskill/emailskill/Services/EmailLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/GoogleAPI/GMailService.cs b/skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GMailService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/GoogleAPI/GMailService.cs
rename to skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GMailService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/GoogleAPI/GoogleClient.cs b/skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GoogleClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/GoogleAPI/GoogleClient.cs
rename to skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GoogleClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/GoogleAPI/GooglePeopleService.cs b/skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GooglePeopleService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/GoogleAPI/GooglePeopleService.cs
rename to skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GooglePeopleService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/IMailService.cs b/skills/src/csharp/emailskill/emailskill/Services/IMailService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/IMailService.cs
rename to skills/src/csharp/emailskill/emailskill/Services/IMailService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/IServiceManager.cs b/skills/src/csharp/emailskill/emailskill/Services/IServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/IServiceManager.cs
rename to skills/src/csharp/emailskill/emailskill/Services/IServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/IUserService.cs b/skills/src/csharp/emailskill/emailskill/Services/IUserService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/IUserService.cs
rename to skills/src/csharp/emailskill/emailskill/Services/IUserService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/MSGraphAPI/GraphClient.cs b/skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/GraphClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/MSGraphAPI/GraphClient.cs
rename to skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/GraphClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs b/skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs
rename to skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/MSGraphAPI/MSGraphUserService.cs b/skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphUserService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/MSGraphAPI/MSGraphUserService.cs
rename to skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphUserService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/ServiceManager.cs b/skills/src/csharp/emailskill/emailskill/Services/ServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Services/ServiceManager.cs
rename to skills/src/csharp/emailskill/emailskill/Services/ServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/SkillWhitelist.cs b/skills/src/csharp/emailskill/emailskill/SkillWhitelist.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/SkillWhitelist.cs
rename to skills/src/csharp/emailskill/emailskill/SkillWhitelist.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Startup.cs b/skills/src/csharp/emailskill/emailskill/Startup.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Startup.cs
rename to skills/src/csharp/emailskill/emailskill/Startup.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/Actions.cs b/skills/src/csharp/emailskill/emailskill/Utilities/Actions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/Actions.cs
rename to skills/src/csharp/emailskill/emailskill/Utilities/Actions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/AdaptiveCardHelper.cs b/skills/src/csharp/emailskill/emailskill/Utilities/AdaptiveCardHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/AdaptiveCardHelper.cs
rename to skills/src/csharp/emailskill/emailskill/Utilities/AdaptiveCardHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/DisplayHelper.cs b/skills/src/csharp/emailskill/emailskill/Utilities/DisplayHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/DisplayHelper.cs
rename to skills/src/csharp/emailskill/emailskill/Utilities/DisplayHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/EmailCommonPhrase.cs b/skills/src/csharp/emailskill/emailskill/Utilities/EmailCommonPhrase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/EmailCommonPhrase.cs
rename to skills/src/csharp/emailskill/emailskill/Utilities/EmailCommonPhrase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/SpeakHelper.cs b/skills/src/csharp/emailskill/emailskill/Utilities/SpeakHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/SpeakHelper.cs
rename to skills/src/csharp/emailskill/emailskill/Utilities/SpeakHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/Util.cs b/skills/src/csharp/emailskill/emailskill/Utilities/Util.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/Utilities/Util.cs
rename to skills/src/csharp/emailskill/emailskill/Utilities/Util.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/appsettings.json b/skills/src/csharp/emailskill/emailskill/appsettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/appsettings.json
rename to skills/src/csharp/emailskill/emailskill/appsettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/cognitivemodels.json b/skills/src/csharp/emailskill/emailskill/cognitivemodels.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/cognitivemodels.json
rename to skills/src/csharp/emailskill/emailskill/cognitivemodels.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/manifestTemplate.json b/skills/src/csharp/emailskill/emailskill/manifestTemplate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/manifestTemplate.json
rename to skills/src/csharp/emailskill/emailskill/manifestTemplate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/readme.md b/skills/src/csharp/emailskill/emailskill/readme.md
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/readme.md
rename to skills/src/csharp/emailskill/emailskill/readme.md
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/wwwroot/default.htm b/skills/src/csharp/emailskill/emailskill/wwwroot/default.htm
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/wwwroot/default.htm
rename to skills/src/csharp/emailskill/emailskill/wwwroot/default.htm
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/GmailUtil.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/GmailUtil.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/GmailUtil.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/GmailUtil.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockGoogleServiceClient.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleServiceClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockGoogleServiceClient.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleServiceClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockGoogleUserClient.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleUserClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockGoogleUserClient.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleUserClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockListRequest.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockListRequest.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockListRequest.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockListRequest.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockMessagesResource.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockMessagesResource.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockMessagesResource.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockMessagesResource.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockUsersResource.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockUsersResource.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/Google/MockUsersResource.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockUsersResource.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MSGraph/MockGraphServiceClient.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MSGraph/MockGraphServiceClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MSGraph/MockGraphServiceClient.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/MSGraph/MockGraphServiceClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MockDialogStateAccessor.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockDialogStateAccessor.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MockDialogStateAccessor.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockDialogStateAccessor.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MockEmailStateAccessor.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockEmailStateAccessor.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MockEmailStateAccessor.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockEmailStateAccessor.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MockServiceManager.cs b/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Fakes/MockServiceManager.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Helper/StepHelperTests.cs b/skills/src/csharp/emailskill/emailskilltest/API/Helper/StepHelperTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Helper/StepHelperTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Helper/StepHelperTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GoogleMailServiceTests.cs b/skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleMailServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GoogleMailServiceTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleMailServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GoogleUserServiceTests.cs b/skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleUserServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GoogleUserServiceTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleUserServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GraphMailServiceTests.cs b/skills/src/csharp/emailskill/emailskilltest/API/Service/GraphMailServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GraphMailServiceTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Service/GraphMailServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GraphUserServiceTests.cs b/skills/src/csharp/emailskill/emailskilltest/API/Service/GraphUserServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/API/Service/GraphUserServiceTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/API/Service/GraphUserServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj b/skills/src/csharp/emailskill/emailskilltest/EmailSkillTest.csproj
similarity index 57%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj
rename to skills/src/csharp/emailskill/emailskilltest/EmailSkillTest.csproj
index c0a98e63f4..e3c6c2b028 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj
+++ b/skills/src/csharp/emailskill/emailskilltest/EmailSkillTest.csproj
@@ -6,24 +6,12 @@
false
-
- ..\..\..\VirtualAssistant.ruleset
-
-
-
- ..\..\..\VirtualAssistant.ruleset
-
-
-
- all
- runtime; build; native; contentfiles; analyzers
-
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/EmailBotTestBase.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/EmailBotTestBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/EmailBotTestBase.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/EmailBotTestBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockEmailLuisRecognizer.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockEmailLuisRecognizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockEmailLuisRecognizer.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockEmailLuisRecognizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockGeneralLuisRecognizer.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockGeneralLuisRecognizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockGeneralLuisRecognizer.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockGeneralLuisRecognizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockMailService.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockMailService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockMailService.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockMailService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockServiceManager.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockServiceManager.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockUserService.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockUserService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Fakes/MockUserService.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockUserService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/ReplyFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/ReplyFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/ReplyFlowTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/ReplyFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Strings/ContextStrings.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Strings/ContextStrings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Strings/ContextStrings.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Strings/ContextStrings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/BaseTestUtterances.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/BaseTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/BaseTestUtterances.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/BaseTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/DeleteEmailUtterances.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/DeleteEmailUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/DeleteEmailUtterances.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/DeleteEmailUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/ForwardEmailUtterances.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ForwardEmailUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/ForwardEmailUtterances.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ForwardEmailUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/GeneralTestUtterances.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/GeneralTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/GeneralTestUtterances.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/GeneralTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/ReplyEmailUtterances.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ReplyEmailUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/ReplyEmailUtterances.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ReplyEmailUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/SendEmailUtterances.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/SendEmailUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/SendEmailUtterances.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/SendEmailUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/ShowEmailUtterances.cs b/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ShowEmailUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/Flow/Utterances/ShowEmailUtterances.cs
rename to skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ShowEmailUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/.filenesting.json b/skills/src/csharp/experimental/newsskill/.filenesting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/.filenesting.json
rename to skills/src/csharp/experimental/newsskill/.filenesting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Adapters/DefaultAdapter.cs b/skills/src/csharp/experimental/newsskill/Adapters/DefaultAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Adapters/DefaultAdapter.cs
rename to skills/src/csharp/experimental/newsskill/Adapters/DefaultAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Adapters/NewsSkillAdapter.cs b/skills/src/csharp/experimental/newsskill/Adapters/NewsSkillAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Adapters/NewsSkillAdapter.cs
rename to skills/src/csharp/experimental/newsskill/Adapters/NewsSkillAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Bots/DialogBot.cs b/skills/src/csharp/experimental/newsskill/Bots/DialogBot.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Bots/DialogBot.cs
rename to skills/src/csharp/experimental/newsskill/Bots/DialogBot.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Connected Services/Application Insights/ConnectedService.json b/skills/src/csharp/experimental/newsskill/Connected Services/Application Insights/ConnectedService.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Connected Services/Application Insights/ConnectedService.json
rename to skills/src/csharp/experimental/newsskill/Connected Services/Application Insights/ConnectedService.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Controllers/BotController.cs b/skills/src/csharp/experimental/newsskill/Controllers/BotController.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Controllers/BotController.cs
rename to skills/src/csharp/experimental/newsskill/Controllers/BotController.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Dialogs/FindArticlesDialog.cs b/skills/src/csharp/experimental/newsskill/Dialogs/FindArticlesDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Dialogs/FindArticlesDialog.cs
rename to skills/src/csharp/experimental/newsskill/Dialogs/FindArticlesDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/newsskill/Dialogs/MainDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Dialogs/MainDialog.cs
rename to skills/src/csharp/experimental/newsskill/Dialogs/MainDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Dialogs/NewsDialogBase.cs b/skills/src/csharp/experimental/newsskill/Dialogs/NewsDialogBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Dialogs/NewsDialogBase.cs
rename to skills/src/csharp/experimental/newsskill/Dialogs/NewsDialogBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Models/NewsSkillState.cs b/skills/src/csharp/experimental/newsskill/Models/NewsSkillState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Models/NewsSkillState.cs
rename to skills/src/csharp/experimental/newsskill/Models/NewsSkillState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Models/OAuthConnection.cs b/skills/src/csharp/experimental/newsskill/Models/OAuthConnection.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Models/OAuthConnection.cs
rename to skills/src/csharp/experimental/newsskill/Models/OAuthConnection.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj b/skills/src/csharp/experimental/newsskill/NewsSkill.csproj
similarity index 87%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj
rename to skills/src/csharp/experimental/newsskill/NewsSkill.csproj
index a70d0d6313..46f1fda124 100644
--- a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj
+++ b/skills/src/csharp/experimental/newsskill/NewsSkill.csproj
@@ -2,7 +2,7 @@
netcoreapp2.2
- ..\..\..\VirtualAssistant.ruleset
+ ..\..\VirtualAssistant.ruleset
@@ -26,8 +26,8 @@
-
-
+
+
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.sln b/skills/src/csharp/experimental/newsskill/NewsSkill.sln
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.sln
rename to skills/src/csharp/experimental/newsskill/NewsSkill.sln
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Program.cs b/skills/src/csharp/experimental/newsskill/Program.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Program.cs
rename to skills/src/csharp/experimental/newsskill/Program.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Properties/launchSettings.json b/skills/src/csharp/experimental/newsskill/Properties/launchSettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Properties/launchSettings.json
rename to skills/src/csharp/experimental/newsskill/Properties/launchSettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/FindArticles/FindArticlesResponses.cs b/skills/src/csharp/experimental/newsskill/Responses/FindArticles/FindArticlesResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/FindArticles/FindArticlesResponses.cs
rename to skills/src/csharp/experimental/newsskill/Responses/FindArticles/FindArticlesResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainResponses.cs b/skills/src/csharp/experimental/newsskill/Responses/Main/MainResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainResponses.cs
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.Designer.cs b/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.Designer.cs
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.de.resx b/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.de.resx
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.es.resx b/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.es.resx
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.fr.resx b/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.fr.resx
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.it.resx b/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.it.resx
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.resx b/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.resx
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.zh.resx b/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Responses/Main/MainStrings.zh.resx
rename to skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/BotServices.cs b/skills/src/csharp/experimental/newsskill/Services/BotServices.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/BotServices.cs
rename to skills/src/csharp/experimental/newsskill/Services/BotServices.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/BotSettings.cs b/skills/src/csharp/experimental/newsskill/Services/BotSettings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/BotSettings.cs
rename to skills/src/csharp/experimental/newsskill/Services/BotSettings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/NewsClient.cs b/skills/src/csharp/experimental/newsskill/Services/NewsClient.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/NewsClient.cs
rename to skills/src/csharp/experimental/newsskill/Services/NewsClient.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/NewsLuis.cs b/skills/src/csharp/experimental/newsskill/Services/NewsLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Services/NewsLuis.cs
rename to skills/src/csharp/experimental/newsskill/Services/NewsLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/SkillWhitelist.cs b/skills/src/csharp/experimental/newsskill/SkillWhitelist.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/SkillWhitelist.cs
rename to skills/src/csharp/experimental/newsskill/SkillWhitelist.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Startup.cs b/skills/src/csharp/experimental/newsskill/Startup.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/Startup.cs
rename to skills/src/csharp/experimental/newsskill/Startup.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/appsettings.json b/skills/src/csharp/experimental/newsskill/appsettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/appsettings.json
rename to skills/src/csharp/experimental/newsskill/appsettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/cognitivemodels.json b/skills/src/csharp/experimental/newsskill/cognitivemodels.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/cognitivemodels.json
rename to skills/src/csharp/experimental/newsskill/cognitivemodels.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/manifestTemplate.json b/skills/src/csharp/experimental/newsskill/manifestTemplate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/manifestTemplate.json
rename to skills/src/csharp/experimental/newsskill/manifestTemplate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/readme.md b/skills/src/csharp/experimental/newsskill/readme.md
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/readme.md
rename to skills/src/csharp/experimental/newsskill/readme.md
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/wwwroot/default.htm b/skills/src/csharp/experimental/newsskill/wwwroot/default.htm
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/wwwroot/default.htm
rename to skills/src/csharp/experimental/newsskill/wwwroot/default.htm
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/.filenesting.json b/skills/src/csharp/experimental/restaurantbooking/.filenesting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/.filenesting.json
rename to skills/src/csharp/experimental/restaurantbooking/.filenesting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Adapters/DefaultAdapter.cs b/skills/src/csharp/experimental/restaurantbooking/Adapters/DefaultAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Adapters/DefaultAdapter.cs
rename to skills/src/csharp/experimental/restaurantbooking/Adapters/DefaultAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Adapters/RestaurantSkillAdapter.cs b/skills/src/csharp/experimental/restaurantbooking/Adapters/RestaurantSkillAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Adapters/RestaurantSkillAdapter.cs
rename to skills/src/csharp/experimental/restaurantbooking/Adapters/RestaurantSkillAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Bots/DialogBot.cs b/skills/src/csharp/experimental/restaurantbooking/Bots/DialogBot.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Bots/DialogBot.cs
rename to skills/src/csharp/experimental/restaurantbooking/Bots/DialogBot.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Connected Services/Application Insights/ConnectedService.json b/skills/src/csharp/experimental/restaurantbooking/Connected Services/Application Insights/ConnectedService.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Connected Services/Application Insights/ConnectedService.json
rename to skills/src/csharp/experimental/restaurantbooking/Connected Services/Application Insights/ConnectedService.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/CusineChoiceCard.json b/skills/src/csharp/experimental/restaurantbooking/Content/CusineChoiceCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/CusineChoiceCard.json
rename to skills/src/csharp/experimental/restaurantbooking/Content/CusineChoiceCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/ReservationConfirmCard.json b/skills/src/csharp/experimental/restaurantbooking/Content/ReservationConfirmCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/ReservationConfirmCard.json
rename to skills/src/csharp/experimental/restaurantbooking/Content/ReservationConfirmCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/ReservationConfirmationCard.json b/skills/src/csharp/experimental/restaurantbooking/Content/ReservationConfirmationCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/ReservationConfirmationCard.json
rename to skills/src/csharp/experimental/restaurantbooking/Content/ReservationConfirmationCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/RestaurantChoiceCard.json b/skills/src/csharp/experimental/restaurantbooking/Content/RestaurantChoiceCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/RestaurantChoiceCard.json
rename to skills/src/csharp/experimental/restaurantbooking/Content/RestaurantChoiceCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/RestaurantImages.Designer.cs b/skills/src/csharp/experimental/restaurantbooking/Content/RestaurantImages.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/RestaurantImages.Designer.cs
rename to skills/src/csharp/experimental/restaurantbooking/Content/RestaurantImages.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/RestaurantImages.resx b/skills/src/csharp/experimental/restaurantbooking/Content/RestaurantImages.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Content/RestaurantImages.resx
rename to skills/src/csharp/experimental/restaurantbooking/Content/RestaurantImages.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Controllers/BotController.cs b/skills/src/csharp/experimental/restaurantbooking/Controllers/BotController.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Controllers/BotController.cs
rename to skills/src/csharp/experimental/restaurantbooking/Controllers/BotController.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Data/SeedReservationSampleData.cs b/skills/src/csharp/experimental/restaurantbooking/Data/SeedReservationSampleData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Data/SeedReservationSampleData.cs
rename to skills/src/csharp/experimental/restaurantbooking/Data/SeedReservationSampleData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/BookingDialog.cs b/skills/src/csharp/experimental/restaurantbooking/Dialogs/BookingDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/BookingDialog.cs
rename to skills/src/csharp/experimental/restaurantbooking/Dialogs/BookingDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/CancelDialog.cs b/skills/src/csharp/experimental/restaurantbooking/Dialogs/CancelDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/CancelDialog.cs
rename to skills/src/csharp/experimental/restaurantbooking/Dialogs/CancelDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/MainDialog.cs b/skills/src/csharp/experimental/restaurantbooking/Dialogs/MainDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/MainDialog.cs
rename to skills/src/csharp/experimental/restaurantbooking/Dialogs/MainDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/SkillDialogBase.cs b/skills/src/csharp/experimental/restaurantbooking/Dialogs/SkillDialogBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Dialogs/SkillDialogBase.cs
rename to skills/src/csharp/experimental/restaurantbooking/Dialogs/SkillDialogBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/Booking.cs b/skills/src/csharp/experimental/restaurantbooking/Models/Booking.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/Booking.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/Booking.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/BookingPlace.cs b/skills/src/csharp/experimental/restaurantbooking/Models/BookingPlace.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/BookingPlace.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/BookingPlace.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/CusineChoiceCardData.cs b/skills/src/csharp/experimental/restaurantbooking/Models/CusineChoiceCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/CusineChoiceCardData.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/CusineChoiceCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/FoodTypeInfo.cs b/skills/src/csharp/experimental/restaurantbooking/Models/FoodTypeInfo.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/FoodTypeInfo.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/FoodTypeInfo.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ListItemData.cs b/skills/src/csharp/experimental/restaurantbooking/Models/ListItemData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ListItemData.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/ListItemData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/LuisEntities.cs b/skills/src/csharp/experimental/restaurantbooking/Models/LuisEntities.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/LuisEntities.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/LuisEntities.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/Meeting.cs b/skills/src/csharp/experimental/restaurantbooking/Models/Meeting.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/Meeting.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/Meeting.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/OAuthConnection.cs b/skills/src/csharp/experimental/restaurantbooking/Models/OAuthConnection.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/OAuthConnection.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/OAuthConnection.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ReservationBooking.cs b/skills/src/csharp/experimental/restaurantbooking/Models/ReservationBooking.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ReservationBooking.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/ReservationBooking.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ReservationConfirmCard.cs b/skills/src/csharp/experimental/restaurantbooking/Models/ReservationConfirmCard.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ReservationConfirmCard.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/ReservationConfirmCard.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ReservationConfirmationData.cs b/skills/src/csharp/experimental/restaurantbooking/Models/ReservationConfirmationData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/ReservationConfirmationData.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/ReservationConfirmationData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/RestaurantBookingState.cs b/skills/src/csharp/experimental/restaurantbooking/Models/RestaurantBookingState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/RestaurantBookingState.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/RestaurantBookingState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/RestaurantChoiceCardData.cs b/skills/src/csharp/experimental/restaurantbooking/Models/RestaurantChoiceCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/RestaurantChoiceCardData.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/RestaurantChoiceCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/SkillUserState.cs b/skills/src/csharp/experimental/restaurantbooking/Models/SkillUserState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/SkillUserState.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/SkillUserState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/TitleImageTextCardData.cs b/skills/src/csharp/experimental/restaurantbooking/Models/TitleImageTextCardData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Models/TitleImageTextCardData.cs
rename to skills/src/csharp/experimental/restaurantbooking/Models/TitleImageTextCardData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Program.cs b/skills/src/csharp/experimental/restaurantbooking/Program.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Program.cs
rename to skills/src/csharp/experimental/restaurantbooking/Program.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Properties/launchSettings.json b/skills/src/csharp/experimental/restaurantbooking/Properties/launchSettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Properties/launchSettings.json
rename to skills/src/csharp/experimental/restaurantbooking/Properties/launchSettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelResponses.cs b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelResponses.cs
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.Designer.cs b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.Designer.cs
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.de.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.de.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.es.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.es.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.fr.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.fr.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.it.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.it.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.zh.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Cancel/CancelStrings.zh.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Cancel/CancelStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.cs b/skills/src/csharp/experimental/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.cs
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.json b/skills/src/csharp/experimental/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.json
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.tt b/skills/src/csharp/experimental/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.tt
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Main/RestaurantBookingMainResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.Designer.cs b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.Designer.cs
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.de.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.de.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.es.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.es.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.fr.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.fr.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.it.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.it.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.zh.resx b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/BotStrings.zh.resx
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/BotStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/ResponseIdCollection.t4 b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/ResponseIdCollection.t4
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/Responses/Shared/ResponseIdCollection.t4
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/ResponseIdCollection.t4
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.cs b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.cs
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.json b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.json
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.tt b/skills/src/csharp/experimental/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.tt
rename to skills/src/csharp/experimental/restaurantbooking/Responses/Shared/RestaurantBookingSharedResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj b/skills/src/csharp/experimental/restaurantbooking/RestaurantBooking.csproj
similarity index 95%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj
rename to skills/src/csharp/experimental/restaurantbooking/RestaurantBooking.csproj
index 14f11a5990..0e54704014 100644
--- a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj
+++ b/skills/src/csharp/experimental/restaurantbooking/RestaurantBooking.csproj
@@ -3,7 +3,7 @@
netcoreapp2.2
6a3184c3-074e-45b9-ad93-eceb8268ec01
- ..\..\..\VirtualAssistant.ruleset
+ ..\..\VirtualAssistant.ruleset
@@ -54,8 +54,8 @@
-
-
+
+
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.sln b/skills/src/csharp/experimental/restaurantbooking/RestaurantBooking.sln
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.sln
rename to skills/src/csharp/experimental/restaurantbooking/RestaurantBooking.sln
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Services/BotServices.cs b/skills/src/csharp/experimental/restaurantbooking/Services/BotServices.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Services/BotServices.cs
rename to skills/src/csharp/experimental/restaurantbooking/Services/BotServices.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Services/BotSettings.cs b/skills/src/csharp/experimental/restaurantbooking/Services/BotSettings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Services/BotSettings.cs
rename to skills/src/csharp/experimental/restaurantbooking/Services/BotSettings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Services/ReservationLuis.cs b/skills/src/csharp/experimental/restaurantbooking/Services/ReservationLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Services/ReservationLuis.cs
rename to skills/src/csharp/experimental/restaurantbooking/Services/ReservationLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/SkillWhitelist.cs b/skills/src/csharp/experimental/restaurantbooking/SkillWhitelist.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/SkillWhitelist.cs
rename to skills/src/csharp/experimental/restaurantbooking/SkillWhitelist.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Startup.cs b/skills/src/csharp/experimental/restaurantbooking/Startup.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Startup.cs
rename to skills/src/csharp/experimental/restaurantbooking/Startup.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/Actions.cs b/skills/src/csharp/experimental/restaurantbooking/Utilities/Actions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/Actions.cs
rename to skills/src/csharp/experimental/restaurantbooking/Utilities/Actions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/DateTimeExtensions.cs b/skills/src/csharp/experimental/restaurantbooking/Utilities/DateTimeExtensions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/DateTimeExtensions.cs
rename to skills/src/csharp/experimental/restaurantbooking/Utilities/DateTimeExtensions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/IUrlResolver.cs b/skills/src/csharp/experimental/restaurantbooking/Utilities/IUrlResolver.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/IUrlResolver.cs
rename to skills/src/csharp/experimental/restaurantbooking/Utilities/IUrlResolver.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/LuisEntityHelper.cs b/skills/src/csharp/experimental/restaurantbooking/Utilities/LuisEntityHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/LuisEntityHelper.cs
rename to skills/src/csharp/experimental/restaurantbooking/Utilities/LuisEntityHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/MatchName.cs b/skills/src/csharp/experimental/restaurantbooking/Utilities/MatchName.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/MatchName.cs
rename to skills/src/csharp/experimental/restaurantbooking/Utilities/MatchName.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/UrlResolver.cs b/skills/src/csharp/experimental/restaurantbooking/Utilities/UrlResolver.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/Utilities/UrlResolver.cs
rename to skills/src/csharp/experimental/restaurantbooking/Utilities/UrlResolver.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/appsettings.json b/skills/src/csharp/experimental/restaurantbooking/appsettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/appsettings.json
rename to skills/src/csharp/experimental/restaurantbooking/appsettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/cognitivemodels.json b/skills/src/csharp/experimental/restaurantbooking/cognitivemodels.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/cognitivemodels.json
rename to skills/src/csharp/experimental/restaurantbooking/cognitivemodels.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/manifestTemplate.json b/skills/src/csharp/experimental/restaurantbooking/manifestTemplate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/manifestTemplate.json
rename to skills/src/csharp/experimental/restaurantbooking/manifestTemplate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/readme.md b/skills/src/csharp/experimental/restaurantbooking/readme.md
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/readme.md
rename to skills/src/csharp/experimental/restaurantbooking/readme.md
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/biryani-house.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/biryani-house.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/biryani-house.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/biryani-house.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/chens.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/chens.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/chens.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/chens.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/german.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/german.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/german.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/german.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/euro-bistro.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/euro-bistro.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/euro-bistro.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/euro-bistro.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/german-gourmet.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/german-gourmet.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/german-gourmet.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/german-gourmet.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/maharani-inside.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/maharani-inside.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/maharani-inside.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/maharani-inside.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/mandarin.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/mandarin.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/mandarin.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/mandarin.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/the-bavarian.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/the-bavarian.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/the-bavarian.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/the-bavarian.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/tonys.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/tonys.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/tonys.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/tonys.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg b/skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg
diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/default.htm b/skills/src/csharp/experimental/restaurantbooking/wwwroot/default.htm
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/experimental/skills/restaurantbooking/wwwroot/default.htm
rename to skills/src/csharp/experimental/restaurantbooking/wwwroot/default.htm
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/.filenesting.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/.filenesting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/.filenesting.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/.filenesting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Adapters/DefaultAdapter.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/DefaultAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Adapters/DefaultAdapter.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/DefaultAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Adapters/POISkillAdapter.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/POISkillAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Adapters/POISkillAdapter.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/POISkillAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Bots/DialogBot.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Bots/DialogBot.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Bots/DialogBot.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Bots/DialogBot.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Controllers/BotController.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Controllers/BotController.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Controllers/BotController.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Controllers/BotController.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/CancelRouteDialog.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/CancelRouteDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/CancelRouteDialog.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/CancelRouteDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/RouteDialog.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/RouteDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Dialogs/RouteDialog.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/RouteDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Address.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Address.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Address.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Address.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/LatLng.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/LatLng.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/LatLng.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/LatLng.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/PoiInfo.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/PoiInfo.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/PoiInfo.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/PoiInfo.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/RouteDirections.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/RouteDirections.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/RouteDirections.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/RouteDirections.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchAddress.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchAddress.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchAddress.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchAddress.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResult.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResult.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResult.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResult.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Viewport.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Viewport.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Viewport.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Viewport.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/DirectionsEventResponse.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/DirectionsEventResponse.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/DirectionsEventResponse.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/DirectionsEventResponse.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Category.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Category.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Category.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Category.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Contact.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Contact.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Contact.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Contact.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Group.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Group.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Group.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Group.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Hours.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Hours.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Hours.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Hours.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Icon.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Icon.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Icon.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Icon.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Item.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Item.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Item.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Item.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Labellatlng.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Labellatlng.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Labellatlng.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Labellatlng.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Location.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Location.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Location.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Location.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Menu.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Menu.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Menu.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Menu.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Photo.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Photo.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Photo.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Photo.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Price.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Price.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Price.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Price.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Provider.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Provider.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Provider.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Provider.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Response.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Response.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Response.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Response.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/RichStatus.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/RichStatus.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/RichStatus.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/RichStatus.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Source.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Source.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Source.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Source.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venue.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venue.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venue.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venue.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/VenueResponse.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/VenueResponse.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/VenueResponse.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/VenueResponse.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venuepage.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venuepage.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venuepage.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venuepage.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/OAuthConnection.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/OAuthConnection.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/OAuthConnection.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/OAuthConnection.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/PointOfInterestSkillState.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointOfInterestSkillState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/PointOfInterestSkillState.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointOfInterestSkillState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/RouteDirectionsModel.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/RouteDirectionsModel.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/RouteDirectionsModel.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/RouteDirectionsModel.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/UserInformation.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/UserInformation.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Models/UserInformation.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/UserInformation.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj b/skills/src/csharp/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
similarity index 94%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
index d3ef02aef2..7d4f35faec 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
+++ b/skills/src/csharp/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
@@ -3,7 +3,7 @@
netcoreapp2.2
302ba8d8-1f97-40c2-843e-ecf0a2805cf7
- ..\..\..\VirtualAssistant.ruleset
+ ..\..\VirtualAssistant.ruleset
@@ -34,8 +34,6 @@
-
-
@@ -175,10 +173,10 @@
-
-
+
+
-
+
CancelRouteResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Program.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Program.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Program.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Program.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Properties/launchSettings.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Properties/launchSettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Properties/launchSettings.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Properties/launchSettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.de.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.de.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.es.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.es.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.fr.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.fr.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.it.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.it.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.tt b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.tt
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.zh.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.zh.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.de.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.de.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.es.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.es.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.fr.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.fr.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.it.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.it.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.tt b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.tt
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.zh.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.zh.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.de.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.de.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.es.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.es.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.it.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.it.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.tt b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.tt
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4 b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/BotServices.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotServices.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/BotServices.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotServices.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/BotSettings.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotSettings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/BotSettings.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotSettings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/FoursquareGeoSpatialService.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/FoursquareGeoSpatialService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/FoursquareGeoSpatialService.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/FoursquareGeoSpatialService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/IGeoSpatialService.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IGeoSpatialService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/IGeoSpatialService.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IGeoSpatialService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/IServiceManager.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/IServiceManager.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/PointOfInterestLuis.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/PointOfInterestLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/PointOfInterestLuis.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/PointOfInterestLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/ServiceHelper.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/ServiceHelper.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/ServiceManager.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Services/ServiceManager.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/SkillWhitelist.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/SkillWhitelist.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/SkillWhitelist.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/SkillWhitelist.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Startup.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Startup.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Startup.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Startup.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Utilities/Actions.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/Actions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Utilities/Actions.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/Actions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Utilities/ResponseUtility.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/ResponseUtility.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/Utilities/ResponseUtility.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/ResponseUtility.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/appsettings.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/appsettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/appsettings.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/appsettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/cognitivemodels.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/cognitivemodels.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/cognitivemodels.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/cognitivemodels.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/manifestTemplate.json b/skills/src/csharp/pointofinterestskill/pointofinterestskill/manifestTemplate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/manifestTemplate.json
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/manifestTemplate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/readme.md b/skills/src/csharp/pointofinterestskill/pointofinterestskill/readme.md
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/readme.md
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/readme.md
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/default.htm b/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/default.htm
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/default.htm
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/default.htm
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/images/background.png b/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/background.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/images/background.png
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/background.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/images/default_pointofinterest.png b/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/default_pointofinterest.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/images/default_pointofinterest.png
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/default_pointofinterest.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/images/header_background.png b/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/header_background.png
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/wwwroot/images/header_background.png
rename to skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/header_background.png
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/AzureMapsGeoSpatialServiceTests.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/AzureMapsGeoSpatialServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/AzureMapsGeoSpatialServiceTests.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/AzureMapsGeoSpatialServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockData.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockData.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockHttpClientHandlerGen.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockHttpClientHandlerGen.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockHttpClientHandlerGen.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockHttpClientHandlerGen.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/FoursquareGeoSpatialServiceTests.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/FoursquareGeoSpatialServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/API/FoursquareGeoSpatialServiceTests.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/FoursquareGeoSpatialServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockGeneralIntent.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockGeneralIntent.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockGeneralIntent.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockGeneralIntent.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockLuisRecognizer.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockLuisRecognizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockLuisRecognizer.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockLuisRecognizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockPointOfInterestIntent.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockPointOfInterestIntent.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockPointOfInterestIntent.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockPointOfInterestIntent.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockServiceManager.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockServiceManager.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestTestBase.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestTestBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestTestBase.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestTestBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.Designer.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.Designer.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralUtterances.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.Designer.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.Designer.cs
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.resx b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.resx
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/PointOfInterestDialogUtterances.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
similarity index 90%
rename from solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
rename to skills/src/csharp/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
index dbb2293dcb..2180b294a6 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
+++ b/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
@@ -12,9 +12,8 @@
-
+
-
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/.filenesting.json b/skills/src/csharp/todoskill/todoskill/.filenesting.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/.filenesting.json
rename to skills/src/csharp/todoskill/todoskill/.filenesting.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Adapters/DefaultAdapter.cs b/skills/src/csharp/todoskill/todoskill/Adapters/DefaultAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Adapters/DefaultAdapter.cs
rename to skills/src/csharp/todoskill/todoskill/Adapters/DefaultAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Adapters/ToDoSkillAdapter.cs b/skills/src/csharp/todoskill/todoskill/Adapters/ToDoSkillAdapter.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Adapters/ToDoSkillAdapter.cs
rename to skills/src/csharp/todoskill/todoskill/Adapters/ToDoSkillAdapter.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Bots/DialogBot.cs b/skills/src/csharp/todoskill/todoskill/Bots/DialogBot.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Bots/DialogBot.cs
rename to skills/src/csharp/todoskill/todoskill/Bots/DialogBot.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Content/ShowTodoCard.json b/skills/src/csharp/todoskill/todoskill/Content/ShowTodoCard.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Content/ShowTodoCard.json
rename to skills/src/csharp/todoskill/todoskill/Content/ShowTodoCard.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Content/ShowTodoItem.json b/skills/src/csharp/todoskill/todoskill/Content/ShowTodoItem.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Content/ShowTodoItem.json
rename to skills/src/csharp/todoskill/todoskill/Content/ShowTodoItem.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Controllers/BotController.cs b/skills/src/csharp/todoskill/todoskill/Controllers/BotController.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Controllers/BotController.cs
rename to skills/src/csharp/todoskill/todoskill/Controllers/BotController.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/AddToDoItemDialog.cs b/skills/src/csharp/todoskill/todoskill/Dialogs/AddToDoItemDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/AddToDoItemDialog.cs
rename to skills/src/csharp/todoskill/todoskill/Dialogs/AddToDoItemDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/DeleteToDoItemDialog.cs b/skills/src/csharp/todoskill/todoskill/Dialogs/DeleteToDoItemDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/DeleteToDoItemDialog.cs
rename to skills/src/csharp/todoskill/todoskill/Dialogs/DeleteToDoItemDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/MainDialog.cs b/skills/src/csharp/todoskill/todoskill/Dialogs/MainDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/MainDialog.cs
rename to skills/src/csharp/todoskill/todoskill/Dialogs/MainDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/MarkToDoItemDialog.cs b/skills/src/csharp/todoskill/todoskill/Dialogs/MarkToDoItemDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/MarkToDoItemDialog.cs
rename to skills/src/csharp/todoskill/todoskill/Dialogs/MarkToDoItemDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/ShowToDoItemDialog.cs b/skills/src/csharp/todoskill/todoskill/Dialogs/ShowToDoItemDialog.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/ShowToDoItemDialog.cs
rename to skills/src/csharp/todoskill/todoskill/Dialogs/ShowToDoItemDialog.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/ToDoSkillDialogBase.cs b/skills/src/csharp/todoskill/todoskill/Dialogs/ToDoSkillDialogBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Dialogs/ToDoSkillDialogBase.cs
rename to skills/src/csharp/todoskill/todoskill/Dialogs/ToDoSkillDialogBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/ServiceProviderType.cs b/skills/src/csharp/todoskill/todoskill/Models/ServiceProviderType.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/ServiceProviderType.cs
rename to skills/src/csharp/todoskill/todoskill/Models/ServiceProviderType.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/TaskItem.cs b/skills/src/csharp/todoskill/todoskill/Models/TaskItem.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/TaskItem.cs
rename to skills/src/csharp/todoskill/todoskill/Models/TaskItem.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/ToDoSkillState.cs b/skills/src/csharp/todoskill/todoskill/Models/ToDoSkillState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/ToDoSkillState.cs
rename to skills/src/csharp/todoskill/todoskill/Models/ToDoSkillState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/ToDoSkillUserState.cs b/skills/src/csharp/todoskill/todoskill/Models/ToDoSkillUserState.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/ToDoSkillUserState.cs
rename to skills/src/csharp/todoskill/todoskill/Models/ToDoSkillUserState.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/TodoItemData.cs b/skills/src/csharp/todoskill/todoskill/Models/TodoItemData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/TodoItemData.cs
rename to skills/src/csharp/todoskill/todoskill/Models/TodoItemData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/TodoListData.cs b/skills/src/csharp/todoskill/todoskill/Models/TodoListData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Models/TodoListData.cs
rename to skills/src/csharp/todoskill/todoskill/Models/TodoListData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Program.cs b/skills/src/csharp/todoskill/todoskill/Program.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Program.cs
rename to skills/src/csharp/todoskill/todoskill/Program.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Properties/launchSettings.json b/skills/src/csharp/todoskill/todoskill/Properties/launchSettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Properties/launchSettings.json
rename to skills/src/csharp/todoskill/todoskill/Properties/launchSettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.cs b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.de.json b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.de.json
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.es.json b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.es.json
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.fr.json b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.fr.json
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.it.json b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.it.json
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.json b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.json
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.tt b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.tt
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.zh.json b/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.zh.json
rename to skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json b/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json
rename to skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.cs b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.de.json b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.de.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.es.json b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.es.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.fr.json b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.fr.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.it.json b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.it.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.json b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.tt b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.tt
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.zh.json b/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Main/ToDoMainResponses.zh.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.cs b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.json b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.json
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.tt b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.tt
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json b/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json
rename to skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/IconImageSource.cs b/skills/src/csharp/todoskill/todoskill/Responses/Shared/IconImageSource.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/IconImageSource.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/IconImageSource.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ResponseIdCollection.t4 b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ResponseIdCollection.t4
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ResponseIdCollection.t4
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ResponseIdCollection.t4
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.cs b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.de.json b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.de.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.es.json b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.es.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.fr.json b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.fr.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.it.json b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.it.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.json b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.tt b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.tt
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.zh.json b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.zh.json
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.Designer.cs b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.Designer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.Designer.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.de.resx b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.de.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.de.resx
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.de.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.es.resx b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.es.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.es.resx
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.es.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.fr.resx b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.fr.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.fr.resx
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.fr.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.it.resx b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.it.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.it.resx
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.it.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.resx b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.resx
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.zh.resx b/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.zh.resx
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/Shared/ToDoStrings.zh.resx
rename to skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.zh.resx
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.cs b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.cs
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.json b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.json
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.tt b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.tt
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.tt
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.tt
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json b/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json
rename to skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/BotServices.cs b/skills/src/csharp/todoskill/todoskill/Services/BotServices.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/BotServices.cs
rename to skills/src/csharp/todoskill/todoskill/Services/BotServices.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/BotSettings.cs b/skills/src/csharp/todoskill/todoskill/Services/BotSettings.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/BotSettings.cs
rename to skills/src/csharp/todoskill/todoskill/Services/BotSettings.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/IMailService.cs b/skills/src/csharp/todoskill/todoskill/Services/IMailService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/IMailService.cs
rename to skills/src/csharp/todoskill/todoskill/Services/IMailService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/IServiceManager.cs b/skills/src/csharp/todoskill/todoskill/Services/IServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/IServiceManager.cs
rename to skills/src/csharp/todoskill/todoskill/Services/IServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ITaskService.cs b/skills/src/csharp/todoskill/todoskill/Services/ITaskService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ITaskService.cs
rename to skills/src/csharp/todoskill/todoskill/Services/ITaskService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/MailService.cs b/skills/src/csharp/todoskill/todoskill/Services/MailService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/MailService.cs
rename to skills/src/csharp/todoskill/todoskill/Services/MailService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/OneNoteService.cs b/skills/src/csharp/todoskill/todoskill/Services/OneNoteService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/OneNoteService.cs
rename to skills/src/csharp/todoskill/todoskill/Services/OneNoteService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/OutlookService.cs b/skills/src/csharp/todoskill/todoskill/Services/OutlookService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/OutlookService.cs
rename to skills/src/csharp/todoskill/todoskill/Services/OutlookService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ServiceHelper.cs b/skills/src/csharp/todoskill/todoskill/Services/ServiceHelper.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ServiceHelper.cs
rename to skills/src/csharp/todoskill/todoskill/Services/ServiceHelper.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ServiceManager.cs b/skills/src/csharp/todoskill/todoskill/Services/ServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ServiceManager.cs
rename to skills/src/csharp/todoskill/todoskill/Services/ServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ToDoLuis.cs b/skills/src/csharp/todoskill/todoskill/Services/ToDoLuis.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Services/ToDoLuis.cs
rename to skills/src/csharp/todoskill/todoskill/Services/ToDoLuis.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/SkillWhitelist.cs b/skills/src/csharp/todoskill/todoskill/SkillWhitelist.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/SkillWhitelist.cs
rename to skills/src/csharp/todoskill/todoskill/SkillWhitelist.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Startup.cs b/skills/src/csharp/todoskill/todoskill/Startup.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Startup.cs
rename to skills/src/csharp/todoskill/todoskill/Startup.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj b/skills/src/csharp/todoskill/todoskill/ToDoSkill.csproj
similarity index 95%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj
rename to skills/src/csharp/todoskill/todoskill/ToDoSkill.csproj
index c863a9dcae..234ad5c3a7 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj
+++ b/skills/src/csharp/todoskill/todoskill/ToDoSkill.csproj
@@ -3,7 +3,7 @@
netcoreapp2.2
d8c5f2ea-e759-4038-8a4b-17e0f81e8a46
- ..\..\..\VirtualAssistant.ruleset
+ ..\..\VirtualAssistant.ruleset
@@ -86,8 +86,8 @@
-
-
+
+
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Utilities/Actions.cs b/skills/src/csharp/todoskill/todoskill/Utilities/Actions.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Utilities/Actions.cs
rename to skills/src/csharp/todoskill/todoskill/Utilities/Actions.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Utilities/ToDoCommonUtil.cs b/skills/src/csharp/todoskill/todoskill/Utilities/ToDoCommonUtil.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/Utilities/ToDoCommonUtil.cs
rename to skills/src/csharp/todoskill/todoskill/Utilities/ToDoCommonUtil.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/appsettings.json b/skills/src/csharp/todoskill/todoskill/appsettings.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/appsettings.json
rename to skills/src/csharp/todoskill/todoskill/appsettings.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/cognitivemodels.json b/skills/src/csharp/todoskill/todoskill/cognitivemodels.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/cognitivemodels.json
rename to skills/src/csharp/todoskill/todoskill/cognitivemodels.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/manifestTemplate.json b/skills/src/csharp/todoskill/todoskill/manifestTemplate.json
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/manifestTemplate.json
rename to skills/src/csharp/todoskill/todoskill/manifestTemplate.json
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/readme.md b/skills/src/csharp/todoskill/todoskill/readme.md
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/readme.md
rename to skills/src/csharp/todoskill/todoskill/readme.md
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/wwwroot/default.htm b/skills/src/csharp/todoskill/todoskill/wwwroot/default.htm
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/wwwroot/default.htm
rename to skills/src/csharp/todoskill/todoskill/wwwroot/default.htm
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/Fakes/MockData.cs b/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/Fakes/MockData.cs
rename to skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/Fakes/MockHttpClientHandlerGen.cs b/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockHttpClientHandlerGen.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/Fakes/MockHttpClientHandlerGen.cs
rename to skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockHttpClientHandlerGen.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/OneNoteServiceTests.cs b/skills/src/csharp/todoskill/todoskilltest/API/OneNoteServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/OneNoteServiceTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/API/OneNoteServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/OutlookServiceTests.cs b/skills/src/csharp/todoskill/todoskilltest/API/OutlookServiceTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/API/OutlookServiceTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/API/OutlookServiceTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/AddToDoFlowTests.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/AddToDoFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/AddToDoFlowTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/AddToDoFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/DeleteAllToDosFlowTests.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/DeleteAllToDosFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/DeleteAllToDosFlowTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/DeleteAllToDosFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/DeleteToDoFlowTests.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/DeleteToDoFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/DeleteToDoFlowTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/DeleteToDoFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/DataOperationType.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/DataOperationType.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/DataOperationType.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/DataOperationType.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockData.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockData.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockData.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockData.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockLuisRecognizer.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockLuisRecognizer.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockLuisRecognizer.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockLuisRecognizer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockMailService.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockMailService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockMailService.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockMailService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockServiceManager.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockServiceManager.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockServiceManager.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockServiceManager.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockTaskService.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockTaskService.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Fakes/MockTaskService.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockTaskService.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/MarkAllToDosFlowTests.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/MarkAllToDosFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/MarkAllToDosFlowTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/MarkAllToDosFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/MarkToDoFlowTests.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/MarkToDoFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/MarkToDoFlowTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/MarkToDoFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/ShowToDoFlowTests.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/ShowToDoFlowTests.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/ShowToDoFlowTests.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/ShowToDoFlowTests.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/ToDoBotTestBase.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/ToDoBotTestBase.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/ToDoBotTestBase.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/ToDoBotTestBase.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/AddToDoFlowTestUtterances.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/AddToDoFlowTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/AddToDoFlowTestUtterances.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/AddToDoFlowTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/BaseTestUtterances.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/BaseTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/BaseTestUtterances.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/BaseTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/DeleteToDoFlowTestUtterances.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/DeleteToDoFlowTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/DeleteToDoFlowTestUtterances.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/DeleteToDoFlowTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/GeneralTestUtterances.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/GeneralTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/GeneralTestUtterances.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/GeneralTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/MarkToDoFlowTestUtterances.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/MarkToDoFlowTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/MarkToDoFlowTestUtterances.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/MarkToDoFlowTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/ShowToDoFlowTestUtterances.cs b/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/ShowToDoFlowTestUtterances.cs
similarity index 100%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/Flow/Utterances/ShowToDoFlowTestUtterances.cs
rename to skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/ShowToDoFlowTestUtterances.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj b/skills/src/csharp/todoskill/todoskilltest/ToDoSkillTest.csproj
similarity index 52%
rename from solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj
rename to skills/src/csharp/todoskill/todoskilltest/ToDoSkillTest.csproj
index f479524d9d..e6b3c31c48 100644
--- a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj
+++ b/skills/src/csharp/todoskill/todoskilltest/ToDoSkillTest.csproj
@@ -5,24 +5,12 @@
false
-
- ..\..\..\VirtualAssistant.ruleset
-
-
-
- ..\..\..\VirtualAssistant.ruleset
-
-
-
- all
- runtime; build; native; contentfiles; analyzers
-
diff --git a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj b/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj
deleted file mode 100644
index b894a68e1b..0000000000
--- a/solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
- netcoreapp2.2
-
- false
-
-
-
- ..\..\..\VirtualAssistant.ruleset
-
-
-
- ..\..\..\VirtualAssistant.ruleset
-
-
-
-
-
-
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers
-
-
-
-
-
-
-
-
-
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate.sln b/templates/Virtual-Assistant-Template/VirtualAssistantTemplate.sln
deleted file mode 100644
index 84dc9f3450..0000000000
--- a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate.sln
+++ /dev/null
@@ -1,142 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualAssistantTemplate", "VirtualAssistantTemplate\VirtualAssistantTemplate\VirtualAssistantTemplate.csproj", "{2ECA0FF9-C84C-4584-A81E-EF809357B8C2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualAssistantTemplate.Tests", "VirtualAssistantTemplate\VirtualAssistantTemplate.Tests\VirtualAssistantTemplate.Tests.csproj", "{DA5F8DB9-6014-413D-8DE2-AF17F0E1DD70}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Skills", "..\..\lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills\Microsoft.Bot.Builder.Skills.csproj", "{AF3CAACD-5217-4520-B07F-D7CE3BA9207B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Skills.Tests", "..\..\lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills.Tests\Microsoft.Bot.Builder.Skills.Tests.csproj", "{C4527913-0F04-47E7-AEBE-89938CA40C56}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skills", "Skills", "{C4600362-8248-40AE-955D-8C7BE6D8CC49}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkill", "..\..\solutions\Virtual-Assistant\src\csharp\skills\calendarskill\calendarskill\CalendarSkill.csproj", "{F922B40F-5ABD-4670-BAB2-BC28AD28DDA7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkill", "..\..\solutions\Virtual-Assistant\src\csharp\skills\emailskill\emailskill\EmailSkill.csproj", "{13C7AB51-12FE-4298-BE6A-5D66B5EF5791}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkill", "..\..\solutions\Virtual-Assistant\src\csharp\skills\todoskill\todoskill\ToDoSkill.csproj", "{61E39158-9BC6-467E-979E-F1BE4AF46245}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkill", "..\..\solutions\Virtual-Assistant\src\csharp\skills\automotiveskill\automotiveskill\AutomotiveSkill.csproj", "{01DDE884-123D-480B-A8D4-553B9BDE30EE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkill", "..\..\solutions\Virtual-Assistant\src\csharp\skills\pointofinterestskill\pointofinterestskill\PointOfInterestSkill.csproj", "{B8CE5404-C1A9-43C3-BE53-17FBE7747901}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewsSkill", "..\..\solutions\Virtual-Assistant\src\csharp\experimental\skills\newsskill\NewsSkill.csproj", "{D467B78B-72E8-44E2-B914-747A61D3E521}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RestaurantBooking", "..\..\solutions\Virtual-Assistant\src\csharp\experimental\skills\restaurantbooking\RestaurantBooking.csproj", "{BCA5846E-5FB7-4A93-BF81-6964CE8800ED}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Solutions", "..\..\lib\csharp\microsoft.bot.builder.solutions\microsoft.bot.builder.solutions\Microsoft.Bot.Builder.Solutions.csproj", "{D0D9D7AE-2761-49A3-AFA7-1A96B4E47085}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{8527BBD6-EA59-4AA5-82C6-EF554095171E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkillTest", "..\..\solutions\Virtual-Assistant\src\csharp\skills\todoskill\todoskilltest\ToDoSkillTest.csproj", "{48ABABED-6FFF-4800-817F-731A56A92C15}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkillTests", "..\..\solutions\Virtual-Assistant\src\csharp\skills\pointofinterestskill\pointofinterestskilltests\PointOfInterestSkillTests.csproj", "{7D9B6AF4-CCC5-4CE9-A14A-38086BD8CE8A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkillTest", "..\..\solutions\Virtual-Assistant\src\csharp\skills\emailskill\emailskilltest\EmailSkillTest.csproj", "{FBE736FB-876D-49DC-8421-7CC00927B737}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkillTest", "..\..\solutions\Virtual-Assistant\src\csharp\skills\calendarskill\calendarskilltest\CalendarSkillTest.csproj", "{76BA503E-A899-4724-BAE6-668E2B640D08}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkillTest", "..\..\solutions\Virtual-Assistant\src\csharp\skills\automotiveskill\automotiveskilltest\AutomotiveSkillTest.csproj", "{13B2EA00-7118-4FF1-9058-0A81458F960F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {2ECA0FF9-C84C-4584-A81E-EF809357B8C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2ECA0FF9-C84C-4584-A81E-EF809357B8C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2ECA0FF9-C84C-4584-A81E-EF809357B8C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2ECA0FF9-C84C-4584-A81E-EF809357B8C2}.Release|Any CPU.Build.0 = Release|Any CPU
- {DA5F8DB9-6014-413D-8DE2-AF17F0E1DD70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DA5F8DB9-6014-413D-8DE2-AF17F0E1DD70}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DA5F8DB9-6014-413D-8DE2-AF17F0E1DD70}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DA5F8DB9-6014-413D-8DE2-AF17F0E1DD70}.Release|Any CPU.Build.0 = Release|Any CPU
- {AF3CAACD-5217-4520-B07F-D7CE3BA9207B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AF3CAACD-5217-4520-B07F-D7CE3BA9207B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AF3CAACD-5217-4520-B07F-D7CE3BA9207B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AF3CAACD-5217-4520-B07F-D7CE3BA9207B}.Release|Any CPU.Build.0 = Release|Any CPU
- {C4527913-0F04-47E7-AEBE-89938CA40C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C4527913-0F04-47E7-AEBE-89938CA40C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C4527913-0F04-47E7-AEBE-89938CA40C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C4527913-0F04-47E7-AEBE-89938CA40C56}.Release|Any CPU.Build.0 = Release|Any CPU
- {F922B40F-5ABD-4670-BAB2-BC28AD28DDA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F922B40F-5ABD-4670-BAB2-BC28AD28DDA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F922B40F-5ABD-4670-BAB2-BC28AD28DDA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F922B40F-5ABD-4670-BAB2-BC28AD28DDA7}.Release|Any CPU.Build.0 = Release|Any CPU
- {13C7AB51-12FE-4298-BE6A-5D66B5EF5791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {13C7AB51-12FE-4298-BE6A-5D66B5EF5791}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {13C7AB51-12FE-4298-BE6A-5D66B5EF5791}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {13C7AB51-12FE-4298-BE6A-5D66B5EF5791}.Release|Any CPU.Build.0 = Release|Any CPU
- {61E39158-9BC6-467E-979E-F1BE4AF46245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {61E39158-9BC6-467E-979E-F1BE4AF46245}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {61E39158-9BC6-467E-979E-F1BE4AF46245}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {61E39158-9BC6-467E-979E-F1BE4AF46245}.Release|Any CPU.Build.0 = Release|Any CPU
- {01DDE884-123D-480B-A8D4-553B9BDE30EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {01DDE884-123D-480B-A8D4-553B9BDE30EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {01DDE884-123D-480B-A8D4-553B9BDE30EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {01DDE884-123D-480B-A8D4-553B9BDE30EE}.Release|Any CPU.Build.0 = Release|Any CPU
- {B8CE5404-C1A9-43C3-BE53-17FBE7747901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B8CE5404-C1A9-43C3-BE53-17FBE7747901}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B8CE5404-C1A9-43C3-BE53-17FBE7747901}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B8CE5404-C1A9-43C3-BE53-17FBE7747901}.Release|Any CPU.Build.0 = Release|Any CPU
- {D467B78B-72E8-44E2-B914-747A61D3E521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D467B78B-72E8-44E2-B914-747A61D3E521}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D467B78B-72E8-44E2-B914-747A61D3E521}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D467B78B-72E8-44E2-B914-747A61D3E521}.Release|Any CPU.Build.0 = Release|Any CPU
- {BCA5846E-5FB7-4A93-BF81-6964CE8800ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BCA5846E-5FB7-4A93-BF81-6964CE8800ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BCA5846E-5FB7-4A93-BF81-6964CE8800ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BCA5846E-5FB7-4A93-BF81-6964CE8800ED}.Release|Any CPU.Build.0 = Release|Any CPU
- {D0D9D7AE-2761-49A3-AFA7-1A96B4E47085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D0D9D7AE-2761-49A3-AFA7-1A96B4E47085}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D0D9D7AE-2761-49A3-AFA7-1A96B4E47085}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D0D9D7AE-2761-49A3-AFA7-1A96B4E47085}.Release|Any CPU.Build.0 = Release|Any CPU
- {48ABABED-6FFF-4800-817F-731A56A92C15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {48ABABED-6FFF-4800-817F-731A56A92C15}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {48ABABED-6FFF-4800-817F-731A56A92C15}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {48ABABED-6FFF-4800-817F-731A56A92C15}.Release|Any CPU.Build.0 = Release|Any CPU
- {7D9B6AF4-CCC5-4CE9-A14A-38086BD8CE8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7D9B6AF4-CCC5-4CE9-A14A-38086BD8CE8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7D9B6AF4-CCC5-4CE9-A14A-38086BD8CE8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7D9B6AF4-CCC5-4CE9-A14A-38086BD8CE8A}.Release|Any CPU.Build.0 = Release|Any CPU
- {FBE736FB-876D-49DC-8421-7CC00927B737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FBE736FB-876D-49DC-8421-7CC00927B737}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FBE736FB-876D-49DC-8421-7CC00927B737}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FBE736FB-876D-49DC-8421-7CC00927B737}.Release|Any CPU.Build.0 = Release|Any CPU
- {76BA503E-A899-4724-BAE6-668E2B640D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {76BA503E-A899-4724-BAE6-668E2B640D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {76BA503E-A899-4724-BAE6-668E2B640D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {76BA503E-A899-4724-BAE6-668E2B640D08}.Release|Any CPU.Build.0 = Release|Any CPU
- {13B2EA00-7118-4FF1-9058-0A81458F960F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {13B2EA00-7118-4FF1-9058-0A81458F960F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {13B2EA00-7118-4FF1-9058-0A81458F960F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {13B2EA00-7118-4FF1-9058-0A81458F960F}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {AF3CAACD-5217-4520-B07F-D7CE3BA9207B} = {8527BBD6-EA59-4AA5-82C6-EF554095171E}
- {C4527913-0F04-47E7-AEBE-89938CA40C56} = {8527BBD6-EA59-4AA5-82C6-EF554095171E}
- {F922B40F-5ABD-4670-BAB2-BC28AD28DDA7} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {13C7AB51-12FE-4298-BE6A-5D66B5EF5791} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {61E39158-9BC6-467E-979E-F1BE4AF46245} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {01DDE884-123D-480B-A8D4-553B9BDE30EE} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {B8CE5404-C1A9-43C3-BE53-17FBE7747901} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {D467B78B-72E8-44E2-B914-747A61D3E521} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {BCA5846E-5FB7-4A93-BF81-6964CE8800ED} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {D0D9D7AE-2761-49A3-AFA7-1A96B4E47085} = {8527BBD6-EA59-4AA5-82C6-EF554095171E}
- {48ABABED-6FFF-4800-817F-731A56A92C15} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {7D9B6AF4-CCC5-4CE9-A14A-38086BD8CE8A} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {FBE736FB-876D-49DC-8421-7CC00927B737} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {76BA503E-A899-4724-BAE6-668E2B640D08} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- {13B2EA00-7118-4FF1-9058-0A81458F960F} = {C4600362-8248-40AE-955D-8C7BE6D8CC49}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {3AE949A3-66FB-4B9A-B260-8F42B2E59837}
- EndGlobalSection
-EndGlobal
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/de/general.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/de/general.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/de/general.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/de/general.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/en/general.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/en/general.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/en/general.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/en/general.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/es/general.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/es/general.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/es/general.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/es/general.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/fr/general.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/fr/general.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/fr/general.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/fr/general.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/it/general.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/it/general.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/it/general.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/it/general.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/zh/general.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/zh/general.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/LU/zh/general.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/LU/zh/general.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/de/chitchat.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/de/chitchat.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/de/chitchat.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/de/chitchat.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/de/faq.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/de/faq.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/de/faq.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/de/faq.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/en/chitchat.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/en/chitchat.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/en/chitchat.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/en/chitchat.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/en/faq.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/en/faq.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/en/faq.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/en/faq.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/es/chitchat.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/es/chitchat.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/es/chitchat.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/es/chitchat.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/es/faq.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/es/faq.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/es/faq.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/es/faq.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/fr/chitchat.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/fr/chitchat.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/fr/chitchat.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/fr/chitchat.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/fr/faq.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/fr/faq.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/fr/faq.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/fr/faq.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/it/chitchat.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/it/chitchat.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/it/chitchat.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/it/chitchat.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/it/faq.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/it/faq.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/it/faq.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/it/faq.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/zh/chitchat.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/zh/chitchat.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/zh/chitchat.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/zh/chitchat.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/zh/faq.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/zh/faq.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/QnA/zh/faq.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/QnA/zh/faq.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/automotive.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/automotive.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/automotive.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/automotive.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/calendar.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/calendar.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/calendar.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/calendar.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/email.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/email.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/email.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/email.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/pointofinterest.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/pointofinterest.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/pointofinterest.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/pointofinterest.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/todo.lu b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/todo.lu
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/Skills/en/todo.lu
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/Skills/en/todo.lu
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/parameters.template.json b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/parameters.template.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/parameters.template.json
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/parameters.template.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/template.json b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/template.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Resources/template.json
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Resources/template.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/luis_functions.ps1 b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/luis_functions.ps1
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/luis_functions.ps1
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/luis_functions.ps1
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/qna_functions.ps1 b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/qna_functions.ps1
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/qna_functions.ps1
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/qna_functions.ps1
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_add_remote_skill.ps1 b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_add_remote_skill.ps1
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_add_remote_skill.ps1
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_add_remote_skill.ps1
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_add_skill.ps1 b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_add_skill.ps1
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_add_skill.ps1
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_add_skill.ps1
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_deploy.ps1 b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_deploy.ps1
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_deploy.ps1
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_deploy.ps1
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_deploy_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_deploy_cognitive_models.ps1
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_deploy_cognitive_models.ps1
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_deploy_cognitive_models.ps1
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_update.ps1 b/templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_update.ps1
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/Deployment/Scripts/va_update.ps1
rename to templates/Virtual-Assistant-Template/src/csharp/Deployment/Scripts/va_update.ps1
diff --git a/templates/Virtual-Assistant-Template/NuGet.Config b/templates/Virtual-Assistant-Template/src/csharp/NuGet.Config
similarity index 100%
rename from templates/Virtual-Assistant-Template/NuGet.Config
rename to templates/Virtual-Assistant-Template/src/csharp/NuGet.Config
diff --git a/templates/Virtual-Assistant-Template/README.md b/templates/Virtual-Assistant-Template/src/csharp/README.md
similarity index 100%
rename from templates/Virtual-Assistant-Template/README.md
rename to templates/Virtual-Assistant-Template/src/csharp/README.md
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/BotTestBase.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/BotTestBase.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/BotTestBase.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/BotTestBase.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/InterruptionTests.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/InterruptionTests.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/InterruptionTests.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/InterruptionTests.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/LocalizationTests.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/LocalizationTests.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/LocalizationTests.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/LocalizationTests.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/MainDialogTests.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/MainDialogTests.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/MainDialogTests.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/MainDialogTests.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Mocks/MockLuisRecognizer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Mocks/MockLuisRecognizer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Mocks/MockLuisRecognizer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Mocks/MockLuisRecognizer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Mocks/MockQnAMaker.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Mocks/MockQnAMaker.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Mocks/MockQnAMaker.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Mocks/MockQnAMaker.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/OnboardingDialogTests.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/OnboardingDialogTests.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/OnboardingDialogTests.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/OnboardingDialogTests.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/chitchat_default.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/chitchat_default.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/chitchat_default.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/chitchat_default.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/chitchat_greeting.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/chitchat_greeting.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/chitchat_greeting.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/chitchat_greeting.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/faq_default.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/faq_default.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/faq_default.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/faq_default.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/faq_overview.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/faq_overview.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Resources/faq_overview.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Resources/faq_overview.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/ChitchatTestUtil.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/ChitchatTestUtil.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/ChitchatTestUtil.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/ChitchatTestUtil.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/DispatchTestUtil.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/DispatchTestUtil.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/DispatchTestUtil.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/DispatchTestUtil.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/FaqTestUtil.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/FaqTestUtil.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/FaqTestUtil.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/FaqTestUtil.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/GeneralTestUtil.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/GeneralTestUtil.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utilities/GeneralTestUtil.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utilities/GeneralTestUtil.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/ChitchatUtterances.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/FaqUtterances.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/Utterances/GeneralUtterances.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/VirtualAssistantTemplate.Tests.csproj b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/VirtualAssistantTemplate.Tests.csproj
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate.Tests/VirtualAssistantTemplate.Tests.csproj
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.Tests/VirtualAssistantTemplate.Tests.csproj
diff --git a/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.sln b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.sln
new file mode 100644
index 0000000000..41e487f9fa
--- /dev/null
+++ b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate.sln
@@ -0,0 +1,67 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.421
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{8527BBD6-EA59-4AA5-82C6-EF554095171E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualAssistantTemplate", "VirtualAssistantTemplate\VirtualAssistantTemplate.csproj", "{B88583C7-1944-471F-BC72-0D7100218F16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualAssistantTemplate.Tests", "VirtualAssistantTemplate.Tests\VirtualAssistantTemplate.Tests.csproj", "{A60CEDA1-F86B-45A5-A112-FF91103FD6C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Solutions", "..\..\..\..\lib\csharp\microsoft.bot.builder.solutions\microsoft.bot.builder.solutions\Microsoft.Bot.Builder.Solutions.csproj", "{6692745A-424D-4A77-AC84-8DAB06706A8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Skills", "..\..\..\..\lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills\Microsoft.Bot.Builder.Skills.csproj", "{B3C09DD7-7625-4A5D-AEE9-B64B120BED21}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug - NuGet Packages|Any CPU = Debug - NuGet Packages|Any CPU
+ Debug|Any CPU = Debug|Any CPU
+ Documentation|Any CPU = Documentation|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B88583C7-1944-471F-BC72-0D7100218F16}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A60CEDA1-F86B-45A5-A112-FF91103FD6C2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug - NuGet Packages|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Debug - NuGet Packages|Any CPU.Build.0 = Debug - NuGet Packages|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6692745A-424D-4A77-AC84-8DAB06706A8E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug - NuGet Packages|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Debug - NuGet Packages|Any CPU.Build.0 = Debug - NuGet Packages|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {6692745A-424D-4A77-AC84-8DAB06706A8E} = {8527BBD6-EA59-4AA5-82C6-EF554095171E}
+ {B3C09DD7-7625-4A5D-AEE9-B64B120BED21} = {8527BBD6-EA59-4AA5-82C6-EF554095171E}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {3AE949A3-66FB-4B9A-B260-8F42B2E59837}
+ EndGlobalSection
+EndGlobal
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/.filenesting.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/.filenesting.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/.filenesting.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/.filenesting.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Adapters/DefaultAdapter.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Adapters/DefaultAdapter.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Adapters/DefaultAdapter.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Adapters/DefaultAdapter.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Bots/DialogBot.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Bots/DialogBot.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Bots/DialogBot.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Bots/DialogBot.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Connected Services/Application Insights/ConnectedService.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Connected Services/Application Insights/ConnectedService.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Connected Services/Application Insights/ConnectedService.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Connected Services/Application Insights/ConnectedService.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.de.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.de.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.de.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.de.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.es.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.es.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.es.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.es.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.fr.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.fr.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.fr.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.fr.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.it.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.it.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.it.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.it.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.zh.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.zh.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Content/Intro.zh.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Content/Intro.zh.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Controllers/BotController.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Controllers/BotController.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Controllers/BotController.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Controllers/BotController.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/AuthenticationDialog.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/AuthenticationDialog.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/AuthenticationDialog.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/AuthenticationDialog.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/CancelDialog.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/CancelDialog.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/CancelDialog.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/CancelDialog.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/EnterpriseDialog.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/EnterpriseDialog.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/EnterpriseDialog.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/EnterpriseDialog.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/EscalateDialog.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/EscalateDialog.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/EscalateDialog.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/EscalateDialog.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/MainDialog.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/MainDialog.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/MainDialog.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/MainDialog.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/OnboardingDialog.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/OnboardingDialog.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Dialogs/OnboardingDialog.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Dialogs/OnboardingDialog.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Models/OnboardingState.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Models/OnboardingState.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Models/OnboardingState.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Models/OnboardingState.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Program.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Program.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Program.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Program.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Properties/launchSettings.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Properties/launchSettings.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Properties/launchSettings.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Properties/launchSettings.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationResponses.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationResponses.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationResponses.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationResponses.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.de.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.de.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.de.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.de.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.es.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.es.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.es.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.es.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.fr.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.fr.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.fr.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.fr.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.it.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.it.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.it.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.it.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.zh.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.zh.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.zh.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Authentication/AuthenticationStrings.zh.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelResponses.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelResponses.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelResponses.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelResponses.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.de.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.de.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.de.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.de.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.es.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.es.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.es.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.es.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.fr.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.fr.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.fr.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.fr.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.it.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.it.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.it.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.it.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.zh.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.zh.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.zh.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Cancel/CancelStrings.zh.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateResponses.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateResponses.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateResponses.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateResponses.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.de.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.de.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.de.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.de.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.es.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.es.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.es.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.es.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.fr.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.fr.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.fr.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.fr.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.it.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.it.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.it.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.it.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.zh.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.zh.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.zh.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Escalate/EscalateStrings.zh.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainResponses.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainResponses.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainResponses.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainResponses.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.de.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.de.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.de.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.de.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.es.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.es.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.es.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.es.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.fr.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.fr.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.fr.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.fr.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.it.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.it.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.it.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.it.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.zh.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.zh.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Main/MainStrings.zh.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Main/MainStrings.zh.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingResponses.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingResponses.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingResponses.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingResponses.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.Designer.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.Designer.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.Designer.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.Designer.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.de.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.de.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.de.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.de.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.es.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.es.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.es.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.es.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.fr.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.fr.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.fr.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.fr.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.it.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.it.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.it.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.it.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.zh.resx b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.zh.resx
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.zh.resx
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Responses/Onboarding/OnboardingStrings.zh.resx
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/BotServices.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/BotServices.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/BotServices.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/BotServices.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/BotSettings.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/BotSettings.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/BotSettings.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/BotSettings.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/DispatchLuis.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/DispatchLuis.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/DispatchLuis.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/DispatchLuis.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/GraphClient.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/GraphClient.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Services/GraphClient.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Services/GraphClient.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Startup.cs b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Startup.cs
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/Startup.cs
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/Startup.cs
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/VirtualAssistantTemplate.csproj b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/VirtualAssistantTemplate.csproj
similarity index 94%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/VirtualAssistantTemplate.csproj
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/VirtualAssistantTemplate.csproj
index e149744c6d..1dc378a588 100644
--- a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/VirtualAssistantTemplate.csproj
+++ b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/VirtualAssistantTemplate.csproj
@@ -30,11 +30,6 @@
-
-
-
-
-
True
@@ -117,4 +112,9 @@
+
+
+
+
+
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/appsettings.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/appsettings.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/appsettings.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/appsettings.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/cognitivemodels.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/cognitivemodels.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/cognitivemodels.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/cognitivemodels.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/readme.md b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/readme.md
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/readme.md
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/readme.md
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/skills.json b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/skills.json
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/skills.json
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/skills.json
diff --git a/templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/wwwroot/default.htm b/templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/wwwroot/default.htm
similarity index 100%
rename from templates/Virtual-Assistant-Template/VirtualAssistantTemplate/VirtualAssistantTemplate/wwwroot/default.htm
rename to templates/Virtual-Assistant-Template/src/csharp/VirtualAssistantTemplate/wwwroot/default.htm