diff --git a/skills/src/csharp/Directory.Build.props b/skills/csharp/Directory.Build.props similarity index 91% rename from skills/src/csharp/Directory.Build.props rename to skills/csharp/Directory.Build.props index 7c9cb6d7f6..69e94e14fa 100644 --- a/skills/src/csharp/Directory.Build.props +++ b/skills/csharp/Directory.Build.props @@ -1,6 +1,6 @@ - $(SolutionDir)..\..\..\VirtualAssistant.ruleset + $(SolutionDir)VirtualAssistant.ruleset diff --git a/skills/src/csharp/Skills.sln b/skills/csharp/Skills.sln similarity index 58% rename from skills/src/csharp/Skills.sln rename to skills/csharp/Skills.sln index 4baa848001..3b3801f58a 100644 --- a/skills/src/csharp/Skills.sln +++ b/skills/csharp/Skills.sln @@ -11,43 +11,43 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experimental", "Experimenta EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewsSkill", "experimental\newsskill\NewsSkill.csproj", "{ED046DC9-DDA3-4F38-9430-E89FEBD8ACE5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkill", "calendarskill\calendarskill\CalendarSkill.csproj", "{699B06B9-5F06-49F1-B63B-4E7F4BE49B9C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeatherSkill", "experimental\weatherskill\WeatherSkill.csproj", "{4A057581-2435-4E19-BA1B-30CE1E8AD504}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkillTest", "calendarskill\calendarskilltest\CalendarSkillTest.csproj", "{89E89E9E-C897-4890-A0BC-48D4EE6931D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HospitalitySkill", "experimental\hospitalityskill\HospitalitySkill.csproj", "{0EFEA4F2-DC7E-436E-B951-E9B566AFF7F0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkill", "emailskill\emailskill\EmailSkill.csproj", "{C0CE241E-B86B-43D1-A3DE-14FF6137ECD4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicSkill", "experimental\musicskill\MusicSkill.csproj", "{A2ECB4BF-FD59-4746-B699-F1C326D561BB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkillTest", "emailskill\emailskilltest\EmailSkillTest.csproj", "{5147C192-12C7-4D10-9F80-4EE17838A5A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSkill", "experimental\eventskill\EventSkill.csproj", "{5BF2293A-6E56-464A-8355-EDC8972F7E09}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkill", "pointofinterestskill\pointofinterestskill\PointOfInterestSkill.csproj", "{ABA18EBC-03B6-4FD7-928C-AFD3C3365621}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ITSMSkill", "experimental\itsmskill\ITSMSkill.csproj", "{3DEE3053-5DCC-4263-8692-2E96C7010997}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkillTests", "pointofinterestskill\pointofinterestskilltests\PointOfInterestSkillTests.csproj", "{30E3BEA1-CC07-4E0E-9671-28DC0C32F828}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BingSearchSkill", "experimental\bingsearchskill\BingSearchSkill.csproj", "{98AF8F5A-4CF9-45A3-93FD-836C54F9BD35}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkill", "todoskill\todoskill\ToDoSkill.csproj", "{3E44915A-1A7A-4229-9B7F-291FFC0EC075}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RestaurantBookingSkill", "experimental\restaurantbookingskill\RestaurantBookingSkill.csproj", "{9994CAA3-5648-4549-BEA2-6CFE9D1B77FC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkillTest", "todoskill\todoskilltest\ToDoSkillTest.csproj", "{9A2677E6-21E5-47EE-A42F-9D25079496D8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkill", "experimental\automotiveskill\AutomotiveSkill.csproj", "{C887B388-1AC6-4E7A-9659-82219C63CA65}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeatherSkill", "experimental\weatherskill\WeatherSkill.csproj", "{4A057581-2435-4E19-BA1B-30CE1E8AD504}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhoneSkill", "experimental\phoneskill\PhoneSkill.csproj", "{748D0940-CAF1-4F9A-9A70-D8E6983B2009}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HospitalitySkill", "experimental\hospitalityskill\HospitalitySkill.csproj", "{0EFEA4F2-DC7E-436E-B951-E9B566AFF7F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkill", "calendarskill\CalendarSkill.csproj", "{73934C86-A6CB-44EB-B4B6-38B962ECD878}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicSkill", "experimental\musicskill\MusicSkill.csproj", "{A2ECB4BF-FD59-4746-B699-F1C326D561BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkill", "emailskill\EmailSkill.csproj", "{5A9BD232-437D-42BD-94D0-3A0AC6F012BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSkill", "experimental\eventskill\EventSkill.csproj", "{5BF2293A-6E56-464A-8355-EDC8972F7E09}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkill", "todoskill\ToDoSkill.csproj", "{4876922C-64B4-45F4-992F-E42DB0266769}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ITSMSkill", "experimental\itsmskill\ITSMSkill.csproj", "{3DEE3053-5DCC-4263-8692-2E96C7010997}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkill", "pointofinterestskill\PointOfInterestSkill.csproj", "{5219290D-8277-419D-B7E8-EBF154751B78}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BingSearchSkill", "experimental\bingsearchskill\BingSearchSkill.csproj", "{98AF8F5A-4CF9-45A3-93FD-836C54F9BD35}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkill.Tests", "tests\automotiveskill.tests\AutomotiveSkill.Tests.csproj", "{71951CB9-39FB-4353-9FE1-FB04B2B29088}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RestaurantBookingSkill", "experimental\restaurantbookingskill\RestaurantBookingSkill.csproj", "{9994CAA3-5648-4549-BEA2-6CFE9D1B77FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarSkill.Tests", "tests\calendarskill.tests\CalendarSkill.Tests.csproj", "{3028E946-0C96-4921-A6B5-B08F70013DA6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkill", "experimental\automotiveskill\automotiveskill\AutomotiveSkill.csproj", "{35C0B993-2025-47CC-8588-FE35E0CEBFF6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmailSkill.Tests", "tests\emailskill.tests\EmailSkill.Tests.csproj", "{F736804C-5EE5-4826-912D-6AA05F6894A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhoneSkill", "experimental\phoneskill\phoneskill\PhoneSkill.csproj", "{FCA4385B-1229-4F5D-856B-C0D9AB786E15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhoneSkill.Tests", "tests\phoneskill.tests\PhoneSkill.Tests.csproj", "{D579437F-2F4A-47D3-9052-A0F2D89AA462}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhoneSkillTest", "experimental\phoneskill\phoneskilltest\PhoneSkillTest.csproj", "{3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PointOfInterestSkill.Tests", "tests\pointofinterestskill.tests\PointOfInterestSkill.Tests.csproj", "{60C61091-17E1-46B7-A358-190843D3AFE7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomotiveSkillTest", "experimental\automotiveskill\automotiveskilltest\AutomotiveSkillTest.csproj", "{BAC38052-E1DD-4791-97E2-909932D13F5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToDoSkill.Tests", "tests\todoskill.tests\ToDoSkill.Tests.csproj", "{5882D204-F86A-47D1-8685-BFD357E5EBF6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -65,70 +65,6 @@ Global {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 - {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 {4A057581-2435-4E19-BA1B-30CE1E8AD504}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU {4A057581-2435-4E19-BA1B-30CE1E8AD504}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU {4A057581-2435-4E19-BA1B-30CE1E8AD504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -185,52 +121,108 @@ Global {9994CAA3-5648-4549-BEA2-6CFE9D1B77FC}.Documentation|Any CPU.Build.0 = Debug|Any CPU {9994CAA3-5648-4549-BEA2-6CFE9D1B77FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {9994CAA3-5648-4549-BEA2-6CFE9D1B77FC}.Release|Any CPU.Build.0 = Release|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Documentation|Any CPU.Build.0 = Debug|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35C0B993-2025-47CC-8588-FE35E0CEBFF6}.Release|Any CPU.Build.0 = Release|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Documentation|Any CPU.Build.0 = Debug|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCA4385B-1229-4F5D-856B-C0D9AB786E15}.Release|Any CPU.Build.0 = Release|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Documentation|Any CPU.Build.0 = Debug|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7}.Release|Any CPU.Build.0 = Release|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Documentation|Any CPU.Build.0 = Debug|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAC38052-E1DD-4791-97E2-909932D13F5D}.Release|Any CPU.Build.0 = Release|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C887B388-1AC6-4E7A-9659-82219C63CA65}.Release|Any CPU.Build.0 = Release|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Debug|Any CPU.Build.0 = Debug|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Release|Any CPU.ActiveCfg = Release|Any CPU + {748D0940-CAF1-4F9A-9A70-D8E6983B2009}.Release|Any CPU.Build.0 = Release|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73934C86-A6CB-44EB-B4B6-38B962ECD878}.Release|Any CPU.Build.0 = Release|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC}.Release|Any CPU.Build.0 = Release|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4876922C-64B4-45F4-992F-E42DB0266769}.Release|Any CPU.Build.0 = Release|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5219290D-8277-419D-B7E8-EBF154751B78}.Release|Any CPU.Build.0 = Release|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71951CB9-39FB-4353-9FE1-FB04B2B29088}.Release|Any CPU.Build.0 = Release|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3028E946-0C96-4921-A6B5-B08F70013DA6}.Release|Any CPU.Build.0 = Release|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F736804C-5EE5-4826-912D-6AA05F6894A3}.Release|Any CPU.Build.0 = Release|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D579437F-2F4A-47D3-9052-A0F2D89AA462}.Release|Any CPU.Build.0 = Release|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60C61091-17E1-46B7-A358-190843D3AFE7}.Release|Any CPU.Build.0 = Release|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.Documentation|Any CPU.Build.0 = Debug|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5882D204-F86A-47D1-8685-BFD357E5EBF6}.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} - {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} {4A057581-2435-4E19-BA1B-30CE1E8AD504} = {3665D242-1A88-4860-B148-BAB695B7B5E4} {0EFEA4F2-DC7E-436E-B951-E9B566AFF7F0} = {3665D242-1A88-4860-B148-BAB695B7B5E4} {A2ECB4BF-FD59-4746-B699-F1C326D561BB} = {3665D242-1A88-4860-B148-BAB695B7B5E4} @@ -238,10 +230,18 @@ Global {3DEE3053-5DCC-4263-8692-2E96C7010997} = {3665D242-1A88-4860-B148-BAB695B7B5E4} {98AF8F5A-4CF9-45A3-93FD-836C54F9BD35} = {3665D242-1A88-4860-B148-BAB695B7B5E4} {9994CAA3-5648-4549-BEA2-6CFE9D1B77FC} = {3665D242-1A88-4860-B148-BAB695B7B5E4} - {35C0B993-2025-47CC-8588-FE35E0CEBFF6} = {3665D242-1A88-4860-B148-BAB695B7B5E4} - {FCA4385B-1229-4F5D-856B-C0D9AB786E15} = {3665D242-1A88-4860-B148-BAB695B7B5E4} - {3343B379-DB3C-4FA8-A639-2CEB81EE0CD7} = {15B08548-1311-4749-8816-186C3268386E} - {BAC38052-E1DD-4791-97E2-909932D13F5D} = {15B08548-1311-4749-8816-186C3268386E} + {C887B388-1AC6-4E7A-9659-82219C63CA65} = {3665D242-1A88-4860-B148-BAB695B7B5E4} + {748D0940-CAF1-4F9A-9A70-D8E6983B2009} = {3665D242-1A88-4860-B148-BAB695B7B5E4} + {73934C86-A6CB-44EB-B4B6-38B962ECD878} = {34280F2E-60EB-4566-9ECD-56F114372037} + {5A9BD232-437D-42BD-94D0-3A0AC6F012BC} = {34280F2E-60EB-4566-9ECD-56F114372037} + {4876922C-64B4-45F4-992F-E42DB0266769} = {34280F2E-60EB-4566-9ECD-56F114372037} + {5219290D-8277-419D-B7E8-EBF154751B78} = {34280F2E-60EB-4566-9ECD-56F114372037} + {71951CB9-39FB-4353-9FE1-FB04B2B29088} = {15B08548-1311-4749-8816-186C3268386E} + {3028E946-0C96-4921-A6B5-B08F70013DA6} = {15B08548-1311-4749-8816-186C3268386E} + {F736804C-5EE5-4826-912D-6AA05F6894A3} = {15B08548-1311-4749-8816-186C3268386E} + {D579437F-2F4A-47D3-9052-A0F2D89AA462} = {15B08548-1311-4749-8816-186C3268386E} + {60C61091-17E1-46B7-A358-190843D3AFE7} = {15B08548-1311-4749-8816-186C3268386E} + {5882D204-F86A-47D1-8685-BFD357E5EBF6} = {15B08548-1311-4749-8816-186C3268386E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7B849B7E-CCF5-4031-91F7-CA835433B457} diff --git a/skills/src/csharp/VirtualAssistant.ruleset b/skills/csharp/VirtualAssistant.ruleset similarity index 100% rename from skills/src/csharp/VirtualAssistant.ruleset rename to skills/csharp/VirtualAssistant.ruleset diff --git a/skills/src/csharp/calendarskill/calendarskill/.filenesting.json b/skills/csharp/calendarskill/.filenesting.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/.filenesting.json rename to skills/csharp/calendarskill/.filenesting.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Adapters/CalendarSkillWebSocketBotAdapter.cs b/skills/csharp/calendarskill/Adapters/CalendarSkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Adapters/CalendarSkillWebSocketBotAdapter.cs rename to skills/csharp/calendarskill/Adapters/CalendarSkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Adapters/DefaultAdapter.cs b/skills/csharp/calendarskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Adapters/DefaultAdapter.cs rename to skills/csharp/calendarskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Bots/DialogBot.cs b/skills/csharp/calendarskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Bots/DialogBot.cs rename to skills/csharp/calendarskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/CalendarSkill.csproj b/skills/csharp/calendarskill/CalendarSkill.csproj similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/CalendarSkill.csproj rename to skills/csharp/calendarskill/CalendarSkill.csproj diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarCard.json b/skills/csharp/calendarskill/Content/CalendarCard.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarCard.json rename to skills/csharp/calendarskill/Content/CalendarCard.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarCardNoJoinButton.json b/skills/csharp/calendarskill/Content/CalendarCardNoJoinButton.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarCardNoJoinButton.json rename to skills/csharp/calendarskill/Content/CalendarCardNoJoinButton.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDate.json b/skills/csharp/calendarskill/Content/CalendarDate.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDate.json rename to skills/csharp/calendarskill/Content/CalendarDate.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetail.json b/skills/csharp/calendarskill/Content/CalendarDetail.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetail.json rename to skills/csharp/calendarskill/Content/CalendarDetail.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerNoParticipants.1.0.json b/skills/csharp/calendarskill/Content/CalendarDetailContainerNoParticipants.1.0.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerNoParticipants.1.0.json rename to skills/csharp/calendarskill/Content/CalendarDetailContainerNoParticipants.1.0.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerNoParticipants.json b/skills/csharp/calendarskill/Content/CalendarDetailContainerNoParticipants.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerNoParticipants.json rename to skills/csharp/calendarskill/Content/CalendarDetailContainerNoParticipants.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.1.0.json b/skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsLess.1.0.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.1.0.json rename to skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsLess.1.0.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.json b/skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsLess.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsLess.json rename to skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsLess.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.1.0.json b/skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsMore.1.0.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.1.0.json rename to skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsMore.1.0.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.json b/skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsMore.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailContainerParticipantsMore.json rename to skills/csharp/calendarskill/Content/CalendarDetailContainerParticipantsMore.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailNoJoinButton.json b/skills/csharp/calendarskill/Content/CalendarDetailNoJoinButton.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarDetailNoJoinButton.json rename to skills/csharp/calendarskill/Content/CalendarDetailNoJoinButton.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.1.0.json b/skills/csharp/calendarskill/Content/CalendarGeneralMeetingList.1.0.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.1.0.json rename to skills/csharp/calendarskill/Content/CalendarGeneralMeetingList.1.0.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.json b/skills/csharp/calendarskill/Content/CalendarGeneralMeetingList.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarGeneralMeetingList.json rename to skills/csharp/calendarskill/Content/CalendarGeneralMeetingList.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarItem.json b/skills/csharp/calendarskill/Content/CalendarItem.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarItem.json rename to skills/csharp/calendarskill/Content/CalendarItem.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarOverview.1.0.json b/skills/csharp/calendarskill/Content/CalendarOverview.1.0.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarOverview.1.0.json rename to skills/csharp/calendarskill/Content/CalendarOverview.1.0.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Content/CalendarOverview.json b/skills/csharp/calendarskill/Content/CalendarOverview.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Content/CalendarOverview.json rename to skills/csharp/calendarskill/Content/CalendarOverview.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Controllers/BotController.cs b/skills/csharp/calendarskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Controllers/BotController.cs rename to skills/csharp/calendarskill/Controllers/BotController.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/de/Calendar.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/de/Calendar.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/de/Calendar.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/de/Calendar.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/de/General.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/de/General.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/de/General.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/de/General.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/en/Calendar.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/en/Calendar.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/en/Calendar.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/en/Calendar.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/es/Calendar.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/es/Calendar.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/es/Calendar.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/es/Calendar.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/es/General.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/es/General.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/es/General.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/es/General.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/fr/Calendar.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/fr/Calendar.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/fr/Calendar.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/fr/Calendar.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/fr/General.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/fr/General.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/fr/General.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/fr/General.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/it/Calendar.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/it/Calendar.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/it/Calendar.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/it/Calendar.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/it/General.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/it/General.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/it/General.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/it/General.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/zh/Calendar.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/zh/Calendar.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/zh/Calendar.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/zh/Calendar.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/calendarskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/calendarskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/parameters.template.json b/skills/csharp/calendarskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/parameters.template.json rename to skills/csharp/calendarskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/template.json b/skills/csharp/calendarskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Resources/template.json rename to skills/csharp/calendarskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/calendarskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/calendarskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/calendarskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/calendarskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/calendarskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/calendarskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/publish.ps1 b/skills/csharp/calendarskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/calendarskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/calendarskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/calendarskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/calendarskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/calendarskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/CalendarSkillDialogBase.cs b/skills/csharp/calendarskill/Dialogs/CalendarSkillDialogBase.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/CalendarSkillDialogBase.cs rename to skills/csharp/calendarskill/Dialogs/CalendarSkillDialogBase.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/ChangeEventStatusDialog.cs b/skills/csharp/calendarskill/Dialogs/ChangeEventStatusDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/ChangeEventStatusDialog.cs rename to skills/csharp/calendarskill/Dialogs/ChangeEventStatusDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs b/skills/csharp/calendarskill/Dialogs/CreateEventDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/CreateEventDialog.cs rename to skills/csharp/calendarskill/Dialogs/CreateEventDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/FindContactDialog.cs b/skills/csharp/calendarskill/Dialogs/FindContactDialog.cs similarity index 82% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/FindContactDialog.cs rename to skills/csharp/calendarskill/Dialogs/FindContactDialog.cs index fc260c6308..a92dc04d71 100644 --- a/skills/src/csharp/calendarskill/calendarskill/Dialogs/FindContactDialog.cs +++ b/skills/csharp/calendarskill/Dialogs/FindContactDialog.cs @@ -1,31 +1,31 @@  using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Linq; -using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; -using CalendarSkill.Models; -using CalendarSkill.Models.DialogOptions; -using CalendarSkill.Responses.CreateEvent; -using CalendarSkill.Responses.FindContact; -using CalendarSkill.Responses.Shared; -using CalendarSkill.Services; -using CalendarSkill.Utilities; -using Luis; -using Microsoft.Bot.Builder; -using Microsoft.Bot.Builder.Dialogs; -using Microsoft.Bot.Builder.Dialogs.Choices; -using Microsoft.Bot.Builder.Skills; -using Microsoft.Bot.Builder.Solutions.Extensions; -using Microsoft.Bot.Builder.Solutions.Resources; -using Microsoft.Bot.Builder.Solutions.Responses; -using Microsoft.Bot.Builder.Solutions.Util; -using Microsoft.Bot.Connector.Authentication; -using Microsoft.Graph; -using static CalendarSkill.Models.CalendarSkillState; - -namespace CalendarSkill.Dialogs + using System.Collections.Generic; + using System.Collections.Specialized; + using System.Linq; + using System.Text.RegularExpressions; + using System.Threading; + using System.Threading.Tasks; + using CalendarSkill.Models; + using CalendarSkill.Models.DialogOptions; + using CalendarSkill.Responses.CreateEvent; + using CalendarSkill.Responses.FindContact; + using CalendarSkill.Responses.Shared; + using CalendarSkill.Services; + using CalendarSkill.Utilities; + using Luis; + using Microsoft.Bot.Builder; + using Microsoft.Bot.Builder.Dialogs; + using Microsoft.Bot.Builder.Dialogs.Choices; + using Microsoft.Bot.Builder.Skills; + using Microsoft.Bot.Builder.Solutions.Extensions; + using Microsoft.Bot.Builder.Solutions.Resources; + using Microsoft.Bot.Builder.Solutions.Responses; + using Microsoft.Bot.Builder.Solutions.Util; + using Microsoft.Bot.Connector.Authentication; + using Microsoft.Graph; + using static CalendarSkill.Models.CalendarSkillState; + + namespace CalendarSkill.Dialogs { public class FindContactDialog : CalendarSkillDialogBase { diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/JoinEventDialog.cs b/skills/csharp/calendarskill/Dialogs/JoinEventDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/JoinEventDialog.cs rename to skills/csharp/calendarskill/Dialogs/JoinEventDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/MainDialog.cs b/skills/csharp/calendarskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/MainDialog.cs rename to skills/csharp/calendarskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/ShowEventsDialog.cs b/skills/csharp/calendarskill/Dialogs/ShowEventsDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/ShowEventsDialog.cs rename to skills/csharp/calendarskill/Dialogs/ShowEventsDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/TimeRemainingDialog.cs b/skills/csharp/calendarskill/Dialogs/TimeRemainingDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/TimeRemainingDialog.cs rename to skills/csharp/calendarskill/Dialogs/TimeRemainingDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/UpcomingEventDialog.cs b/skills/csharp/calendarskill/Dialogs/UpcomingEventDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/UpcomingEventDialog.cs rename to skills/csharp/calendarskill/Dialogs/UpcomingEventDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs b/skills/csharp/calendarskill/Dialogs/UpdateEventDialog.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Dialogs/UpdateEventDialog.cs rename to skills/csharp/calendarskill/Dialogs/UpdateEventDialog.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Extensions/UserEx.cs b/skills/csharp/calendarskill/Extensions/UserEx.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Extensions/UserEx.cs rename to skills/csharp/calendarskill/Extensions/UserEx.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/AskParameterModel.cs b/skills/csharp/calendarskill/Models/AskParameterModel.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/AskParameterModel.cs rename to skills/csharp/calendarskill/Models/AskParameterModel.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/CalendarDateCardData.cs b/skills/csharp/calendarskill/Models/CalendarDateCardData.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/CalendarDateCardData.cs rename to skills/csharp/calendarskill/Models/CalendarDateCardData.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailCardData.cs b/skills/csharp/calendarskill/Models/CalendarDetailCardData.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailCardData.cs rename to skills/csharp/calendarskill/Models/CalendarDetailCardData.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailContainerCardData.cs b/skills/csharp/calendarskill/Models/CalendarDetailContainerCardData.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/CalendarDetailContainerCardData.cs rename to skills/csharp/calendarskill/Models/CalendarDetailContainerCardData.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/CalendarItemCardData.cs b/skills/csharp/calendarskill/Models/CalendarItemCardData.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/CalendarItemCardData.cs rename to skills/csharp/calendarskill/Models/CalendarItemCardData.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/CalendarMeetingListCardData.cs b/skills/csharp/calendarskill/Models/CalendarMeetingListCardData.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/CalendarMeetingListCardData.cs rename to skills/csharp/calendarskill/Models/CalendarMeetingListCardData.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/CalendarSkillState.cs b/skills/csharp/calendarskill/Models/CalendarSkillState.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/CalendarSkillState.cs rename to skills/csharp/calendarskill/Models/CalendarSkillState.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/CreateEventStateModel.cs b/skills/csharp/calendarskill/Models/CreateEventStateModel.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/CreateEventStateModel.cs rename to skills/csharp/calendarskill/Models/CreateEventStateModel.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/CalendarSkillDialogOptions.cs b/skills/csharp/calendarskill/Models/DialogOptions/CalendarSkillDialogOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/CalendarSkillDialogOptions.cs rename to skills/csharp/calendarskill/Models/DialogOptions/CalendarSkillDialogOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/ChangeEventStatusDialogOptions.cs b/skills/csharp/calendarskill/Models/DialogOptions/ChangeEventStatusDialogOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/ChangeEventStatusDialogOptions.cs rename to skills/csharp/calendarskill/Models/DialogOptions/ChangeEventStatusDialogOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/FindContactDialogOptions.cs b/skills/csharp/calendarskill/Models/DialogOptions/FindContactDialogOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/FindContactDialogOptions.cs rename to skills/csharp/calendarskill/Models/DialogOptions/FindContactDialogOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/ShowMeetingsDialogOptions.cs b/skills/csharp/calendarskill/Models/DialogOptions/ShowMeetingsDialogOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/ShowMeetingsDialogOptions.cs rename to skills/csharp/calendarskill/Models/DialogOptions/ShowMeetingsDialogOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/UpdateAddressDialogOptions.cs b/skills/csharp/calendarskill/Models/DialogOptions/UpdateAddressDialogOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/UpdateAddressDialogOptions.cs rename to skills/csharp/calendarskill/Models/DialogOptions/UpdateAddressDialogOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/UpdateDateTimeDialogOptions.cs b/skills/csharp/calendarskill/Models/DialogOptions/UpdateDateTimeDialogOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/UpdateDateTimeDialogOptions.cs rename to skills/csharp/calendarskill/Models/DialogOptions/UpdateDateTimeDialogOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/UpdateUserNameDialogOptions.cs b/skills/csharp/calendarskill/Models/DialogOptions/UpdateUserNameDialogOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/DialogOptions/UpdateUserNameDialogOptions.cs rename to skills/csharp/calendarskill/Models/DialogOptions/UpdateUserNameDialogOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/EventModel.cs b/skills/csharp/calendarskill/Models/EventModel.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/EventModel.cs rename to skills/csharp/calendarskill/Models/EventModel.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/GoogleAttendeeStatus.cs b/skills/csharp/calendarskill/Models/GoogleAttendeeStatus.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/GoogleAttendeeStatus.cs rename to skills/csharp/calendarskill/Models/GoogleAttendeeStatus.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/OpenDefaultApp.cs b/skills/csharp/calendarskill/Models/OpenDefaultApp.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/OpenDefaultApp.cs rename to skills/csharp/calendarskill/Models/OpenDefaultApp.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/PersonModel.cs b/skills/csharp/calendarskill/Models/PersonModel.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/PersonModel.cs rename to skills/csharp/calendarskill/Models/PersonModel.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Models/TimeZoneResponse.cs b/skills/csharp/calendarskill/Models/TimeZoneResponse.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Models/TimeZoneResponse.cs rename to skills/csharp/calendarskill/Models/TimeZoneResponse.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Proactive/CheckUpcomingEventHandler.cs b/skills/csharp/calendarskill/Proactive/CheckUpcomingEventHandler.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Proactive/CheckUpcomingEventHandler.cs rename to skills/csharp/calendarskill/Proactive/CheckUpcomingEventHandler.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Program.cs b/skills/csharp/calendarskill/Program.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Program.cs rename to skills/csharp/calendarskill/Program.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/DatePrompt.cs b/skills/csharp/calendarskill/Prompts/DatePrompt.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/DatePrompt.cs rename to skills/csharp/calendarskill/Prompts/DatePrompt.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/DurationPrompt.cs b/skills/csharp/calendarskill/Prompts/DurationPrompt.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/DurationPrompt.cs rename to skills/csharp/calendarskill/Prompts/DurationPrompt.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/GetEventPrompt.cs b/skills/csharp/calendarskill/Prompts/GetEventPrompt.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/GetEventPrompt.cs rename to skills/csharp/calendarskill/Prompts/GetEventPrompt.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/GetRecreateInfoPrompt.cs b/skills/csharp/calendarskill/Prompts/GetRecreateInfoPrompt.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/GetRecreateInfoPrompt.cs rename to skills/csharp/calendarskill/Prompts/GetRecreateInfoPrompt.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/Options/DatePromptOptions.cs b/skills/csharp/calendarskill/Prompts/Options/DatePromptOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/Options/DatePromptOptions.cs rename to skills/csharp/calendarskill/Prompts/Options/DatePromptOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/Options/GetEventOptions.cs b/skills/csharp/calendarskill/Prompts/Options/GetEventOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/Options/GetEventOptions.cs rename to skills/csharp/calendarskill/Prompts/Options/GetEventOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/Options/NoSkipPromptOptions.cs b/skills/csharp/calendarskill/Prompts/Options/NoSkipPromptOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/Options/NoSkipPromptOptions.cs rename to skills/csharp/calendarskill/Prompts/Options/NoSkipPromptOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/Options/TimePromptOptions.cs b/skills/csharp/calendarskill/Prompts/Options/TimePromptOptions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/Options/TimePromptOptions.cs rename to skills/csharp/calendarskill/Prompts/Options/TimePromptOptions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Prompts/TimePrompt.cs b/skills/csharp/calendarskill/Prompts/TimePrompt.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Prompts/TimePrompt.cs rename to skills/csharp/calendarskill/Prompts/TimePrompt.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Properties/launchSettings.json b/skills/csharp/calendarskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Properties/launchSettings.json rename to skills/csharp/calendarskill/Properties/launchSettings.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json b/skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json rename to skills/csharp/calendarskill/Responses/ChangeEventStatus/ChangeEventStatusResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.cs b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.cs rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.json b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.json rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.tt b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.tt rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json b/skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json rename to skills/csharp/calendarskill/Responses/CreateEvent/CreateEventResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.cs b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.cs rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.de.json b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.de.json rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.es.json b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.es.json rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.fr.json b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.fr.json rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.it.json b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.it.json rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.json b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.json rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.tt b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.tt rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.zh.json b/skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/FindContact/FindContactResponses.zh.json rename to skills/csharp/calendarskill/Responses/FindContact/FindContactResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.cs b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.cs rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.json b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.json rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.tt b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.tt rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json b/skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json rename to skills/csharp/calendarskill/Responses/JoinEvent/JoinEventResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.cs b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.cs rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.de.json b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.de.json rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.es.json b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.es.json rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.fr.json b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.fr.json rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.it.json b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.it.json rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.json b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.json rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.tt b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.tt rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.zh.json b/skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Main/CalendarMainResponses.zh.json rename to skills/csharp/calendarskill/Responses/Main/CalendarMainResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs b/skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs rename to skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.Designer.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx b/skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx rename to skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.de.resx diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx b/skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx rename to skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.es.resx diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx b/skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx rename to skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.fr.resx diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx b/skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx rename to skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.it.resx diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.resx b/skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.resx similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.resx rename to skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.resx diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx b/skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx rename to skills/csharp/calendarskill/Responses/Shared/CalendarCommonStrings.zh.resx diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.cs b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.cs rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.de.json b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.de.json rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.es.json b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.es.json rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.it.json b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.it.json rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.json b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.json rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.tt b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.tt rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json b/skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json rename to skills/csharp/calendarskill/Responses/Shared/CalendarSharedResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/calendarskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/calendarskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.cs b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.cs rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.de.json b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.de.json rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.es.json b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.es.json rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.fr.json b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.fr.json rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.it.json b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.it.json rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.json b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.json rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.tt b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.tt rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.zh.json b/skills/csharp/calendarskill/Responses/Summary/SummaryResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/Summary/SummaryResponses.zh.json rename to skills/csharp/calendarskill/Responses/Summary/SummaryResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json b/skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json rename to skills/csharp/calendarskill/Responses/TimeRemaining/TimeRemainingResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json b/skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json rename to skills/csharp/calendarskill/Responses/UpcomingEvent/UpcomingEventResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.de.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.es.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.fr.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.it.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.tt diff --git a/skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json b/skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json rename to skills/csharp/calendarskill/Responses/UpdateEvent/UpdateEventResponses.zh.json diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/AzureMapsAPI/AzureMapsClient.cs b/skills/csharp/calendarskill/Services/AzureMapsAPI/AzureMapsClient.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/AzureMapsAPI/AzureMapsClient.cs rename to skills/csharp/calendarskill/Services/AzureMapsAPI/AzureMapsClient.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/BotServices.cs b/skills/csharp/calendarskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/BotServices.cs rename to skills/csharp/calendarskill/Services/BotServices.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/BotSettings.cs b/skills/csharp/calendarskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/BotSettings.cs rename to skills/csharp/calendarskill/Services/BotSettings.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/CalendarLuis.cs b/skills/csharp/calendarskill/Services/CalendarLuis.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/CalendarLuis.cs rename to skills/csharp/calendarskill/Services/CalendarLuis.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/CalendarService.cs b/skills/csharp/calendarskill/Services/CalendarService.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/CalendarService.cs rename to skills/csharp/calendarskill/Services/CalendarService.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs b/skills/csharp/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs rename to skills/csharp/calendarskill/Services/GoogleAPI/GoogleCalendarAPI.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleClient.cs b/skills/csharp/calendarskill/Services/GoogleAPI/GoogleClient.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GoogleClient.cs rename to skills/csharp/calendarskill/Services/GoogleAPI/GoogleClient.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GooglePeopleService.cs b/skills/csharp/calendarskill/Services/GoogleAPI/GooglePeopleService.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/GoogleAPI/GooglePeopleService.cs rename to skills/csharp/calendarskill/Services/GoogleAPI/GooglePeopleService.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/ICalendarService.cs b/skills/csharp/calendarskill/Services/ICalendarService.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/ICalendarService.cs rename to skills/csharp/calendarskill/Services/ICalendarService.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/IServiceManager.cs b/skills/csharp/calendarskill/Services/IServiceManager.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/IServiceManager.cs rename to skills/csharp/calendarskill/Services/IServiceManager.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/IUserService.cs b/skills/csharp/calendarskill/Services/IUserService.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/IUserService.cs rename to skills/csharp/calendarskill/Services/IUserService.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/GraphClient.cs b/skills/csharp/calendarskill/Services/MSGraphAPI/GraphClient.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/GraphClient.cs rename to skills/csharp/calendarskill/Services/MSGraphAPI/GraphClient.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs b/skills/csharp/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs rename to skills/csharp/calendarskill/Services/MSGraphAPI/MSGraphCalendarAPI.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs b/skills/csharp/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs rename to skills/csharp/calendarskill/Services/MSGraphAPI/MSGraphUserService.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/ServiceManager.cs b/skills/csharp/calendarskill/Services/ServiceManager.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/ServiceManager.cs rename to skills/csharp/calendarskill/Services/ServiceManager.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Services/UserService.cs b/skills/csharp/calendarskill/Services/UserService.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Services/UserService.cs rename to skills/csharp/calendarskill/Services/UserService.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Startup.cs b/skills/csharp/calendarskill/Startup.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Startup.cs rename to skills/csharp/calendarskill/Startup.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/Actions.cs b/skills/csharp/calendarskill/Utilities/Actions.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/Actions.cs rename to skills/csharp/calendarskill/Utilities/Actions.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/AdaptiveCardHelper.cs b/skills/csharp/calendarskill/Utilities/AdaptiveCardHelper.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/AdaptiveCardHelper.cs rename to skills/csharp/calendarskill/Utilities/AdaptiveCardHelper.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/AskParameterTemplate.cs b/skills/csharp/calendarskill/Utilities/AskParameterTemplate.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/AskParameterTemplate.cs rename to skills/csharp/calendarskill/Utilities/AskParameterTemplate.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarCommonUtil.cs b/skills/csharp/calendarskill/Utilities/CalendarCommonUtil.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarCommonUtil.cs rename to skills/csharp/calendarskill/Utilities/CalendarCommonUtil.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarConfigData.cs b/skills/csharp/calendarskill/Utilities/CalendarConfigData.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/CalendarConfigData.cs rename to skills/csharp/calendarskill/Utilities/CalendarConfigData.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/CreateEventWhiteList.cs b/skills/csharp/calendarskill/Utilities/CreateEventWhiteList.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/CreateEventWhiteList.cs rename to skills/csharp/calendarskill/Utilities/CreateEventWhiteList.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/DateTimeHelper.cs b/skills/csharp/calendarskill/Utilities/DateTimeHelper.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/DateTimeHelper.cs rename to skills/csharp/calendarskill/Utilities/DateTimeHelper.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/DisplayHelper.cs b/skills/csharp/calendarskill/Utilities/DisplayHelper.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/DisplayHelper.cs rename to skills/csharp/calendarskill/Utilities/DisplayHelper.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/SpeakHelper.cs b/skills/csharp/calendarskill/Utilities/SpeakHelper.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/SpeakHelper.cs rename to skills/csharp/calendarskill/Utilities/SpeakHelper.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/TimeConverter.cs b/skills/csharp/calendarskill/Utilities/TimeConverter.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/TimeConverter.cs rename to skills/csharp/calendarskill/Utilities/TimeConverter.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/TimeZoneConverter.cs b/skills/csharp/calendarskill/Utilities/TimeZoneConverter.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/TimeZoneConverter.cs rename to skills/csharp/calendarskill/Utilities/TimeZoneConverter.cs diff --git a/skills/src/csharp/calendarskill/calendarskill/Utilities/WindowsIanaMapping b/skills/csharp/calendarskill/Utilities/WindowsIanaMapping similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/Utilities/WindowsIanaMapping rename to skills/csharp/calendarskill/Utilities/WindowsIanaMapping diff --git a/skills/src/csharp/calendarskill/calendarskill/appsettings.json b/skills/csharp/calendarskill/appsettings.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/appsettings.json rename to skills/csharp/calendarskill/appsettings.json diff --git a/skills/src/csharp/calendarskill/calendarskill/cognitivemodels.json b/skills/csharp/calendarskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/cognitivemodels.json rename to skills/csharp/calendarskill/cognitivemodels.json diff --git a/skills/src/csharp/calendarskill/calendarskill/manifestTemplate.json b/skills/csharp/calendarskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/manifestTemplate.json rename to skills/csharp/calendarskill/manifestTemplate.json diff --git a/skills/src/csharp/calendarskill/calendarskill/readme.md b/skills/csharp/calendarskill/readme.md similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/readme.md rename to skills/csharp/calendarskill/readme.md diff --git a/skills/src/csharp/calendarskill/calendarskill/wwwroot/default.htm b/skills/csharp/calendarskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/calendarskill/calendarskill/wwwroot/default.htm rename to skills/csharp/calendarskill/wwwroot/default.htm diff --git a/skills/src/csharp/emailskill/emailskill/.filenesting.json b/skills/csharp/emailskill/.filenesting.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/.filenesting.json rename to skills/csharp/emailskill/.filenesting.json diff --git a/skills/src/csharp/emailskill/emailskill/Adapters/DefaultAdapter.cs b/skills/csharp/emailskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Adapters/DefaultAdapter.cs rename to skills/csharp/emailskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/emailskill/emailskill/Adapters/EmailSkillWebSocketBotAdapter.cs b/skills/csharp/emailskill/Adapters/EmailSkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Adapters/EmailSkillWebSocketBotAdapter.cs rename to skills/csharp/emailskill/Adapters/EmailSkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/emailskill/emailskill/Bots/DialogBot.cs b/skills/csharp/emailskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Bots/DialogBot.cs rename to skills/csharp/emailskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.1.0.json b/skills/csharp/emailskill/Content/ConfirmCard_RecipientLessThanFive.1.0.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.1.0.json rename to skills/csharp/emailskill/Content/ConfirmCard_RecipientLessThanFive.1.0.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.json b/skills/csharp/emailskill/Content/ConfirmCard_RecipientLessThanFive.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientLessThanFive.json rename to skills/csharp/emailskill/Content/ConfirmCard_RecipientLessThanFive.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.1.0.json b/skills/csharp/emailskill/Content/ConfirmCard_RecipientMoreThanFive.1.0.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.1.0.json rename to skills/csharp/emailskill/Content/ConfirmCard_RecipientMoreThanFive.1.0.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json b/skills/csharp/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json rename to skills/csharp/emailskill/Content/ConfirmCard_RecipientMoreThanFive.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.1.0.json b/skills/csharp/emailskill/Content/DetailCard_RecipientLessThanFive.1.0.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.1.0.json rename to skills/csharp/emailskill/Content/DetailCard_RecipientLessThanFive.1.0.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.json b/skills/csharp/emailskill/Content/DetailCard_RecipientLessThanFive.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientLessThanFive.json rename to skills/csharp/emailskill/Content/DetailCard_RecipientLessThanFive.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.1.0.json b/skills/csharp/emailskill/Content/DetailCard_RecipientMoreThanFive.1.0.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.1.0.json rename to skills/csharp/emailskill/Content/DetailCard_RecipientMoreThanFive.1.0.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.json b/skills/csharp/emailskill/Content/DetailCard_RecipientMoreThanFive.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/DetailCard_RecipientMoreThanFive.json rename to skills/csharp/emailskill/Content/DetailCard_RecipientMoreThanFive.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailCard.json b/skills/csharp/emailskill/Content/EmailCard.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailCard.json rename to skills/csharp/emailskill/Content/EmailCard.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailContentPreview.1.0.json b/skills/csharp/emailskill/Content/EmailContentPreview.1.0.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailContentPreview.1.0.json rename to skills/csharp/emailskill/Content/EmailContentPreview.1.0.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailContentPreview.json b/skills/csharp/emailskill/Content/EmailContentPreview.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailContentPreview.json rename to skills/csharp/emailskill/Content/EmailContentPreview.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailDetailCard.json b/skills/csharp/emailskill/Content/EmailDetailCard.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailDetailCard.json rename to skills/csharp/emailskill/Content/EmailDetailCard.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewByCondition.1.0.json b/skills/csharp/emailskill/Content/EmailOverviewByCondition.1.0.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailOverviewByCondition.1.0.json rename to skills/csharp/emailskill/Content/EmailOverviewByCondition.1.0.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewByCondition.json b/skills/csharp/emailskill/Content/EmailOverviewByCondition.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailOverviewByCondition.json rename to skills/csharp/emailskill/Content/EmailOverviewByCondition.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewCard.1.0.json b/skills/csharp/emailskill/Content/EmailOverviewCard.1.0.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailOverviewCard.1.0.json rename to skills/csharp/emailskill/Content/EmailOverviewCard.1.0.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewCard.json b/skills/csharp/emailskill/Content/EmailOverviewCard.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailOverviewCard.json rename to skills/csharp/emailskill/Content/EmailOverviewCard.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailOverviewItem.json b/skills/csharp/emailskill/Content/EmailOverviewItem.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailOverviewItem.json rename to skills/csharp/emailskill/Content/EmailOverviewItem.json diff --git a/skills/src/csharp/emailskill/emailskill/Content/EmailWithOutButtonCard.json b/skills/csharp/emailskill/Content/EmailWithOutButtonCard.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Content/EmailWithOutButtonCard.json rename to skills/csharp/emailskill/Content/EmailWithOutButtonCard.json diff --git a/skills/src/csharp/emailskill/emailskill/Controllers/BotController.cs b/skills/csharp/emailskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Controllers/BotController.cs rename to skills/csharp/emailskill/Controllers/BotController.cs diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/de/Email.lu b/skills/csharp/emailskill/Deployment/Resources/LU/de/Email.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/de/Email.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/de/Email.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/de/General.lu b/skills/csharp/emailskill/Deployment/Resources/LU/de/General.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/de/General.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/de/General.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/en/Email.lu b/skills/csharp/emailskill/Deployment/Resources/LU/en/Email.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/en/Email.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/en/Email.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/emailskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/es/Email.lu b/skills/csharp/emailskill/Deployment/Resources/LU/es/Email.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/es/Email.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/es/Email.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/es/General.lu b/skills/csharp/emailskill/Deployment/Resources/LU/es/General.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/es/General.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/es/General.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/fr/Email.lu b/skills/csharp/emailskill/Deployment/Resources/LU/fr/Email.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/fr/Email.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/fr/Email.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/fr/General.lu b/skills/csharp/emailskill/Deployment/Resources/LU/fr/General.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/fr/General.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/fr/General.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/it/Email.lu b/skills/csharp/emailskill/Deployment/Resources/LU/it/Email.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/it/Email.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/it/Email.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/it/General.lu b/skills/csharp/emailskill/Deployment/Resources/LU/it/General.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/it/General.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/it/General.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/zh/Email.lu b/skills/csharp/emailskill/Deployment/Resources/LU/zh/Email.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/zh/Email.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/zh/Email.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/emailskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/emailskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/parameters.template.json b/skills/csharp/emailskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/parameters.template.json rename to skills/csharp/emailskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Resources/template.json b/skills/csharp/emailskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Resources/template.json rename to skills/csharp/emailskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/emailskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/emailskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/emailskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/emailskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/emailskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/emailskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Scripts/publish.ps1 b/skills/csharp/emailskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/emailskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/emailskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/emailskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/emailskill/emailskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/emailskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/emailskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/DeleteEmailDialog.cs b/skills/csharp/emailskill/Dialogs/DeleteEmailDialog.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/DeleteEmailDialog.cs rename to skills/csharp/emailskill/Dialogs/DeleteEmailDialog.cs diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/EmailSkillDialogBase.cs b/skills/csharp/emailskill/Dialogs/EmailSkillDialogBase.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/EmailSkillDialogBase.cs rename to skills/csharp/emailskill/Dialogs/EmailSkillDialogBase.cs diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/FindContactDialog.cs b/skills/csharp/emailskill/Dialogs/FindContactDialog.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/FindContactDialog.cs rename to skills/csharp/emailskill/Dialogs/FindContactDialog.cs diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/ForwardEmailDialog.cs b/skills/csharp/emailskill/Dialogs/ForwardEmailDialog.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/ForwardEmailDialog.cs rename to skills/csharp/emailskill/Dialogs/ForwardEmailDialog.cs diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/MainDialog.cs b/skills/csharp/emailskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/MainDialog.cs rename to skills/csharp/emailskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/ReplyEmailDialog.cs b/skills/csharp/emailskill/Dialogs/ReplyEmailDialog.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/ReplyEmailDialog.cs rename to skills/csharp/emailskill/Dialogs/ReplyEmailDialog.cs diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/SendEmailDialog.cs b/skills/csharp/emailskill/Dialogs/SendEmailDialog.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/SendEmailDialog.cs rename to skills/csharp/emailskill/Dialogs/SendEmailDialog.cs diff --git a/skills/src/csharp/emailskill/emailskill/Dialogs/ShowEmailDialog.cs b/skills/csharp/emailskill/Dialogs/ShowEmailDialog.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Dialogs/ShowEmailDialog.cs rename to skills/csharp/emailskill/Dialogs/ShowEmailDialog.cs diff --git a/skills/src/csharp/emailskill/emailskill/EmailSkill.csproj b/skills/csharp/emailskill/EmailSkill.csproj similarity index 100% rename from skills/src/csharp/emailskill/emailskill/EmailSkill.csproj rename to skills/csharp/emailskill/EmailSkill.csproj diff --git a/skills/src/csharp/emailskill/emailskill/Extensions/DateTimeEx.cs b/skills/csharp/emailskill/Extensions/DateTimeEx.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Extensions/DateTimeEx.cs rename to skills/csharp/emailskill/Extensions/DateTimeEx.cs diff --git a/skills/src/csharp/emailskill/emailskill/Extensions/UserEx.cs b/skills/csharp/emailskill/Extensions/UserEx.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Extensions/UserEx.cs rename to skills/csharp/emailskill/Extensions/UserEx.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/EmailCardData.cs b/skills/csharp/emailskill/Models/EmailCardData.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/EmailCardData.cs rename to skills/csharp/emailskill/Models/EmailCardData.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/EmailCardDataNoButtons.cs b/skills/csharp/emailskill/Models/EmailCardDataNoButtons.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/EmailCardDataNoButtons.cs rename to skills/csharp/emailskill/Models/EmailCardDataNoButtons.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/EmailOverviewData.cs b/skills/csharp/emailskill/Models/EmailOverviewData.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/EmailOverviewData.cs rename to skills/csharp/emailskill/Models/EmailOverviewData.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/EmailSearchType.cs b/skills/csharp/emailskill/Models/EmailSearchType.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/EmailSearchType.cs rename to skills/csharp/emailskill/Models/EmailSearchType.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/EmailSkillDialogOptions.cs b/skills/csharp/emailskill/Models/EmailSkillDialogOptions.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/EmailSkillDialogOptions.cs rename to skills/csharp/emailskill/Models/EmailSkillDialogOptions.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/EmailSkillState.cs b/skills/csharp/emailskill/Models/EmailSkillState.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/EmailSkillState.cs rename to skills/csharp/emailskill/Models/EmailSkillState.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/FindContactDialogOptions.cs b/skills/csharp/emailskill/Models/FindContactDialogOptions.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/FindContactDialogOptions.cs rename to skills/csharp/emailskill/Models/FindContactDialogOptions.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/MailSource.cs b/skills/csharp/emailskill/Models/MailSource.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/MailSource.cs rename to skills/csharp/emailskill/Models/MailSource.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/PersonModel.cs b/skills/csharp/emailskill/Models/PersonModel.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/PersonModel.cs rename to skills/csharp/emailskill/Models/PersonModel.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/SendEmailStateModel.cs b/skills/csharp/emailskill/Models/SendEmailStateModel.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/SendEmailStateModel.cs rename to skills/csharp/emailskill/Models/SendEmailStateModel.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/TimeZoneResponse.cs b/skills/csharp/emailskill/Models/TimeZoneResponse.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/TimeZoneResponse.cs rename to skills/csharp/emailskill/Models/TimeZoneResponse.cs diff --git a/skills/src/csharp/emailskill/emailskill/Models/UpdateUserDialogOptions.cs b/skills/csharp/emailskill/Models/UpdateUserDialogOptions.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Models/UpdateUserDialogOptions.cs rename to skills/csharp/emailskill/Models/UpdateUserDialogOptions.cs diff --git a/skills/src/csharp/emailskill/emailskill/Program.cs b/skills/csharp/emailskill/Program.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Program.cs rename to skills/csharp/emailskill/Program.cs diff --git a/skills/src/csharp/emailskill/emailskill/Prompts/GetRecreateInfoPrompt.cs b/skills/csharp/emailskill/Prompts/GetRecreateInfoPrompt.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Prompts/GetRecreateInfoPrompt.cs rename to skills/csharp/emailskill/Prompts/GetRecreateInfoPrompt.cs diff --git a/skills/src/csharp/emailskill/emailskill/Properties/launchSettings.json b/skills/csharp/emailskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Properties/launchSettings.json rename to skills/csharp/emailskill/Properties/launchSettings.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json b/skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json rename to skills/csharp/emailskill/Responses/DeleteEmail/DeleteEmailResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.cs b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.cs rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.de.json b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.de.json rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.es.json b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.es.json rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.fr.json b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.fr.json rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.it.json b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.it.json rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.json b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.json rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.tt b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.tt rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.zh.json b/skills/csharp/emailskill/Responses/FindContact/FindContactResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/FindContact/FindContactResponses.zh.json rename to skills/csharp/emailskill/Responses/FindContact/FindContactResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json b/skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json rename to skills/csharp/emailskill/Responses/ForwardEmail/ForwardEmailResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.cs b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.cs rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.de.json b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.de.json rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.es.json b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.es.json rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.fr.json b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.fr.json rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.it.json b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.it.json rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.json b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.json rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.tt b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.tt rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.zh.json b/skills/csharp/emailskill/Responses/Main/EmailMainResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Main/EmailMainResponses.zh.json rename to skills/csharp/emailskill/Responses/Main/EmailMainResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json b/skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json rename to skills/csharp/emailskill/Responses/ReplyEmail/ReplyEmailResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.cs b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.cs rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.de.json b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.de.json rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.es.json b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.es.json rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.fr.json b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.fr.json rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.it.json b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.it.json rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.json b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.json rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.tt b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.tt rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.zh.json b/skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/SendEmail/SendEmailResponses.zh.json rename to skills/csharp/emailskill/Responses/SendEmail/SendEmailResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs b/skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs rename to skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.Designer.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.de.resx b/skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.de.resx similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.de.resx rename to skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.de.resx diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.es.resx b/skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.es.resx similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.es.resx rename to skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.es.resx diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.fr.resx b/skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.fr.resx similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.fr.resx rename to skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.fr.resx diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.it.resx b/skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.it.resx similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.it.resx rename to skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.it.resx diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.resx b/skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.resx similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.resx rename to skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.resx diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.zh.resx b/skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.zh.resx similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailCommonStrings.zh.resx rename to skills/csharp/emailskill/Responses/Shared/EmailCommonStrings.zh.resx diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.cs b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.cs rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.de.json b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.de.json rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.es.json b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.es.json rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.fr.json b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.fr.json rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.it.json b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.it.json rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.json b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.json rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.tt b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.tt rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.zh.json b/skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/EmailSharedResponses.zh.json rename to skills/csharp/emailskill/Responses/Shared/EmailSharedResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/emailskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/emailskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.cs b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.cs rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.cs diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.de.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.es.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.fr.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.it.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.json b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.json rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.json diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.tt b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.tt similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.tt rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.tt diff --git a/skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json b/skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json rename to skills/csharp/emailskill/Responses/ShowEmail/ShowEmailResponses.zh.json diff --git a/skills/src/csharp/emailskill/emailskill/Services/AzureMapsAPI/AzureMapsClient.cs b/skills/csharp/emailskill/Services/AzureMapsAPI/AzureMapsClient.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/AzureMapsAPI/AzureMapsClient.cs rename to skills/csharp/emailskill/Services/AzureMapsAPI/AzureMapsClient.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/BotServices.cs b/skills/csharp/emailskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/BotServices.cs rename to skills/csharp/emailskill/Services/BotServices.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/BotSettings.cs b/skills/csharp/emailskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/BotSettings.cs rename to skills/csharp/emailskill/Services/BotSettings.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/EmailLuis.cs b/skills/csharp/emailskill/Services/EmailLuis.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/EmailLuis.cs rename to skills/csharp/emailskill/Services/EmailLuis.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GMailService.cs b/skills/csharp/emailskill/Services/GoogleAPI/GMailService.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GMailService.cs rename to skills/csharp/emailskill/Services/GoogleAPI/GMailService.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GoogleClient.cs b/skills/csharp/emailskill/Services/GoogleAPI/GoogleClient.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GoogleClient.cs rename to skills/csharp/emailskill/Services/GoogleAPI/GoogleClient.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GooglePeopleService.cs b/skills/csharp/emailskill/Services/GoogleAPI/GooglePeopleService.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/GoogleAPI/GooglePeopleService.cs rename to skills/csharp/emailskill/Services/GoogleAPI/GooglePeopleService.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/IMailService.cs b/skills/csharp/emailskill/Services/IMailService.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/IMailService.cs rename to skills/csharp/emailskill/Services/IMailService.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/IServiceManager.cs b/skills/csharp/emailskill/Services/IServiceManager.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/IServiceManager.cs rename to skills/csharp/emailskill/Services/IServiceManager.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/IUserService.cs b/skills/csharp/emailskill/Services/IUserService.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/IUserService.cs rename to skills/csharp/emailskill/Services/IUserService.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/GraphClient.cs b/skills/csharp/emailskill/Services/MSGraphAPI/GraphClient.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/GraphClient.cs rename to skills/csharp/emailskill/Services/MSGraphAPI/GraphClient.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs b/skills/csharp/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs rename to skills/csharp/emailskill/Services/MSGraphAPI/MSGraphMailAPI.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphUserService.cs b/skills/csharp/emailskill/Services/MSGraphAPI/MSGraphUserService.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/MSGraphAPI/MSGraphUserService.cs rename to skills/csharp/emailskill/Services/MSGraphAPI/MSGraphUserService.cs diff --git a/skills/src/csharp/emailskill/emailskill/Services/ServiceManager.cs b/skills/csharp/emailskill/Services/ServiceManager.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Services/ServiceManager.cs rename to skills/csharp/emailskill/Services/ServiceManager.cs diff --git a/skills/src/csharp/emailskill/emailskill/Startup.cs b/skills/csharp/emailskill/Startup.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Startup.cs rename to skills/csharp/emailskill/Startup.cs diff --git a/skills/src/csharp/emailskill/emailskill/Utilities/Actions.cs b/skills/csharp/emailskill/Utilities/Actions.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Utilities/Actions.cs rename to skills/csharp/emailskill/Utilities/Actions.cs diff --git a/skills/src/csharp/emailskill/emailskill/Utilities/AdaptiveCardHelper.cs b/skills/csharp/emailskill/Utilities/AdaptiveCardHelper.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Utilities/AdaptiveCardHelper.cs rename to skills/csharp/emailskill/Utilities/AdaptiveCardHelper.cs diff --git a/skills/src/csharp/emailskill/emailskill/Utilities/DisplayHelper.cs b/skills/csharp/emailskill/Utilities/DisplayHelper.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Utilities/DisplayHelper.cs rename to skills/csharp/emailskill/Utilities/DisplayHelper.cs diff --git a/skills/src/csharp/emailskill/emailskill/Utilities/EmailCommonPhrase.cs b/skills/csharp/emailskill/Utilities/EmailCommonPhrase.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Utilities/EmailCommonPhrase.cs rename to skills/csharp/emailskill/Utilities/EmailCommonPhrase.cs diff --git a/skills/src/csharp/emailskill/emailskill/Utilities/FindContactAction.cs b/skills/csharp/emailskill/Utilities/FindContactAction.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Utilities/FindContactAction.cs rename to skills/csharp/emailskill/Utilities/FindContactAction.cs diff --git a/skills/src/csharp/emailskill/emailskill/Utilities/SpeakHelper.cs b/skills/csharp/emailskill/Utilities/SpeakHelper.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Utilities/SpeakHelper.cs rename to skills/csharp/emailskill/Utilities/SpeakHelper.cs diff --git a/skills/src/csharp/emailskill/emailskill/Utilities/Util.cs b/skills/csharp/emailskill/Utilities/Util.cs similarity index 100% rename from skills/src/csharp/emailskill/emailskill/Utilities/Util.cs rename to skills/csharp/emailskill/Utilities/Util.cs diff --git a/skills/src/csharp/emailskill/emailskill/appsettings.json b/skills/csharp/emailskill/appsettings.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/appsettings.json rename to skills/csharp/emailskill/appsettings.json diff --git a/skills/src/csharp/emailskill/emailskill/cognitivemodels.json b/skills/csharp/emailskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/cognitivemodels.json rename to skills/csharp/emailskill/cognitivemodels.json diff --git a/skills/src/csharp/emailskill/emailskill/manifestTemplate.json b/skills/csharp/emailskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/emailskill/emailskill/manifestTemplate.json rename to skills/csharp/emailskill/manifestTemplate.json diff --git a/skills/src/csharp/emailskill/emailskill/readme.md b/skills/csharp/emailskill/readme.md similarity index 100% rename from skills/src/csharp/emailskill/emailskill/readme.md rename to skills/csharp/emailskill/readme.md diff --git a/skills/src/csharp/emailskill/emailskill/wwwroot/default.htm b/skills/csharp/emailskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/emailskill/emailskill/wwwroot/default.htm rename to skills/csharp/emailskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/.filenesting.json b/skills/csharp/experimental/automotiveskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/.filenesting.json rename to skills/csharp/experimental/automotiveskill/.filenesting.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Adapters/AutomotiveSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/automotiveskill/Adapters/AutomotiveSkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Adapters/AutomotiveSkillWebSocketBotAdapter.cs rename to skills/csharp/experimental/automotiveskill/Adapters/AutomotiveSkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/automotiveskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/automotiveskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/AutomotiveSkill.csproj b/skills/csharp/experimental/automotiveskill/AutomotiveSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/AutomotiveSkill.csproj rename to skills/csharp/experimental/automotiveskill/AutomotiveSkill.csproj diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Bots/DialogBot.cs b/skills/csharp/experimental/automotiveskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Bots/DialogBot.cs rename to skills/csharp/experimental/automotiveskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/AutomotiveCard.1.0.json b/skills/csharp/experimental/automotiveskill/Content/AutomotiveCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/AutomotiveCard.1.0.json rename to skills/csharp/experimental/automotiveskill/Content/AutomotiveCard.1.0.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/AutomotiveCard.json b/skills/csharp/experimental/automotiveskill/Content/AutomotiveCard.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/AutomotiveCard.json rename to skills/csharp/experimental/automotiveskill/Content/AutomotiveCard.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/ListSelection.json b/skills/csharp/experimental/automotiveskill/Content/ListSelection.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/ListSelection.json rename to skills/csharp/experimental/automotiveskill/Content/ListSelection.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/SettingChoice.json b/skills/csharp/experimental/automotiveskill/Content/SettingChoice.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Content/SettingChoice.json rename to skills/csharp/experimental/automotiveskill/Content/SettingChoice.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Controllers/BotController.cs b/skills/csharp/experimental/automotiveskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Controllers/BotController.cs rename to skills/csharp/experimental/automotiveskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/available_settings.yaml b/skills/csharp/experimental/automotiveskill/Data/available_settings.yaml similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/available_settings.yaml rename to skills/csharp/experimental/automotiveskill/Data/available_settings.yaml diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/normalization/amount_percentage.tsv b/skills/csharp/experimental/automotiveskill/Data/normalization/amount_percentage.tsv similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/normalization/amount_percentage.tsv rename to skills/csharp/experimental/automotiveskill/Data/normalization/amount_percentage.tsv diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/normalization/amount_type.tsv b/skills/csharp/experimental/automotiveskill/Data/normalization/amount_type.tsv similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/normalization/amount_type.tsv rename to skills/csharp/experimental/automotiveskill/Data/normalization/amount_type.tsv diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/normalization/amount_unit.tsv b/skills/csharp/experimental/automotiveskill/Data/normalization/amount_unit.tsv similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/normalization/amount_unit.tsv rename to skills/csharp/experimental/automotiveskill/Data/normalization/amount_unit.tsv diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/setting_alternative_names.yaml b/skills/csharp/experimental/automotiveskill/Data/setting_alternative_names.yaml similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Data/setting_alternative_names.yaml rename to skills/csharp/experimental/automotiveskill/Data/setting_alternative_names.yaml diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/Settings.lu b/skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/Settings.lu similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/Settings.lu rename to skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/Settings.lu diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/SettingsDispatch.lu b/skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/SettingsDispatch.lu similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/SettingsDispatch.lu rename to skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/SettingsDispatch.lu diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/SettingsName.lu b/skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/SettingsName.lu similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/SettingsName.lu rename to skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/SettingsName.lu diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/SettingsValue.lu b/skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/SettingsValue.lu similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/LU/en/SettingsValue.lu rename to skills/csharp/experimental/automotiveskill/Deployment/Resources/LU/en/SettingsValue.lu diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/automotiveskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/automotiveskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/template.json b/skills/csharp/experimental/automotiveskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Resources/template.json rename to skills/csharp/experimental/automotiveskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/automotiveskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/automotiveskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/automotiveskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/automotiveskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/automotiveskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/automotiveskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/automotiveskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/automotiveskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/automotiveskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/automotiveskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/automotiveskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/automotiveskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs b/skills/csharp/experimental/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs rename to skills/csharp/experimental/automotiveskill/Dialogs/AutomotiveSkillDialogBase.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/automotiveskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/automotiveskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Dialogs/VehicleSettingsDialog.cs b/skills/csharp/experimental/automotiveskill/Dialogs/VehicleSettingsDialog.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Dialogs/VehicleSettingsDialog.cs rename to skills/csharp/experimental/automotiveskill/Dialogs/VehicleSettingsDialog.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AutomotiveCardModel.cs b/skills/csharp/experimental/automotiveskill/Models/AutomotiveCardModel.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AutomotiveCardModel.cs rename to skills/csharp/experimental/automotiveskill/Models/AutomotiveCardModel.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AutomotiveSkillState.cs b/skills/csharp/experimental/automotiveskill/Models/AutomotiveSkillState.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AutomotiveSkillState.cs rename to skills/csharp/experimental/automotiveskill/Models/AutomotiveSkillState.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AvailableSetting.cs b/skills/csharp/experimental/automotiveskill/Models/AvailableSetting.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AvailableSetting.cs rename to skills/csharp/experimental/automotiveskill/Models/AvailableSetting.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AvailableSettingAmount.cs b/skills/csharp/experimental/automotiveskill/Models/AvailableSettingAmount.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AvailableSettingAmount.cs rename to skills/csharp/experimental/automotiveskill/Models/AvailableSettingAmount.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AvailableSettingValue.cs b/skills/csharp/experimental/automotiveskill/Models/AvailableSettingValue.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/AvailableSettingValue.cs rename to skills/csharp/experimental/automotiveskill/Models/AvailableSettingValue.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/MatchResult.cs b/skills/csharp/experimental/automotiveskill/Models/MatchResult.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/MatchResult.cs rename to skills/csharp/experimental/automotiveskill/Models/MatchResult.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/MatchableBagOfTokens.cs b/skills/csharp/experimental/automotiveskill/Models/MatchableBagOfTokens.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/MatchableBagOfTokens.cs rename to skills/csharp/experimental/automotiveskill/Models/MatchableBagOfTokens.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/OAuthConnection.cs b/skills/csharp/experimental/automotiveskill/Models/OAuthConnection.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/OAuthConnection.cs rename to skills/csharp/experimental/automotiveskill/Models/OAuthConnection.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/ScoredMatchableBagOfTokens.cs b/skills/csharp/experimental/automotiveskill/Models/ScoredMatchableBagOfTokens.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/ScoredMatchableBagOfTokens.cs rename to skills/csharp/experimental/automotiveskill/Models/ScoredMatchableBagOfTokens.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SelectableSettingValue.cs b/skills/csharp/experimental/automotiveskill/Models/SelectableSettingValue.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SelectableSettingValue.cs rename to skills/csharp/experimental/automotiveskill/Models/SelectableSettingValue.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingAlternativeNames.cs b/skills/csharp/experimental/automotiveskill/Models/SettingAlternativeNames.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingAlternativeNames.cs rename to skills/csharp/experimental/automotiveskill/Models/SettingAlternativeNames.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingAmount.cs b/skills/csharp/experimental/automotiveskill/Models/SettingAmount.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingAmount.cs rename to skills/csharp/experimental/automotiveskill/Models/SettingAmount.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingChange.cs b/skills/csharp/experimental/automotiveskill/Models/SettingChange.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingChange.cs rename to skills/csharp/experimental/automotiveskill/Models/SettingChange.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingMatch.cs b/skills/csharp/experimental/automotiveskill/Models/SettingMatch.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingMatch.cs rename to skills/csharp/experimental/automotiveskill/Models/SettingMatch.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingOperation.cs b/skills/csharp/experimental/automotiveskill/Models/SettingOperation.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingOperation.cs rename to skills/csharp/experimental/automotiveskill/Models/SettingOperation.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingOperationStatus.cs b/skills/csharp/experimental/automotiveskill/Models/SettingOperationStatus.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingOperationStatus.cs rename to skills/csharp/experimental/automotiveskill/Models/SettingOperationStatus.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingStatus.cs b/skills/csharp/experimental/automotiveskill/Models/SettingStatus.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/SettingStatus.cs rename to skills/csharp/experimental/automotiveskill/Models/SettingStatus.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/Validation.cs b/skills/csharp/experimental/automotiveskill/Models/Validation.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Models/Validation.cs rename to skills/csharp/experimental/automotiveskill/Models/Validation.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Program.cs b/skills/csharp/experimental/automotiveskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Program.cs rename to skills/csharp/experimental/automotiveskill/Program.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Properties/launchSettings.json b/skills/csharp/experimental/automotiveskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Properties/launchSettings.json rename to skills/csharp/experimental/automotiveskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.de.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.es.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.fr.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.it.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.tt diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json b/skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json rename to skills/csharp/experimental/automotiveskill/Responses/Main/AutomotiveSkillMainResponses.zh.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.de.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.es.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.fr.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.it.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.tt diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json b/skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json rename to skills/csharp/experimental/automotiveskill/Responses/Shared/AutomotiveSkillSharedResponses.zh.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/Cards/AutomotiveCard.json b/skills/csharp/experimental/automotiveskill/Responses/Shared/Cards/AutomotiveCard.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/Cards/AutomotiveCard.json rename to skills/csharp/experimental/automotiveskill/Responses/Shared/Cards/AutomotiveCard.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/automotiveskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/automotiveskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.de.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.es.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.fr.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.it.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.tt diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsResponses.zh.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.Designer.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.de.resx diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.es.resx diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.fr.resx diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.it.resx diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.resx diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx b/skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx rename to skills/csharp/experimental/automotiveskill/Responses/VehicleSettings/VehicleSettingsStrings.zh.resx diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/BotServices.cs b/skills/csharp/experimental/automotiveskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/BotServices.cs rename to skills/csharp/experimental/automotiveskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/BotSettings.cs b/skills/csharp/experimental/automotiveskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/BotSettings.cs rename to skills/csharp/experimental/automotiveskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsDispatchLuis.cs b/skills/csharp/experimental/automotiveskill/Services/SettingsDispatchLuis.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsDispatchLuis.cs rename to skills/csharp/experimental/automotiveskill/Services/SettingsDispatchLuis.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsLuis.cs b/skills/csharp/experimental/automotiveskill/Services/SettingsLuis.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsLuis.cs rename to skills/csharp/experimental/automotiveskill/Services/SettingsLuis.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsNameLuis.cs b/skills/csharp/experimental/automotiveskill/Services/SettingsNameLuis.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsNameLuis.cs rename to skills/csharp/experimental/automotiveskill/Services/SettingsNameLuis.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsValueLuis.cs b/skills/csharp/experimental/automotiveskill/Services/SettingsValueLuis.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Services/SettingsValueLuis.cs rename to skills/csharp/experimental/automotiveskill/Services/SettingsValueLuis.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Startup.cs b/skills/csharp/experimental/automotiveskill/Startup.cs similarity index 98% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Startup.cs rename to skills/csharp/experimental/automotiveskill/Startup.cs index 887048200d..fbd01d9379 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Startup.cs +++ b/skills/csharp/experimental/automotiveskill/Startup.cs @@ -21,8 +21,8 @@ namespace AutomotiveSkill using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core; using Microsoft.Bot.Builder.Integration.AspNet.Core; using Microsoft.Bot.Builder.Skills; - using Microsoft.Bot.Builder.Skills.Auth; - using Microsoft.Bot.Builder.Solutions; + using Microsoft.Bot.Builder.Skills.Auth; + using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Builder.Solutions.Responses; using Microsoft.Bot.Builder.Solutions.TaskExtensions; using Microsoft.Bot.Connector.Authentication; diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Actions.cs b/skills/csharp/experimental/automotiveskill/Utilities/Actions.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Actions.cs rename to skills/csharp/experimental/automotiveskill/Utilities/Actions.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Chunk.cs b/skills/csharp/experimental/automotiveskill/Utilities/Chunk.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Chunk.cs rename to skills/csharp/experimental/automotiveskill/Utilities/Chunk.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/EntityNormalizer.cs b/skills/csharp/experimental/automotiveskill/Utilities/EntityNormalizer.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/EntityNormalizer.cs rename to skills/csharp/experimental/automotiveskill/Utilities/EntityNormalizer.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/NumberNormalizer.cs b/skills/csharp/experimental/automotiveskill/Utilities/NumberNormalizer.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/NumberNormalizer.cs rename to skills/csharp/experimental/automotiveskill/Utilities/NumberNormalizer.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Parser.cs b/skills/csharp/experimental/automotiveskill/Utilities/Parser.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Parser.cs rename to skills/csharp/experimental/automotiveskill/Utilities/Parser.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingFilter.cs b/skills/csharp/experimental/automotiveskill/Utilities/SettingFilter.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingFilter.cs rename to skills/csharp/experimental/automotiveskill/Utilities/SettingFilter.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingList.cs b/skills/csharp/experimental/automotiveskill/Utilities/SettingList.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingList.cs rename to skills/csharp/experimental/automotiveskill/Utilities/SettingList.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingMatcher.cs b/skills/csharp/experimental/automotiveskill/Utilities/SettingMatcher.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingMatcher.cs rename to skills/csharp/experimental/automotiveskill/Utilities/SettingMatcher.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingsEvents.cs b/skills/csharp/experimental/automotiveskill/Utilities/SettingsEvents.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/SettingsEvents.cs rename to skills/csharp/experimental/automotiveskill/Utilities/SettingsEvents.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Util.cs b/skills/csharp/experimental/automotiveskill/Utilities/Util.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/Util.cs rename to skills/csharp/experimental/automotiveskill/Utilities/Util.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/YamlParseException.cs b/skills/csharp/experimental/automotiveskill/Utilities/YamlParseException.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/YamlParseException.cs rename to skills/csharp/experimental/automotiveskill/Utilities/YamlParseException.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/YamlParseUtil.cs b/skills/csharp/experimental/automotiveskill/Utilities/YamlParseUtil.cs similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/Utilities/YamlParseUtil.cs rename to skills/csharp/experimental/automotiveskill/Utilities/YamlParseUtil.cs diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/appsettings.json b/skills/csharp/experimental/automotiveskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/appsettings.json rename to skills/csharp/experimental/automotiveskill/appsettings.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/cognitivemodels.json b/skills/csharp/experimental/automotiveskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/cognitivemodels.json rename to skills/csharp/experimental/automotiveskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/manifestTemplate.json b/skills/csharp/experimental/automotiveskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/manifestTemplate.json rename to skills/csharp/experimental/automotiveskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/readme.md b/skills/csharp/experimental/automotiveskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/readme.md rename to skills/csharp/experimental/automotiveskill/readme.md diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/default.htm b/skills/csharp/experimental/automotiveskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/default.htm rename to skills/csharp/experimental/automotiveskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_Car.png b/skills/csharp/experimental/automotiveskill/wwwroot/images/Black_Car.png similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_Car.png rename to skills/csharp/experimental/automotiveskill/wwwroot/images/Black_Car.png diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_Climate.png b/skills/csharp/experimental/automotiveskill/wwwroot/images/Black_Climate.png similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_Climate.png rename to skills/csharp/experimental/automotiveskill/wwwroot/images/Black_Climate.png diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_House.png b/skills/csharp/experimental/automotiveskill/wwwroot/images/Black_House.png similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_House.png rename to skills/csharp/experimental/automotiveskill/wwwroot/images/Black_House.png diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_Music.png b/skills/csharp/experimental/automotiveskill/wwwroot/images/Black_Music.png similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_Music.png rename to skills/csharp/experimental/automotiveskill/wwwroot/images/Black_Music.png diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_phone.png b/skills/csharp/experimental/automotiveskill/wwwroot/images/Black_phone.png similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Black_phone.png rename to skills/csharp/experimental/automotiveskill/wwwroot/images/Black_phone.png diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Navigation_Car.png b/skills/csharp/experimental/automotiveskill/wwwroot/images/Navigation_Car.png similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/Navigation_Car.png rename to skills/csharp/experimental/automotiveskill/wwwroot/images/Navigation_Car.png diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/settingcog.jpg b/skills/csharp/experimental/automotiveskill/wwwroot/images/settingcog.jpg similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskill/wwwroot/images/settingcog.jpg rename to skills/csharp/experimental/automotiveskill/wwwroot/images/settingcog.jpg diff --git a/skills/src/csharp/experimental/bingsearchskill/.filenesting.json b/skills/csharp/experimental/bingsearchskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/.filenesting.json rename to skills/csharp/experimental/bingsearchskill/.filenesting.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/bingsearchskill/Adapters/CustomSkillAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Adapters/CustomSkillAdapter.cs rename to skills/csharp/experimental/bingsearchskill/Adapters/CustomSkillAdapter.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/bingsearchskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/bingsearchskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/BingSearchSkill.csproj b/skills/csharp/experimental/bingsearchskill/BingSearchSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/BingSearchSkill.csproj rename to skills/csharp/experimental/bingsearchskill/BingSearchSkill.csproj diff --git a/skills/src/csharp/experimental/bingsearchskill/Bots/DialogBot.cs b/skills/csharp/experimental/bingsearchskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Bots/DialogBot.cs rename to skills/csharp/experimental/bingsearchskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/bingsearchskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/bingsearchskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Content/MovieCard.1.0.json b/skills/csharp/experimental/bingsearchskill/Content/MovieCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Content/MovieCard.1.0.json rename to skills/csharp/experimental/bingsearchskill/Content/MovieCard.1.0.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Content/MovieCard.json b/skills/csharp/experimental/bingsearchskill/Content/MovieCard.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Content/MovieCard.json rename to skills/csharp/experimental/bingsearchskill/Content/MovieCard.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Content/PersonCard.1.0.json b/skills/csharp/experimental/bingsearchskill/Content/PersonCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Content/PersonCard.1.0.json rename to skills/csharp/experimental/bingsearchskill/Content/PersonCard.1.0.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Content/PersonCard.json b/skills/csharp/experimental/bingsearchskill/Content/PersonCard.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Content/PersonCard.json rename to skills/csharp/experimental/bingsearchskill/Content/PersonCard.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Controllers/BotController.cs b/skills/csharp/experimental/bingsearchskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Controllers/BotController.cs rename to skills/csharp/experimental/bingsearchskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/BingSearchSkill.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/BingSearchSkill.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/BingSearchSkill.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/BingSearchSkill.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/General.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/General.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/General.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/de/General.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/BingSearchSkill.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/BingSearchSkill.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/BingSearchSkill.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/BingSearchSkill.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/BingSearchSkill.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/BingSearchSkill.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/BingSearchSkill.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/BingSearchSkill.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/General.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/General.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/General.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/es/General.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/BingSearchSkill.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/BingSearchSkill.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/BingSearchSkill.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/BingSearchSkill.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/General.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/General.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/General.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/fr/General.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/BingSearchSkill.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/BingSearchSkill.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/BingSearchSkill.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/BingSearchSkill.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/General.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/General.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/General.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/it/General.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/BingSearchSkill.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/BingSearchSkill.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/BingSearchSkill.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/BingSearchSkill.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/template.json b/skills/csharp/experimental/bingsearchskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Resources/template.json rename to skills/csharp/experimental/bingsearchskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/bingsearchskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/bingsearchskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/bingsearchskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/bingsearchskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/bingsearchskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/bingsearchskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/bingsearchskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/bingsearchskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/bingsearchskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/bingsearchskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/bingsearchskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/bingsearchskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Dialogs/SearchDialog.cs b/skills/csharp/experimental/bingsearchskill/Dialogs/SearchDialog.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Dialogs/SearchDialog.cs rename to skills/csharp/experimental/bingsearchskill/Dialogs/SearchDialog.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Dialogs/SkillDialogBase.cs b/skills/csharp/experimental/bingsearchskill/Dialogs/SkillDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Dialogs/SkillDialogBase.cs rename to skills/csharp/experimental/bingsearchskill/Dialogs/SkillDialogBase.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Models/Cards/MovieCardData.cs b/skills/csharp/experimental/bingsearchskill/Models/Cards/MovieCardData.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Models/Cards/MovieCardData.cs rename to skills/csharp/experimental/bingsearchskill/Models/Cards/MovieCardData.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Models/Cards/PersonCardData.cs b/skills/csharp/experimental/bingsearchskill/Models/Cards/PersonCardData.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Models/Cards/PersonCardData.cs rename to skills/csharp/experimental/bingsearchskill/Models/Cards/PersonCardData.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Models/FactModel.cs b/skills/csharp/experimental/bingsearchskill/Models/FactModel.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Models/FactModel.cs rename to skills/csharp/experimental/bingsearchskill/Models/FactModel.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Models/MovieModel.cs b/skills/csharp/experimental/bingsearchskill/Models/MovieModel.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Models/MovieModel.cs rename to skills/csharp/experimental/bingsearchskill/Models/MovieModel.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Models/SearchResultModel.cs b/skills/csharp/experimental/bingsearchskill/Models/SearchResultModel.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Models/SearchResultModel.cs rename to skills/csharp/experimental/bingsearchskill/Models/SearchResultModel.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Models/SkillState.cs b/skills/csharp/experimental/bingsearchskill/Models/SkillState.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Models/SkillState.cs rename to skills/csharp/experimental/bingsearchskill/Models/SkillState.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Program.cs b/skills/csharp/experimental/bingsearchskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Program.cs rename to skills/csharp/experimental/bingsearchskill/Program.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Properties/launchSettings.json b/skills/csharp/experimental/bingsearchskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Properties/launchSettings.json rename to skills/csharp/experimental/bingsearchskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.Designer.cs b/skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.Designer.cs rename to skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.Designer.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.de.resx b/skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.de.resx similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.de.resx rename to skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.de.resx diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.es.resx b/skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.es.resx similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.es.resx rename to skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.es.resx diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.fr.resx b/skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.fr.resx similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.fr.resx rename to skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.fr.resx diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.it.resx b/skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.it.resx similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.it.resx rename to skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.it.resx diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.resx b/skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.resx similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.resx rename to skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.resx diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.zh.resx b/skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.zh.resx similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/CommonStrings.zh.resx rename to skills/csharp/experimental/bingsearchskill/Responses/CommonStrings.zh.resx diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.cs b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.cs rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.de.json b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.de.json rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.de.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.es.json b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.es.json rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.es.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.fr.json b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.fr.json rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.fr.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.it.json b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.it.json rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.it.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.json b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.json rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.tt b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.tt rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.tt diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.zh.json b/skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.zh.json rename to skills/csharp/experimental/bingsearchskill/Responses/Main/MainResponses.zh.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.cs b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.cs rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.de.json b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.de.json rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.de.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.es.json b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.es.json rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.es.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.fr.json b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.fr.json rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.fr.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.it.json b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.it.json rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.it.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.json b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.json rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.tt b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.tt similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.tt rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.tt diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.zh.json b/skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.zh.json rename to skills/csharp/experimental/bingsearchskill/Responses/Search/SearchResponses.zh.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/bingsearchskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.cs b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.cs rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.de.json b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.de.json rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.de.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.es.json b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.es.json rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.es.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.fr.json b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.fr.json rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.fr.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.it.json b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.it.json rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.it.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.json b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.json rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.tt b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.tt rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.tt diff --git a/skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.zh.json b/skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.zh.json rename to skills/csharp/experimental/bingsearchskill/Responses/Shared/SharedResponses.zh.json diff --git a/skills/src/csharp/experimental/bingsearchskill/Services/BingSearchClient.cs b/skills/csharp/experimental/bingsearchskill/Services/BingSearchClient.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Services/BingSearchClient.cs rename to skills/csharp/experimental/bingsearchskill/Services/BingSearchClient.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Services/BingSearchSkillLuis.cs b/skills/csharp/experimental/bingsearchskill/Services/BingSearchSkillLuis.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Services/BingSearchSkillLuis.cs rename to skills/csharp/experimental/bingsearchskill/Services/BingSearchSkillLuis.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Services/BotServices.cs b/skills/csharp/experimental/bingsearchskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Services/BotServices.cs rename to skills/csharp/experimental/bingsearchskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Services/BotSettings.cs b/skills/csharp/experimental/bingsearchskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Services/BotSettings.cs rename to skills/csharp/experimental/bingsearchskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Services/GeneralLuis.cs b/skills/csharp/experimental/bingsearchskill/Services/GeneralLuis.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Services/GeneralLuis.cs rename to skills/csharp/experimental/bingsearchskill/Services/GeneralLuis.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Startup.cs b/skills/csharp/experimental/bingsearchskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Startup.cs rename to skills/csharp/experimental/bingsearchskill/Startup.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/Utilities/MovieHelper.cs b/skills/csharp/experimental/bingsearchskill/Utilities/MovieHelper.cs similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/Utilities/MovieHelper.cs rename to skills/csharp/experimental/bingsearchskill/Utilities/MovieHelper.cs diff --git a/skills/src/csharp/experimental/bingsearchskill/appsettings.json b/skills/csharp/experimental/bingsearchskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/appsettings.json rename to skills/csharp/experimental/bingsearchskill/appsettings.json diff --git a/skills/src/csharp/experimental/bingsearchskill/cognitivemodels.json b/skills/csharp/experimental/bingsearchskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/cognitivemodels.json rename to skills/csharp/experimental/bingsearchskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/bingsearchskill/manifestTemplate.json b/skills/csharp/experimental/bingsearchskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/manifestTemplate.json rename to skills/csharp/experimental/bingsearchskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/bingsearchskill/readme.md b/skills/csharp/experimental/bingsearchskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/readme.md rename to skills/csharp/experimental/bingsearchskill/readme.md diff --git a/skills/src/csharp/experimental/bingsearchskill/wwwroot/default.htm b/skills/csharp/experimental/bingsearchskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/bingsearchskill/wwwroot/default.htm rename to skills/csharp/experimental/bingsearchskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/eventskill/.filenesting.json b/skills/csharp/experimental/eventskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/.filenesting.json rename to skills/csharp/experimental/eventskill/.filenesting.json diff --git a/skills/src/csharp/experimental/eventskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/eventskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/eventskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/eventskill/Adapters/EventSkillAdapter.cs b/skills/csharp/experimental/eventskill/Adapters/EventSkillAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Adapters/EventSkillAdapter.cs rename to skills/csharp/experimental/eventskill/Adapters/EventSkillAdapter.cs diff --git a/skills/src/csharp/experimental/eventskill/Bots/DialogBot.cs b/skills/csharp/experimental/eventskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Bots/DialogBot.cs rename to skills/csharp/experimental/eventskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/eventskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/eventskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/eventskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/eventskill/Content/EventCard.1.0.json b/skills/csharp/experimental/eventskill/Content/EventCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Content/EventCard.1.0.json rename to skills/csharp/experimental/eventskill/Content/EventCard.1.0.json diff --git a/skills/src/csharp/experimental/eventskill/Content/EventCard.json b/skills/csharp/experimental/eventskill/Content/EventCard.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Content/EventCard.json rename to skills/csharp/experimental/eventskill/Content/EventCard.json diff --git a/skills/src/csharp/experimental/eventskill/Controllers/BotController.cs b/skills/csharp/experimental/eventskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Controllers/BotController.cs rename to skills/csharp/experimental/eventskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Resources/LU/en/Event.lu b/skills/csharp/experimental/eventskill/Deployment/Resources/LU/en/Event.lu similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Resources/LU/en/Event.lu rename to skills/csharp/experimental/eventskill/Deployment/Resources/LU/en/Event.lu diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/eventskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/eventskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/eventskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/eventskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Resources/template.json b/skills/csharp/experimental/eventskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Resources/template.json rename to skills/csharp/experimental/eventskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/eventskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/eventskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/eventskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/eventskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/eventskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/eventskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/eventskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/eventskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/eventskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/eventskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/eventskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/eventskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/eventskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/eventskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/eventskill/Dialogs/EventDialogBase.cs b/skills/csharp/experimental/eventskill/Dialogs/EventDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Dialogs/EventDialogBase.cs rename to skills/csharp/experimental/eventskill/Dialogs/EventDialogBase.cs diff --git a/skills/src/csharp/experimental/eventskill/Dialogs/FindEventsDialog.cs b/skills/csharp/experimental/eventskill/Dialogs/FindEventsDialog.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Dialogs/FindEventsDialog.cs rename to skills/csharp/experimental/eventskill/Dialogs/FindEventsDialog.cs diff --git a/skills/src/csharp/experimental/eventskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/eventskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/eventskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/eventskill/EventSkill.csproj b/skills/csharp/experimental/eventskill/EventSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/eventskill/EventSkill.csproj rename to skills/csharp/experimental/eventskill/EventSkill.csproj diff --git a/skills/src/csharp/experimental/eventskill/Models/EventCardData.cs b/skills/csharp/experimental/eventskill/Models/EventCardData.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/EventCardData.cs rename to skills/csharp/experimental/eventskill/Models/EventCardData.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/EventSkillState.cs b/skills/csharp/experimental/eventskill/Models/EventSkillState.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/EventSkillState.cs rename to skills/csharp/experimental/eventskill/Models/EventSkillState.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/EventSkillUserState.cs b/skills/csharp/experimental/eventskill/Models/EventSkillUserState.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/EventSkillUserState.cs rename to skills/csharp/experimental/eventskill/Models/EventSkillUserState.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/Address.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/Address.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/Address.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/Address.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/AugmentedLocation.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/AugmentedLocation.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/AugmentedLocation.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/AugmentedLocation.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/DateTimeTZ.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/DateTimeTZ.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/DateTimeTZ.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/DateTimeTZ.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/Event.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/Event.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/Event.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/Event.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/EventSearchResult.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/EventSearchResult.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/EventSearchResult.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/EventSearchResult.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/Location.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/Location.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/Location.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/Location.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/Logo.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/Logo.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/Logo.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/Logo.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/MultipartText.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/MultipartText.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/MultipartText.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/MultipartText.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/Pagination.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/Pagination.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/Pagination.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/Pagination.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/TicketAvailability.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/TicketAvailability.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/TicketAvailability.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/TicketAvailability.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/TicketPrice.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/TicketPrice.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/TicketPrice.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/TicketPrice.cs diff --git a/skills/src/csharp/experimental/eventskill/Models/Eventbrite/Venue.cs b/skills/csharp/experimental/eventskill/Models/Eventbrite/Venue.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Models/Eventbrite/Venue.cs rename to skills/csharp/experimental/eventskill/Models/Eventbrite/Venue.cs diff --git a/skills/src/csharp/experimental/eventskill/Pipeline/EventSkill.yml b/skills/csharp/experimental/eventskill/Pipeline/EventSkill.yml similarity index 100% rename from skills/src/csharp/experimental/eventskill/Pipeline/EventSkill.yml rename to skills/csharp/experimental/eventskill/Pipeline/EventSkill.yml diff --git a/skills/src/csharp/experimental/eventskill/Program.cs b/skills/csharp/experimental/eventskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Program.cs rename to skills/csharp/experimental/eventskill/Program.cs diff --git a/skills/src/csharp/experimental/eventskill/Properties/launchSettings.json b/skills/csharp/experimental/eventskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Properties/launchSettings.json rename to skills/csharp/experimental/eventskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.cs b/skills/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.cs rename to skills/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.cs diff --git a/skills/src/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.json b/skills/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.json rename to skills/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.tt b/skills/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.tt similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.tt rename to skills/csharp/experimental/eventskill/Responses/FindEvents/FindEventsResponses.tt diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.cs b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.cs rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.cs diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.de.json b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.de.json rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.de.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.es.json b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.es.json rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.es.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.fr.json b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.fr.json rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.fr.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.it.json b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.it.json rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.it.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.json b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.json rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.tt b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.tt rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.tt diff --git a/skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.zh.json b/skills/csharp/experimental/eventskill/Responses/Main/MainResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Main/MainResponses.zh.json rename to skills/csharp/experimental/eventskill/Responses/Main/MainResponses.zh.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/eventskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/eventskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.cs b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.cs rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.cs diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.de.json b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.de.json rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.de.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.es.json b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.es.json rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.es.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.fr.json b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.fr.json rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.fr.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.it.json b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.it.json rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.it.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.json b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.json rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.json diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.tt b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.tt rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.tt diff --git a/skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.zh.json b/skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/Responses/Shared/SharedResponses.zh.json rename to skills/csharp/experimental/eventskill/Responses/Shared/SharedResponses.zh.json diff --git a/skills/src/csharp/experimental/eventskill/Services/BotServices.cs b/skills/csharp/experimental/eventskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Services/BotServices.cs rename to skills/csharp/experimental/eventskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/eventskill/Services/BotSettings.cs b/skills/csharp/experimental/eventskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Services/BotSettings.cs rename to skills/csharp/experimental/eventskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/eventskill/Services/EventLuis.cs b/skills/csharp/experimental/eventskill/Services/EventLuis.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Services/EventLuis.cs rename to skills/csharp/experimental/eventskill/Services/EventLuis.cs diff --git a/skills/src/csharp/experimental/eventskill/Services/EventbriteService.cs b/skills/csharp/experimental/eventskill/Services/EventbriteService.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Services/EventbriteService.cs rename to skills/csharp/experimental/eventskill/Services/EventbriteService.cs diff --git a/skills/src/csharp/experimental/eventskill/Services/GeneralLuis.cs b/skills/csharp/experimental/eventskill/Services/GeneralLuis.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Services/GeneralLuis.cs rename to skills/csharp/experimental/eventskill/Services/GeneralLuis.cs diff --git a/skills/src/csharp/experimental/eventskill/Startup.cs b/skills/csharp/experimental/eventskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/eventskill/Startup.cs rename to skills/csharp/experimental/eventskill/Startup.cs diff --git a/skills/src/csharp/experimental/eventskill/appsettings.json b/skills/csharp/experimental/eventskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/appsettings.json rename to skills/csharp/experimental/eventskill/appsettings.json diff --git a/skills/src/csharp/experimental/eventskill/cognitivemodels.json b/skills/csharp/experimental/eventskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/cognitivemodels.json rename to skills/csharp/experimental/eventskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/eventskill/manifestTemplate.json b/skills/csharp/experimental/eventskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/eventskill/manifestTemplate.json rename to skills/csharp/experimental/eventskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/eventskill/readme.md b/skills/csharp/experimental/eventskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/eventskill/readme.md rename to skills/csharp/experimental/eventskill/readme.md diff --git a/skills/src/csharp/experimental/eventskill/wwwroot/default.htm b/skills/csharp/experimental/eventskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/eventskill/wwwroot/default.htm rename to skills/csharp/experimental/eventskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/hospitalityskill/.filenesting.json b/skills/csharp/experimental/hospitalityskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/.filenesting.json rename to skills/csharp/experimental/hospitalityskill/.filenesting.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/hospitalityskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/hospitalityskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Adapters/HospitalitySkillAdapter.cs b/skills/csharp/experimental/hospitalityskill/Adapters/HospitalitySkillAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Adapters/HospitalitySkillAdapter.cs rename to skills/csharp/experimental/hospitalityskill/Adapters/HospitalitySkillAdapter.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Bots/DialogBot.cs b/skills/csharp/experimental/hospitalityskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Bots/DialogBot.cs rename to skills/csharp/experimental/hospitalityskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/hospitalityskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/hospitalityskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/FoodItemCard.1.0.json b/skills/csharp/experimental/hospitalityskill/Content/FoodItemCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/FoodItemCard.1.0.json rename to skills/csharp/experimental/hospitalityskill/Content/FoodItemCard.1.0.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/FoodItemCard.json b/skills/csharp/experimental/hospitalityskill/Content/FoodItemCard.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/FoodItemCard.json rename to skills/csharp/experimental/hospitalityskill/Content/FoodItemCard.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/FoodOrderCard.1.0.json b/skills/csharp/experimental/hospitalityskill/Content/FoodOrderCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/FoodOrderCard.1.0.json rename to skills/csharp/experimental/hospitalityskill/Content/FoodOrderCard.1.0.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/FoodOrderCard.json b/skills/csharp/experimental/hospitalityskill/Content/FoodOrderCard.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/FoodOrderCard.json rename to skills/csharp/experimental/hospitalityskill/Content/FoodOrderCard.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/MenuCard.1.0.json b/skills/csharp/experimental/hospitalityskill/Content/MenuCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/MenuCard.1.0.json rename to skills/csharp/experimental/hospitalityskill/Content/MenuCard.1.0.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/MenuCard.json b/skills/csharp/experimental/hospitalityskill/Content/MenuCard.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/MenuCard.json rename to skills/csharp/experimental/hospitalityskill/Content/MenuCard.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/MenuItemCard.1.0.json b/skills/csharp/experimental/hospitalityskill/Content/MenuItemCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/MenuItemCard.1.0.json rename to skills/csharp/experimental/hospitalityskill/Content/MenuItemCard.1.0.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/MenuItemCard.json b/skills/csharp/experimental/hospitalityskill/Content/MenuItemCard.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/MenuItemCard.json rename to skills/csharp/experimental/hospitalityskill/Content/MenuItemCard.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/RequestItemCard.1.0.json b/skills/csharp/experimental/hospitalityskill/Content/RequestItemCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/RequestItemCard.1.0.json rename to skills/csharp/experimental/hospitalityskill/Content/RequestItemCard.1.0.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/RequestItemCard.json b/skills/csharp/experimental/hospitalityskill/Content/RequestItemCard.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/RequestItemCard.json rename to skills/csharp/experimental/hospitalityskill/Content/RequestItemCard.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/ReservationDetails.1.0.json b/skills/csharp/experimental/hospitalityskill/Content/ReservationDetails.1.0.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/ReservationDetails.1.0.json rename to skills/csharp/experimental/hospitalityskill/Content/ReservationDetails.1.0.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/ReservationDetails.json b/skills/csharp/experimental/hospitalityskill/Content/ReservationDetails.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/ReservationDetails.json rename to skills/csharp/experimental/hospitalityskill/Content/ReservationDetails.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/RoomItemCard.1.0.json b/skills/csharp/experimental/hospitalityskill/Content/RoomItemCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/RoomItemCard.1.0.json rename to skills/csharp/experimental/hospitalityskill/Content/RoomItemCard.1.0.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Content/RoomItemCard.json b/skills/csharp/experimental/hospitalityskill/Content/RoomItemCard.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Content/RoomItemCard.json rename to skills/csharp/experimental/hospitalityskill/Content/RoomItemCard.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Controllers/BotController.cs b/skills/csharp/experimental/hospitalityskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Controllers/BotController.cs rename to skills/csharp/experimental/hospitalityskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Data/AvailableItems.json b/skills/csharp/experimental/hospitalityskill/Data/AvailableItems.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Data/AvailableItems.json rename to skills/csharp/experimental/hospitalityskill/Data/AvailableItems.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Data/RoomServiceMenu.json b/skills/csharp/experimental/hospitalityskill/Data/RoomServiceMenu.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Data/RoomServiceMenu.json rename to skills/csharp/experimental/hospitalityskill/Data/RoomServiceMenu.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/Hospitality.lu b/skills/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/Hospitality.lu similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/Hospitality.lu rename to skills/csharp/experimental/hospitalityskill/Deployment/Resources/LU/en/Hospitality.lu diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/hospitalityskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/hospitalityskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/template.json b/skills/csharp/experimental/hospitalityskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Resources/template.json rename to skills/csharp/experimental/hospitalityskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/hospitalityskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/hospitalityskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/hospitalityskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/hospitalityskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/hospitalityskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/hospitalityskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/hospitalityskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/hospitalityskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/hospitalityskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/CheckOutDialog.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/CheckOutDialog.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/CheckOutDialog.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/CheckOutDialog.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/ExtendStayDialog.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/ExtendStayDialog.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/ExtendStayDialog.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/ExtendStayDialog.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/GetReservationDialog.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/GetReservationDialog.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/GetReservationDialog.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/GetReservationDialog.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/HospitalityDialogBase.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/HospitalityDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/HospitalityDialogBase.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/HospitalityDialogBase.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/LateCheckOutDialog.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/LateCheckOutDialog.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/LateCheckOutDialog.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/LateCheckOutDialog.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/RequestItemDialog.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/RequestItemDialog.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/RequestItemDialog.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/RequestItemDialog.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Dialogs/RoomServiceDialog.cs b/skills/csharp/experimental/hospitalityskill/Dialogs/RoomServiceDialog.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Dialogs/RoomServiceDialog.cs rename to skills/csharp/experimental/hospitalityskill/Dialogs/RoomServiceDialog.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/HospitalitySkill.csproj b/skills/csharp/experimental/hospitalityskill/HospitalitySkill.csproj similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/HospitalitySkill.csproj rename to skills/csharp/experimental/hospitalityskill/HospitalitySkill.csproj diff --git a/skills/src/csharp/experimental/hospitalityskill/Models/HospitalitySkillState.cs b/skills/csharp/experimental/hospitalityskill/Models/HospitalitySkillState.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Models/HospitalitySkillState.cs rename to skills/csharp/experimental/hospitalityskill/Models/HospitalitySkillState.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Models/HospitalityUserSkillState.cs b/skills/csharp/experimental/hospitalityskill/Models/HospitalityUserSkillState.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Models/HospitalityUserSkillState.cs rename to skills/csharp/experimental/hospitalityskill/Models/HospitalityUserSkillState.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Models/ReservationData.cs b/skills/csharp/experimental/hospitalityskill/Models/ReservationData.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Models/ReservationData.cs rename to skills/csharp/experimental/hospitalityskill/Models/ReservationData.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Models/RoomItem.cs b/skills/csharp/experimental/hospitalityskill/Models/RoomItem.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Models/RoomItem.cs rename to skills/csharp/experimental/hospitalityskill/Models/RoomItem.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Models/RoomService/FoodOrderData.cs b/skills/csharp/experimental/hospitalityskill/Models/RoomService/FoodOrderData.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Models/RoomService/FoodOrderData.cs rename to skills/csharp/experimental/hospitalityskill/Models/RoomService/FoodOrderData.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Models/RoomService/Menu.cs b/skills/csharp/experimental/hospitalityskill/Models/RoomService/Menu.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Models/RoomService/Menu.cs rename to skills/csharp/experimental/hospitalityskill/Models/RoomService/Menu.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Models/RoomService/MenuItem.cs b/skills/csharp/experimental/hospitalityskill/Models/RoomService/MenuItem.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Models/RoomService/MenuItem.cs rename to skills/csharp/experimental/hospitalityskill/Models/RoomService/MenuItem.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Program.cs b/skills/csharp/experimental/hospitalityskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Program.cs rename to skills/csharp/experimental/hospitalityskill/Program.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Properties/launchSettings.json b/skills/csharp/experimental/hospitalityskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Properties/launchSettings.json rename to skills/csharp/experimental/hospitalityskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/CheckOut/CheckOutResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/ExtendStay/ExtendStayResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/GetReservation/GetReservationResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/LateCheckOut/LateCheckOutResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.de.json b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.de.json rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.de.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.es.json b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.es.json rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.es.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.fr.json b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.fr.json rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.fr.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.it.json b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.it.json rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.it.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.zh.json b/skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.zh.json rename to skills/csharp/experimental/hospitalityskill/Responses/Main/MainResponses.zh.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/RequestItem/RequestItemResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/RoomService/RoomServiceResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.Designer.cs b/skills/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.Designer.cs rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.Designer.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.resx b/skills/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.resx similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.resx rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/HospitalityStrings.resx diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/hospitalityskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.cs b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.cs rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.de.json b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.de.json rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.de.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.es.json b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.es.json rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.es.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.fr.json b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.fr.json rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.fr.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.it.json b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.it.json rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.it.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.json b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.json rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.tt b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.tt rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.tt diff --git a/skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.zh.json b/skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.zh.json rename to skills/csharp/experimental/hospitalityskill/Responses/Shared/SharedResponses.zh.json diff --git a/skills/src/csharp/experimental/hospitalityskill/Services/BotServices.cs b/skills/csharp/experimental/hospitalityskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Services/BotServices.cs rename to skills/csharp/experimental/hospitalityskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Services/BotSettings.cs b/skills/csharp/experimental/hospitalityskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Services/BotSettings.cs rename to skills/csharp/experimental/hospitalityskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Services/GeneralLuis.cs b/skills/csharp/experimental/hospitalityskill/Services/GeneralLuis.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Services/GeneralLuis.cs rename to skills/csharp/experimental/hospitalityskill/Services/GeneralLuis.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Services/HospitalityLuis.cs b/skills/csharp/experimental/hospitalityskill/Services/HospitalityLuis.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Services/HospitalityLuis.cs rename to skills/csharp/experimental/hospitalityskill/Services/HospitalityLuis.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Services/HotelService.cs b/skills/csharp/experimental/hospitalityskill/Services/HotelService.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Services/HotelService.cs rename to skills/csharp/experimental/hospitalityskill/Services/HotelService.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Services/IHotelService.cs b/skills/csharp/experimental/hospitalityskill/Services/IHotelService.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Services/IHotelService.cs rename to skills/csharp/experimental/hospitalityskill/Services/IHotelService.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/Startup.cs b/skills/csharp/experimental/hospitalityskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/Startup.cs rename to skills/csharp/experimental/hospitalityskill/Startup.cs diff --git a/skills/src/csharp/experimental/hospitalityskill/appsettings.json b/skills/csharp/experimental/hospitalityskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/appsettings.json rename to skills/csharp/experimental/hospitalityskill/appsettings.json diff --git a/skills/src/csharp/experimental/hospitalityskill/cognitivemodels.json b/skills/csharp/experimental/hospitalityskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/cognitivemodels.json rename to skills/csharp/experimental/hospitalityskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/hospitalityskill/manifestTemplate.json b/skills/csharp/experimental/hospitalityskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/manifestTemplate.json rename to skills/csharp/experimental/hospitalityskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/hospitalityskill/readme.md b/skills/csharp/experimental/hospitalityskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/readme.md rename to skills/csharp/experimental/hospitalityskill/readme.md diff --git a/skills/src/csharp/experimental/hospitalityskill/wwwroot/default.htm b/skills/csharp/experimental/hospitalityskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/hospitalityskill/wwwroot/default.htm rename to skills/csharp/experimental/hospitalityskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/itsmskill/.filenesting.json b/skills/csharp/experimental/itsmskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/.filenesting.json rename to skills/csharp/experimental/itsmskill/.filenesting.json diff --git a/skills/src/csharp/experimental/itsmskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/itsmskill/Adapters/CustomSkillAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Adapters/CustomSkillAdapter.cs rename to skills/csharp/experimental/itsmskill/Adapters/CustomSkillAdapter.cs diff --git a/skills/src/csharp/experimental/itsmskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/itsmskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/itsmskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/itsmskill/Bots/DialogBot.cs b/skills/csharp/experimental/itsmskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Bots/DialogBot.cs rename to skills/csharp/experimental/itsmskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/itsmskill/Content/Knowledge.1.0.json b/skills/csharp/experimental/itsmskill/Content/Knowledge.1.0.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Content/Knowledge.1.0.json rename to skills/csharp/experimental/itsmskill/Content/Knowledge.1.0.json diff --git a/skills/src/csharp/experimental/itsmskill/Content/Knowledge.json b/skills/csharp/experimental/itsmskill/Content/Knowledge.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Content/Knowledge.json rename to skills/csharp/experimental/itsmskill/Content/Knowledge.json diff --git a/skills/src/csharp/experimental/itsmskill/Content/Ticket.1.0.json b/skills/csharp/experimental/itsmskill/Content/Ticket.1.0.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Content/Ticket.1.0.json rename to skills/csharp/experimental/itsmskill/Content/Ticket.1.0.json diff --git a/skills/src/csharp/experimental/itsmskill/Content/Ticket.json b/skills/csharp/experimental/itsmskill/Content/Ticket.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Content/Ticket.json rename to skills/csharp/experimental/itsmskill/Content/Ticket.json diff --git a/skills/src/csharp/experimental/itsmskill/Controllers/BotController.cs b/skills/csharp/experimental/itsmskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Controllers/BotController.cs rename to skills/csharp/experimental/itsmskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/ITSM.lu b/skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/ITSM.lu similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/ITSM.lu rename to skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/ITSM.lu diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/KnowledgeShow.lu b/skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/KnowledgeShow.lu similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/KnowledgeShow.lu rename to skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/KnowledgeShow.lu diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketClose.lu b/skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketClose.lu similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketClose.lu rename to skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketClose.lu diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketCreate.lu b/skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketCreate.lu similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketCreate.lu rename to skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketCreate.lu diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketShow.lu b/skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketShow.lu similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketShow.lu rename to skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketShow.lu diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketUpdate.lu b/skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketUpdate.lu similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketUpdate.lu rename to skills/csharp/experimental/itsmskill/Deployment/Resources/LU/en/TicketUpdate.lu diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/itsmskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/itsmskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Resources/template.json b/skills/csharp/experimental/itsmskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Resources/template.json rename to skills/csharp/experimental/itsmskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/itsmskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/itsmskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/itsmskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/itsmskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/itsmskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/itsmskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/itsmskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/itsmskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/itsmskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/itsmskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/itsmskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/itsmskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/itsmskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/itsmskill/Dialogs/CloseTicketDialog.cs b/skills/csharp/experimental/itsmskill/Dialogs/CloseTicketDialog.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Dialogs/CloseTicketDialog.cs rename to skills/csharp/experimental/itsmskill/Dialogs/CloseTicketDialog.cs diff --git a/skills/src/csharp/experimental/itsmskill/Dialogs/CreateTicketDialog.cs b/skills/csharp/experimental/itsmskill/Dialogs/CreateTicketDialog.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Dialogs/CreateTicketDialog.cs rename to skills/csharp/experimental/itsmskill/Dialogs/CreateTicketDialog.cs diff --git a/skills/src/csharp/experimental/itsmskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/itsmskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/itsmskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/itsmskill/Dialogs/ShowKnowledgeDialog.cs b/skills/csharp/experimental/itsmskill/Dialogs/ShowKnowledgeDialog.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Dialogs/ShowKnowledgeDialog.cs rename to skills/csharp/experimental/itsmskill/Dialogs/ShowKnowledgeDialog.cs diff --git a/skills/src/csharp/experimental/itsmskill/Dialogs/ShowTicketDialog.cs b/skills/csharp/experimental/itsmskill/Dialogs/ShowTicketDialog.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Dialogs/ShowTicketDialog.cs rename to skills/csharp/experimental/itsmskill/Dialogs/ShowTicketDialog.cs diff --git a/skills/src/csharp/experimental/itsmskill/Dialogs/SkillDialogBase.cs b/skills/csharp/experimental/itsmskill/Dialogs/SkillDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Dialogs/SkillDialogBase.cs rename to skills/csharp/experimental/itsmskill/Dialogs/SkillDialogBase.cs diff --git a/skills/src/csharp/experimental/itsmskill/Dialogs/UpdateTicketDialog.cs b/skills/csharp/experimental/itsmskill/Dialogs/UpdateTicketDialog.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Dialogs/UpdateTicketDialog.cs rename to skills/csharp/experimental/itsmskill/Dialogs/UpdateTicketDialog.cs diff --git a/skills/src/csharp/experimental/itsmskill/ITSMSkill.csproj b/skills/csharp/experimental/itsmskill/ITSMSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/itsmskill/ITSMSkill.csproj rename to skills/csharp/experimental/itsmskill/ITSMSkill.csproj diff --git a/skills/src/csharp/experimental/itsmskill/Models/AttributeType.cs b/skills/csharp/experimental/itsmskill/Models/AttributeType.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/AttributeType.cs rename to skills/csharp/experimental/itsmskill/Models/AttributeType.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/Knowledge.cs b/skills/csharp/experimental/itsmskill/Models/Knowledge.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/Knowledge.cs rename to skills/csharp/experimental/itsmskill/Models/Knowledge.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/KnowledgeCard.cs b/skills/csharp/experimental/itsmskill/Models/KnowledgeCard.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/KnowledgeCard.cs rename to skills/csharp/experimental/itsmskill/Models/KnowledgeCard.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/KnowledgesResult.cs b/skills/csharp/experimental/itsmskill/Models/KnowledgesResult.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/KnowledgesResult.cs rename to skills/csharp/experimental/itsmskill/Models/KnowledgesResult.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ResultBase.cs b/skills/csharp/experimental/itsmskill/Models/ResultBase.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ResultBase.cs rename to skills/csharp/experimental/itsmskill/Models/ResultBase.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ServiceNow/CreateTicketRequest.cs b/skills/csharp/experimental/itsmskill/Models/ServiceNow/CreateTicketRequest.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ServiceNow/CreateTicketRequest.cs rename to skills/csharp/experimental/itsmskill/Models/ServiceNow/CreateTicketRequest.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ServiceNow/GetUserIdResponse.cs b/skills/csharp/experimental/itsmskill/Models/ServiceNow/GetUserIdResponse.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ServiceNow/GetUserIdResponse.cs rename to skills/csharp/experimental/itsmskill/Models/ServiceNow/GetUserIdResponse.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ServiceNow/KnowledgeResponse.cs b/skills/csharp/experimental/itsmskill/Models/ServiceNow/KnowledgeResponse.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ServiceNow/KnowledgeResponse.cs rename to skills/csharp/experimental/itsmskill/Models/ServiceNow/KnowledgeResponse.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ServiceNow/MultiKnowledgesResponse.cs b/skills/csharp/experimental/itsmskill/Models/ServiceNow/MultiKnowledgesResponse.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ServiceNow/MultiKnowledgesResponse.cs rename to skills/csharp/experimental/itsmskill/Models/ServiceNow/MultiKnowledgesResponse.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ServiceNow/MultiTicketsResponse.cs b/skills/csharp/experimental/itsmskill/Models/ServiceNow/MultiTicketsResponse.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ServiceNow/MultiTicketsResponse.cs rename to skills/csharp/experimental/itsmskill/Models/ServiceNow/MultiTicketsResponse.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ServiceNow/SingleTicketResponse.cs b/skills/csharp/experimental/itsmskill/Models/ServiceNow/SingleTicketResponse.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ServiceNow/SingleTicketResponse.cs rename to skills/csharp/experimental/itsmskill/Models/ServiceNow/SingleTicketResponse.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/ServiceNow/TicketResponse.cs b/skills/csharp/experimental/itsmskill/Models/ServiceNow/TicketResponse.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/ServiceNow/TicketResponse.cs rename to skills/csharp/experimental/itsmskill/Models/ServiceNow/TicketResponse.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/SkillState.cs b/skills/csharp/experimental/itsmskill/Models/SkillState.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/SkillState.cs rename to skills/csharp/experimental/itsmskill/Models/SkillState.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/Ticket.cs b/skills/csharp/experimental/itsmskill/Models/Ticket.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/Ticket.cs rename to skills/csharp/experimental/itsmskill/Models/Ticket.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/TicketCard.cs b/skills/csharp/experimental/itsmskill/Models/TicketCard.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/TicketCard.cs rename to skills/csharp/experimental/itsmskill/Models/TicketCard.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/TicketState.cs b/skills/csharp/experimental/itsmskill/Models/TicketState.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/TicketState.cs rename to skills/csharp/experimental/itsmskill/Models/TicketState.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/TicketsResult.cs b/skills/csharp/experimental/itsmskill/Models/TicketsResult.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/TicketsResult.cs rename to skills/csharp/experimental/itsmskill/Models/TicketsResult.cs diff --git a/skills/src/csharp/experimental/itsmskill/Models/UrgencyLevel.cs b/skills/csharp/experimental/itsmskill/Models/UrgencyLevel.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Models/UrgencyLevel.cs rename to skills/csharp/experimental/itsmskill/Models/UrgencyLevel.cs diff --git a/skills/src/csharp/experimental/itsmskill/Program.cs b/skills/csharp/experimental/itsmskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Program.cs rename to skills/csharp/experimental/itsmskill/Program.cs diff --git a/skills/src/csharp/experimental/itsmskill/Prompts/AttributeWithNoPrompt.cs b/skills/csharp/experimental/itsmskill/Prompts/AttributeWithNoPrompt.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Prompts/AttributeWithNoPrompt.cs rename to skills/csharp/experimental/itsmskill/Prompts/AttributeWithNoPrompt.cs diff --git a/skills/src/csharp/experimental/itsmskill/Prompts/GeneralPrompt.cs b/skills/csharp/experimental/itsmskill/Prompts/GeneralPrompt.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Prompts/GeneralPrompt.cs rename to skills/csharp/experimental/itsmskill/Prompts/GeneralPrompt.cs diff --git a/skills/src/csharp/experimental/itsmskill/Prompts/TicketNumberPrompt.cs b/skills/csharp/experimental/itsmskill/Prompts/TicketNumberPrompt.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Prompts/TicketNumberPrompt.cs rename to skills/csharp/experimental/itsmskill/Prompts/TicketNumberPrompt.cs diff --git a/skills/src/csharp/experimental/itsmskill/Properties/launchSettings.json b/skills/csharp/experimental/itsmskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Properties/launchSettings.json rename to skills/csharp/experimental/itsmskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.cs b/skills/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.cs rename to skills/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.cs diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.json b/skills/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.json rename to skills/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.json diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.tt b/skills/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.tt similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.tt rename to skills/csharp/experimental/itsmskill/Responses/Knowledge/KnowledgeResponses.tt diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Main/MainResponses.cs b/skills/csharp/experimental/itsmskill/Responses/Main/MainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Main/MainResponses.cs rename to skills/csharp/experimental/itsmskill/Responses/Main/MainResponses.cs diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Main/MainResponses.json b/skills/csharp/experimental/itsmskill/Responses/Main/MainResponses.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Main/MainResponses.json rename to skills/csharp/experimental/itsmskill/Responses/Main/MainResponses.json diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Main/MainResponses.tt b/skills/csharp/experimental/itsmskill/Responses/Main/MainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Main/MainResponses.tt rename to skills/csharp/experimental/itsmskill/Responses/Main/MainResponses.tt diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/itsmskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/itsmskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.cs b/skills/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.cs rename to skills/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.cs diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.json b/skills/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.json rename to skills/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.json diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.tt b/skills/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.tt rename to skills/csharp/experimental/itsmskill/Responses/Shared/SharedResponses.tt diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.Designer.cs b/skills/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.Designer.cs rename to skills/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.Designer.cs diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.resx b/skills/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.resx similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.resx rename to skills/csharp/experimental/itsmskill/Responses/Shared/SharedStrings.resx diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.cs b/skills/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.cs rename to skills/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.cs diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.json b/skills/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.json rename to skills/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.json diff --git a/skills/src/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.tt b/skills/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.tt similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.tt rename to skills/csharp/experimental/itsmskill/Responses/Ticket/TicketResponses.tt diff --git a/skills/src/csharp/experimental/itsmskill/Services/BotServices.cs b/skills/csharp/experimental/itsmskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/BotServices.cs rename to skills/csharp/experimental/itsmskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/itsmskill/Services/BotSettings.cs b/skills/csharp/experimental/itsmskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/BotSettings.cs rename to skills/csharp/experimental/itsmskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/itsmskill/Services/GeneralLuis.cs b/skills/csharp/experimental/itsmskill/Services/GeneralLuis.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/GeneralLuis.cs rename to skills/csharp/experimental/itsmskill/Services/GeneralLuis.cs diff --git a/skills/src/csharp/experimental/itsmskill/Services/IITServiceManagement.cs b/skills/csharp/experimental/itsmskill/Services/IITServiceManagement.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/IITServiceManagement.cs rename to skills/csharp/experimental/itsmskill/Services/IITServiceManagement.cs diff --git a/skills/src/csharp/experimental/itsmskill/Services/IServiceManager.cs b/skills/csharp/experimental/itsmskill/Services/IServiceManager.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/IServiceManager.cs rename to skills/csharp/experimental/itsmskill/Services/IServiceManager.cs diff --git a/skills/src/csharp/experimental/itsmskill/Services/ITSMLuis.cs b/skills/csharp/experimental/itsmskill/Services/ITSMLuis.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/ITSMLuis.cs rename to skills/csharp/experimental/itsmskill/Services/ITSMLuis.cs diff --git a/skills/src/csharp/experimental/itsmskill/Services/ServiceManager.cs b/skills/csharp/experimental/itsmskill/Services/ServiceManager.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/ServiceManager.cs rename to skills/csharp/experimental/itsmskill/Services/ServiceManager.cs diff --git a/skills/src/csharp/experimental/itsmskill/Services/ServiceNow/Management.cs b/skills/csharp/experimental/itsmskill/Services/ServiceNow/Management.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Services/ServiceNow/Management.cs rename to skills/csharp/experimental/itsmskill/Services/ServiceNow/Management.cs diff --git a/skills/src/csharp/experimental/itsmskill/Startup.cs b/skills/csharp/experimental/itsmskill/Startup.cs similarity index 64% rename from skills/src/csharp/experimental/itsmskill/Startup.cs rename to skills/csharp/experimental/itsmskill/Startup.cs index f573d8e298..6c359d15c6 100644 --- a/skills/src/csharp/experimental/itsmskill/Startup.cs +++ b/skills/csharp/experimental/itsmskill/Startup.cs @@ -58,34 +58,34 @@ public void ConfigureServices(IServiceCollection services) { services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); - var provider = services.BuildServiceProvider(); + var provider = services.BuildServiceProvider(); // Load settings - var settings = new BotSettings(); - Configuration.Bind(settings); - services.AddSingleton(settings); - services.AddSingleton(settings); + var settings = new BotSettings(); + Configuration.Bind(settings); + services.AddSingleton(settings); + services.AddSingleton(settings); // Configure credentials - services.AddSingleton(); - services.AddSingleton(new MicrosoftAppCredentials(settings.MicrosoftAppId, settings.MicrosoftAppPassword)); + services.AddSingleton(); + services.AddSingleton(new MicrosoftAppCredentials(settings.MicrosoftAppId, settings.MicrosoftAppPassword)); // Configure telemetry - services.AddApplicationInsightsTelemetry(); - var telemetryClient = new BotTelemetryClient(new TelemetryClient()); - services.AddSingleton(telemetryClient); - services.AddBotApplicationInsights(telemetryClient); + services.AddApplicationInsightsTelemetry(); + var telemetryClient = new BotTelemetryClient(new TelemetryClient()); + services.AddSingleton(telemetryClient); + services.AddBotApplicationInsights(telemetryClient); // Configure bot services - services.AddSingleton(); + services.AddSingleton(); // Configure storage // Uncomment the following line for local development without Cosmos Db // services.AddSingleton(); - services.AddSingleton(new CosmosDbStorage(settings.CosmosDb)); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(sp => + services.AddSingleton(new CosmosDbStorage(settings.CosmosDb)); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(sp => { var userState = sp.GetService(); var conversationState = sp.GetService(); @@ -93,11 +93,11 @@ public void ConfigureServices(IServiceCollection services) }); // Configure proactive - services.AddSingleton(); - services.AddHostedService(); + services.AddSingleton(); + services.AddHostedService(); // Configure responses - services.AddSingleton(sp => new ResponseManager( + services.AddSingleton(sp => new ResponseManager( settings.CognitiveModels.Select(l => l.Key).ToArray(), new MainResponses(), new TicketResponses(), @@ -105,27 +105,27 @@ public void ConfigureServices(IServiceCollection services) new SharedResponses())); // Configure service - services.AddSingleton(new ServiceManager()); + services.AddSingleton(new ServiceManager()); // Register dialogs - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); // Configure adapters - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); // Register WhiteListAuthProvider - services.AddSingleton(); + services.AddSingleton(); // Configure bot - services.AddTransient>(); - services.AddSingleton(new SimpleWhitelistAuthenticationProvider()); + services.AddTransient>(); + services.AddSingleton(new SimpleWhitelistAuthenticationProvider()); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/skills/src/csharp/experimental/itsmskill/Utilities/EnumToLocalizedString.cs b/skills/csharp/experimental/itsmskill/Utilities/EnumToLocalizedString.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Utilities/EnumToLocalizedString.cs rename to skills/csharp/experimental/itsmskill/Utilities/EnumToLocalizedString.cs diff --git a/skills/src/csharp/experimental/itsmskill/Utilities/SimpleWhitelistAuthenticationProvider.cs b/skills/csharp/experimental/itsmskill/Utilities/SimpleWhitelistAuthenticationProvider.cs similarity index 100% rename from skills/src/csharp/experimental/itsmskill/Utilities/SimpleWhitelistAuthenticationProvider.cs rename to skills/csharp/experimental/itsmskill/Utilities/SimpleWhitelistAuthenticationProvider.cs diff --git a/skills/src/csharp/experimental/itsmskill/appsettings.json b/skills/csharp/experimental/itsmskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/appsettings.json rename to skills/csharp/experimental/itsmskill/appsettings.json diff --git a/skills/src/csharp/experimental/itsmskill/cognitivemodels.json b/skills/csharp/experimental/itsmskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/cognitivemodels.json rename to skills/csharp/experimental/itsmskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/itsmskill/manifestTemplate.json b/skills/csharp/experimental/itsmskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/itsmskill/manifestTemplate.json rename to skills/csharp/experimental/itsmskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/itsmskill/readme.md b/skills/csharp/experimental/itsmskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/itsmskill/readme.md rename to skills/csharp/experimental/itsmskill/readme.md diff --git a/skills/src/csharp/experimental/itsmskill/wwwroot/default.htm b/skills/csharp/experimental/itsmskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/itsmskill/wwwroot/default.htm rename to skills/csharp/experimental/itsmskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/musicskill/.filenesting.json b/skills/csharp/experimental/musicskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/.filenesting.json rename to skills/csharp/experimental/musicskill/.filenesting.json diff --git a/skills/src/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs rename to skills/csharp/experimental/musicskill/Adapters/CustomSkillAdapter.cs diff --git a/skills/src/csharp/experimental/musicskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/musicskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/musicskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/musicskill/Bots/DialogBot.cs b/skills/csharp/experimental/musicskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Bots/DialogBot.cs rename to skills/csharp/experimental/musicskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/musicskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/musicskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/musicskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/musicskill/Controllers/BotController.cs b/skills/csharp/experimental/musicskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Controllers/BotController.cs rename to skills/csharp/experimental/musicskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/musicskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/musicskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/en/MusicSkill.lu b/skills/csharp/experimental/musicskill/Deployment/Resources/LU/en/MusicSkill.lu similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/en/MusicSkill.lu rename to skills/csharp/experimental/musicskill/Deployment/Resources/LU/en/MusicSkill.lu diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/experimental/musicskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/experimental/musicskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/zh/MusicSkill.lu b/skills/csharp/experimental/musicskill/Deployment/Resources/LU/zh/MusicSkill.lu similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Resources/LU/zh/MusicSkill.lu rename to skills/csharp/experimental/musicskill/Deployment/Resources/LU/zh/MusicSkill.lu diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/musicskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/musicskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Resources/template.json b/skills/csharp/experimental/musicskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Resources/template.json rename to skills/csharp/experimental/musicskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/musicskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/musicskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/musicskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/musicskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/musicskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/musicskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/musicskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/musicskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/musicskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/musicskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/musicskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/musicskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/musicskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/musicskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/musicskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/musicskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/musicskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/musicskill/Dialogs/PlayMusicDialog.cs b/skills/csharp/experimental/musicskill/Dialogs/PlayMusicDialog.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Dialogs/PlayMusicDialog.cs rename to skills/csharp/experimental/musicskill/Dialogs/PlayMusicDialog.cs diff --git a/skills/src/csharp/experimental/musicskill/Dialogs/SkillDialogBase.cs b/skills/csharp/experimental/musicskill/Dialogs/SkillDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Dialogs/SkillDialogBase.cs rename to skills/csharp/experimental/musicskill/Dialogs/SkillDialogBase.cs diff --git a/skills/src/csharp/experimental/musicskill/Models/OpenDefaultApp.cs b/skills/csharp/experimental/musicskill/Models/OpenDefaultApp.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Models/OpenDefaultApp.cs rename to skills/csharp/experimental/musicskill/Models/OpenDefaultApp.cs diff --git a/skills/src/csharp/experimental/musicskill/Models/SkillState.cs b/skills/csharp/experimental/musicskill/Models/SkillState.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Models/SkillState.cs rename to skills/csharp/experimental/musicskill/Models/SkillState.cs diff --git a/skills/src/csharp/experimental/musicskill/MusicSkill.csproj b/skills/csharp/experimental/musicskill/MusicSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/musicskill/MusicSkill.csproj rename to skills/csharp/experimental/musicskill/MusicSkill.csproj diff --git a/skills/src/csharp/experimental/musicskill/Pipeline/MusicSkill.yml b/skills/csharp/experimental/musicskill/Pipeline/MusicSkill.yml similarity index 100% rename from skills/src/csharp/experimental/musicskill/Pipeline/MusicSkill.yml rename to skills/csharp/experimental/musicskill/Pipeline/MusicSkill.yml diff --git a/skills/src/csharp/experimental/musicskill/Program.cs b/skills/csharp/experimental/musicskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Program.cs rename to skills/csharp/experimental/musicskill/Program.cs diff --git a/skills/src/csharp/experimental/musicskill/Properties/launchSettings.json b/skills/csharp/experimental/musicskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Properties/launchSettings.json rename to skills/csharp/experimental/musicskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.cs b/skills/csharp/experimental/musicskill/Responses/Main/MainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.cs rename to skills/csharp/experimental/musicskill/Responses/Main/MainResponses.cs diff --git a/skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.json b/skills/csharp/experimental/musicskill/Responses/Main/MainResponses.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.json rename to skills/csharp/experimental/musicskill/Responses/Main/MainResponses.json diff --git a/skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.tt b/skills/csharp/experimental/musicskill/Responses/Main/MainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.tt rename to skills/csharp/experimental/musicskill/Responses/Main/MainResponses.tt diff --git a/skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.zh.json b/skills/csharp/experimental/musicskill/Responses/Main/MainResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Main/MainResponses.zh.json rename to skills/csharp/experimental/musicskill/Responses/Main/MainResponses.zh.json diff --git a/skills/src/csharp/experimental/musicskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/musicskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/musicskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.cs b/skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.cs rename to skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.cs diff --git a/skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.json b/skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.json rename to skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.json diff --git a/skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.tt b/skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.tt rename to skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.tt diff --git a/skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.zh.json b/skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/Responses/Shared/SharedResponses.zh.json rename to skills/csharp/experimental/musicskill/Responses/Shared/SharedResponses.zh.json diff --git a/skills/src/csharp/experimental/musicskill/Services/BotServices.cs b/skills/csharp/experimental/musicskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Services/BotServices.cs rename to skills/csharp/experimental/musicskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/musicskill/Services/BotSettings.cs b/skills/csharp/experimental/musicskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Services/BotSettings.cs rename to skills/csharp/experimental/musicskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/musicskill/Services/GeneralLuis.cs b/skills/csharp/experimental/musicskill/Services/GeneralLuis.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Services/GeneralLuis.cs rename to skills/csharp/experimental/musicskill/Services/GeneralLuis.cs diff --git a/skills/src/csharp/experimental/musicskill/Services/MusicSkillLuis.cs b/skills/csharp/experimental/musicskill/Services/MusicSkillLuis.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Services/MusicSkillLuis.cs rename to skills/csharp/experimental/musicskill/Services/MusicSkillLuis.cs diff --git a/skills/src/csharp/experimental/musicskill/Startup.cs b/skills/csharp/experimental/musicskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/musicskill/Startup.cs rename to skills/csharp/experimental/musicskill/Startup.cs diff --git a/skills/src/csharp/experimental/musicskill/appsettings.json b/skills/csharp/experimental/musicskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/appsettings.json rename to skills/csharp/experimental/musicskill/appsettings.json diff --git a/skills/src/csharp/experimental/musicskill/cognitivemodels.json b/skills/csharp/experimental/musicskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/cognitivemodels.json rename to skills/csharp/experimental/musicskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/musicskill/manifestTemplate.json b/skills/csharp/experimental/musicskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/musicskill/manifestTemplate.json rename to skills/csharp/experimental/musicskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/musicskill/readme.md b/skills/csharp/experimental/musicskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/musicskill/readme.md rename to skills/csharp/experimental/musicskill/readme.md diff --git a/skills/src/csharp/experimental/musicskill/wwwroot/default.htm b/skills/csharp/experimental/musicskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/musicskill/wwwroot/default.htm rename to skills/csharp/experimental/musicskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/newsskill/.filenesting.json b/skills/csharp/experimental/newsskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/.filenesting.json rename to skills/csharp/experimental/newsskill/.filenesting.json diff --git a/skills/src/csharp/experimental/newsskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/newsskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/newsskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/newsskill/Adapters/NewsSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/newsskill/Adapters/NewsSkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Adapters/NewsSkillWebSocketBotAdapter.cs rename to skills/csharp/experimental/newsskill/Adapters/NewsSkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/experimental/newsskill/Bots/DialogBot.cs b/skills/csharp/experimental/newsskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Bots/DialogBot.cs rename to skills/csharp/experimental/newsskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/newsskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/newsskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/newsskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/newsskill/Controllers/BotController.cs b/skills/csharp/experimental/newsskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Controllers/BotController.cs rename to skills/csharp/experimental/newsskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/newsskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/newsskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Resources/LU/en/News.lu b/skills/csharp/experimental/newsskill/Deployment/Resources/LU/en/News.lu similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Resources/LU/en/News.lu rename to skills/csharp/experimental/newsskill/Deployment/Resources/LU/en/News.lu diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/newsskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/newsskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Resources/template.json b/skills/csharp/experimental/newsskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Resources/template.json rename to skills/csharp/experimental/newsskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/newsskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/newsskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/newsskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/newsskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/newsskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/newsskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/newsskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/newsskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/newsskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/newsskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/newsskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/newsskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/newsskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/newsskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/newsskill/Dialogs/FavoriteTopicsDialog.cs b/skills/csharp/experimental/newsskill/Dialogs/FavoriteTopicsDialog.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Dialogs/FavoriteTopicsDialog.cs rename to skills/csharp/experimental/newsskill/Dialogs/FavoriteTopicsDialog.cs diff --git a/skills/src/csharp/experimental/newsskill/Dialogs/FindArticlesDialog.cs b/skills/csharp/experimental/newsskill/Dialogs/FindArticlesDialog.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Dialogs/FindArticlesDialog.cs rename to skills/csharp/experimental/newsskill/Dialogs/FindArticlesDialog.cs diff --git a/skills/src/csharp/experimental/newsskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/newsskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/newsskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/newsskill/Dialogs/NewsDialogBase.cs b/skills/csharp/experimental/newsskill/Dialogs/NewsDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Dialogs/NewsDialogBase.cs rename to skills/csharp/experimental/newsskill/Dialogs/NewsDialogBase.cs diff --git a/skills/src/csharp/experimental/newsskill/Dialogs/TrendingArticlesDialog.cs b/skills/csharp/experimental/newsskill/Dialogs/TrendingArticlesDialog.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Dialogs/TrendingArticlesDialog.cs rename to skills/csharp/experimental/newsskill/Dialogs/TrendingArticlesDialog.cs diff --git a/skills/src/csharp/experimental/newsskill/Models/AzureMaps/SearchAddress.cs b/skills/csharp/experimental/newsskill/Models/AzureMaps/SearchAddress.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Models/AzureMaps/SearchAddress.cs rename to skills/csharp/experimental/newsskill/Models/AzureMaps/SearchAddress.cs diff --git a/skills/src/csharp/experimental/newsskill/Models/AzureMaps/SearchResult.cs b/skills/csharp/experimental/newsskill/Models/AzureMaps/SearchResult.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Models/AzureMaps/SearchResult.cs rename to skills/csharp/experimental/newsskill/Models/AzureMaps/SearchResult.cs diff --git a/skills/src/csharp/experimental/newsskill/Models/AzureMaps/SearchResultSet.cs b/skills/csharp/experimental/newsskill/Models/AzureMaps/SearchResultSet.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Models/AzureMaps/SearchResultSet.cs rename to skills/csharp/experimental/newsskill/Models/AzureMaps/SearchResultSet.cs diff --git a/skills/src/csharp/experimental/newsskill/Models/NewsSkillState.cs b/skills/csharp/experimental/newsskill/Models/NewsSkillState.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Models/NewsSkillState.cs rename to skills/csharp/experimental/newsskill/Models/NewsSkillState.cs diff --git a/skills/src/csharp/experimental/newsskill/Models/NewsSkillUserState.cs b/skills/csharp/experimental/newsskill/Models/NewsSkillUserState.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Models/NewsSkillUserState.cs rename to skills/csharp/experimental/newsskill/Models/NewsSkillUserState.cs diff --git a/skills/src/csharp/experimental/newsskill/Models/OAuthConnection.cs b/skills/csharp/experimental/newsskill/Models/OAuthConnection.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Models/OAuthConnection.cs rename to skills/csharp/experimental/newsskill/Models/OAuthConnection.cs diff --git a/skills/src/csharp/experimental/newsskill/NewsSkill.csproj b/skills/csharp/experimental/newsskill/NewsSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/newsskill/NewsSkill.csproj rename to skills/csharp/experimental/newsskill/NewsSkill.csproj diff --git a/skills/src/csharp/experimental/newsskill/NewsSkill.sln b/skills/csharp/experimental/newsskill/NewsSkill.sln similarity index 100% rename from skills/src/csharp/experimental/newsskill/NewsSkill.sln rename to skills/csharp/experimental/newsskill/NewsSkill.sln diff --git a/skills/src/csharp/experimental/newsskill/Program.cs b/skills/csharp/experimental/newsskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Program.cs rename to skills/csharp/experimental/newsskill/Program.cs diff --git a/skills/src/csharp/experimental/newsskill/Properties/launchSettings.json b/skills/csharp/experimental/newsskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/Properties/launchSettings.json rename to skills/csharp/experimental/newsskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/newsskill/Responses/FavoriteTopics/FavoriteTopicsResponses.cs b/skills/csharp/experimental/newsskill/Responses/FavoriteTopics/FavoriteTopicsResponses.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/FavoriteTopics/FavoriteTopicsResponses.cs rename to skills/csharp/experimental/newsskill/Responses/FavoriteTopics/FavoriteTopicsResponses.cs diff --git a/skills/src/csharp/experimental/newsskill/Responses/FindArticles/FindArticlesResponses.cs b/skills/csharp/experimental/newsskill/Responses/FindArticles/FindArticlesResponses.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/FindArticles/FindArticlesResponses.cs rename to skills/csharp/experimental/newsskill/Responses/FindArticles/FindArticlesResponses.cs diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainResponses.cs b/skills/csharp/experimental/newsskill/Responses/Main/MainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainResponses.cs rename to skills/csharp/experimental/newsskill/Responses/Main/MainResponses.cs diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.Designer.cs b/skills/csharp/experimental/newsskill/Responses/Main/MainStrings.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.Designer.cs rename to skills/csharp/experimental/newsskill/Responses/Main/MainStrings.Designer.cs diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.de.resx b/skills/csharp/experimental/newsskill/Responses/Main/MainStrings.de.resx similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.de.resx rename to skills/csharp/experimental/newsskill/Responses/Main/MainStrings.de.resx diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.es.resx b/skills/csharp/experimental/newsskill/Responses/Main/MainStrings.es.resx similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.es.resx rename to skills/csharp/experimental/newsskill/Responses/Main/MainStrings.es.resx diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.fr.resx b/skills/csharp/experimental/newsskill/Responses/Main/MainStrings.fr.resx similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.fr.resx rename to skills/csharp/experimental/newsskill/Responses/Main/MainStrings.fr.resx diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.it.resx b/skills/csharp/experimental/newsskill/Responses/Main/MainStrings.it.resx similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.it.resx rename to skills/csharp/experimental/newsskill/Responses/Main/MainStrings.it.resx diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.resx b/skills/csharp/experimental/newsskill/Responses/Main/MainStrings.resx similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.resx rename to skills/csharp/experimental/newsskill/Responses/Main/MainStrings.resx diff --git a/skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.zh.resx b/skills/csharp/experimental/newsskill/Responses/Main/MainStrings.zh.resx similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/Main/MainStrings.zh.resx rename to skills/csharp/experimental/newsskill/Responses/Main/MainStrings.zh.resx diff --git a/skills/src/csharp/experimental/newsskill/Responses/TrendingArticles/TrendingArticlesResponses.cs b/skills/csharp/experimental/newsskill/Responses/TrendingArticles/TrendingArticlesResponses.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Responses/TrendingArticles/TrendingArticlesResponses.cs rename to skills/csharp/experimental/newsskill/Responses/TrendingArticles/TrendingArticlesResponses.cs diff --git a/skills/src/csharp/experimental/newsskill/Services/AzureMapsService.cs b/skills/csharp/experimental/newsskill/Services/AzureMapsService.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Services/AzureMapsService.cs rename to skills/csharp/experimental/newsskill/Services/AzureMapsService.cs diff --git a/skills/src/csharp/experimental/newsskill/Services/BotServices.cs b/skills/csharp/experimental/newsskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Services/BotServices.cs rename to skills/csharp/experimental/newsskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/newsskill/Services/BotSettings.cs b/skills/csharp/experimental/newsskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Services/BotSettings.cs rename to skills/csharp/experimental/newsskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/newsskill/Services/NewsClient.cs b/skills/csharp/experimental/newsskill/Services/NewsClient.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Services/NewsClient.cs rename to skills/csharp/experimental/newsskill/Services/NewsClient.cs diff --git a/skills/src/csharp/experimental/newsskill/Services/NewsLuis.cs b/skills/csharp/experimental/newsskill/Services/NewsLuis.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Services/NewsLuis.cs rename to skills/csharp/experimental/newsskill/Services/NewsLuis.cs diff --git a/skills/src/csharp/experimental/newsskill/Startup.cs b/skills/csharp/experimental/newsskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/newsskill/Startup.cs rename to skills/csharp/experimental/newsskill/Startup.cs diff --git a/skills/src/csharp/experimental/newsskill/appsettings.json b/skills/csharp/experimental/newsskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/appsettings.json rename to skills/csharp/experimental/newsskill/appsettings.json diff --git a/skills/src/csharp/experimental/newsskill/cognitivemodels.json b/skills/csharp/experimental/newsskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/cognitivemodels.json rename to skills/csharp/experimental/newsskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/newsskill/manifestTemplate.json b/skills/csharp/experimental/newsskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/newsskill/manifestTemplate.json rename to skills/csharp/experimental/newsskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/newsskill/readme.md b/skills/csharp/experimental/newsskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/newsskill/readme.md rename to skills/csharp/experimental/newsskill/readme.md diff --git a/skills/src/csharp/experimental/newsskill/wwwroot/default.htm b/skills/csharp/experimental/newsskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/newsskill/wwwroot/default.htm rename to skills/csharp/experimental/newsskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/phoneskill/.filenesting.json b/skills/csharp/experimental/phoneskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/.filenesting.json rename to skills/csharp/experimental/phoneskill/.filenesting.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/phoneskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/phoneskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Adapters/PhoneSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/phoneskill/Adapters/PhoneSkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Adapters/PhoneSkillWebSocketBotAdapter.cs rename to skills/csharp/experimental/phoneskill/Adapters/PhoneSkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Bots/DialogBot.cs b/skills/csharp/experimental/phoneskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Bots/DialogBot.cs rename to skills/csharp/experimental/phoneskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Common/ContactDeduplicator.cs b/skills/csharp/experimental/phoneskill/Common/ContactDeduplicator.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Common/ContactDeduplicator.cs rename to skills/csharp/experimental/phoneskill/Common/ContactDeduplicator.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Common/ContactFilter.cs b/skills/csharp/experimental/phoneskill/Common/ContactFilter.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Common/ContactFilter.cs rename to skills/csharp/experimental/phoneskill/Common/ContactFilter.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Common/IContactProvider.cs b/skills/csharp/experimental/phoneskill/Common/IContactProvider.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Common/IContactProvider.cs rename to skills/csharp/experimental/phoneskill/Common/IContactProvider.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Common/ToStringExtensions.cs b/skills/csharp/experimental/phoneskill/Common/ToStringExtensions.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Common/ToStringExtensions.cs rename to skills/csharp/experimental/phoneskill/Common/ToStringExtensions.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/phoneskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/phoneskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Controllers/BotController.cs b/skills/csharp/experimental/phoneskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Controllers/BotController.cs rename to skills/csharp/experimental/phoneskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/contactSelection.lu b/skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/contactSelection.lu similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/contactSelection.lu rename to skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/contactSelection.lu diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/general.lu b/skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/general.lu similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/general.lu rename to skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/general.lu diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/phone.lu b/skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/phone.lu similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/phone.lu rename to skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/phone.lu diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/phoneNumberSelection.lu b/skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/phoneNumberSelection.lu similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/LU/en/phoneNumberSelection.lu rename to skills/csharp/experimental/phoneskill/Deployment/Resources/LU/en/phoneNumberSelection.lu diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/phoneskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/phoneskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/template.json b/skills/csharp/experimental/phoneskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Resources/template.json rename to skills/csharp/experimental/phoneskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/phoneskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/phoneskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/phoneskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/phoneskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/phoneskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/phoneskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/phoneskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/phoneskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/phoneskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/phoneskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/phoneskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/phoneskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/phoneskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/phoneskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Dialogs/OutgoingCallDialog.cs b/skills/csharp/experimental/phoneskill/Dialogs/OutgoingCallDialog.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Dialogs/OutgoingCallDialog.cs rename to skills/csharp/experimental/phoneskill/Dialogs/OutgoingCallDialog.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Dialogs/PhoneSkillDialogBase.cs b/skills/csharp/experimental/phoneskill/Dialogs/PhoneSkillDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Dialogs/PhoneSkillDialogBase.cs rename to skills/csharp/experimental/phoneskill/Dialogs/PhoneSkillDialogBase.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/ContactCandidate.cs b/skills/csharp/experimental/phoneskill/Models/ContactCandidate.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/ContactCandidate.cs rename to skills/csharp/experimental/phoneskill/Models/ContactCandidate.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/ContactSearchResult.cs b/skills/csharp/experimental/phoneskill/Models/ContactSearchResult.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/ContactSearchResult.cs rename to skills/csharp/experimental/phoneskill/Models/ContactSearchResult.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/ContactSource.cs b/skills/csharp/experimental/phoneskill/Models/ContactSource.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/ContactSource.cs rename to skills/csharp/experimental/phoneskill/Models/ContactSource.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/OutgoingCall.cs b/skills/csharp/experimental/phoneskill/Models/OutgoingCall.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/OutgoingCall.cs rename to skills/csharp/experimental/phoneskill/Models/OutgoingCall.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneNumber.cs b/skills/csharp/experimental/phoneskill/Models/PhoneNumber.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneNumber.cs rename to skills/csharp/experimental/phoneskill/Models/PhoneNumber.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneNumberType.cs b/skills/csharp/experimental/phoneskill/Models/PhoneNumberType.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneNumberType.cs rename to skills/csharp/experimental/phoneskill/Models/PhoneNumberType.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneSkillDialogOptions.cs b/skills/csharp/experimental/phoneskill/Models/PhoneSkillDialogOptions.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneSkillDialogOptions.cs rename to skills/csharp/experimental/phoneskill/Models/PhoneSkillDialogOptions.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneSkillState.cs b/skills/csharp/experimental/phoneskill/Models/PhoneSkillState.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Models/PhoneSkillState.cs rename to skills/csharp/experimental/phoneskill/Models/PhoneSkillState.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/PhoneSkill.csproj b/skills/csharp/experimental/phoneskill/PhoneSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/PhoneSkill.csproj rename to skills/csharp/experimental/phoneskill/PhoneSkill.csproj diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Program.cs b/skills/csharp/experimental/phoneskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Program.cs rename to skills/csharp/experimental/phoneskill/Program.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Properties/launchSettings.json b/skills/csharp/experimental/phoneskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Properties/launchSettings.json rename to skills/csharp/experimental/phoneskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Main/PhoneMainResponses.cs b/skills/csharp/experimental/phoneskill/Responses/Main/PhoneMainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Main/PhoneMainResponses.cs rename to skills/csharp/experimental/phoneskill/Responses/Main/PhoneMainResponses.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Main/PhoneMainResponses.json b/skills/csharp/experimental/phoneskill/Responses/Main/PhoneMainResponses.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Main/PhoneMainResponses.json rename to skills/csharp/experimental/phoneskill/Responses/Main/PhoneMainResponses.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Main/PhoneMainResponses.tt b/skills/csharp/experimental/phoneskill/Responses/Main/PhoneMainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Main/PhoneMainResponses.tt rename to skills/csharp/experimental/phoneskill/Responses/Main/PhoneMainResponses.tt diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.cs b/skills/csharp/experimental/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.cs rename to skills/csharp/experimental/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.json b/skills/csharp/experimental/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.json rename to skills/csharp/experimental/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.tt b/skills/csharp/experimental/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.tt similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.tt rename to skills/csharp/experimental/phoneskill/Responses/OutgoingCall/OutgoingCallResponses.tt diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/PhoneSharedResponses.cs b/skills/csharp/experimental/phoneskill/Responses/Shared/PhoneSharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/PhoneSharedResponses.cs rename to skills/csharp/experimental/phoneskill/Responses/Shared/PhoneSharedResponses.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/PhoneSharedResponses.json b/skills/csharp/experimental/phoneskill/Responses/Shared/PhoneSharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/PhoneSharedResponses.json rename to skills/csharp/experimental/phoneskill/Responses/Shared/PhoneSharedResponses.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/PhoneSharedResponses.tt b/skills/csharp/experimental/phoneskill/Responses/Shared/PhoneSharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/PhoneSharedResponses.tt rename to skills/csharp/experimental/phoneskill/Responses/Shared/PhoneSharedResponses.tt diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/phoneskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/phoneskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/BotServices.cs b/skills/csharp/experimental/phoneskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/BotServices.cs rename to skills/csharp/experimental/phoneskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/BotSettings.cs b/skills/csharp/experimental/phoneskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/BotSettings.cs rename to skills/csharp/experimental/phoneskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/GoogleAPI/GoogleClient.cs b/skills/csharp/experimental/phoneskill/Services/GoogleAPI/GoogleClient.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/GoogleAPI/GoogleClient.cs rename to skills/csharp/experimental/phoneskill/Services/GoogleAPI/GoogleClient.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/GoogleAPI/GoogleContactProvider.cs b/skills/csharp/experimental/phoneskill/Services/GoogleAPI/GoogleContactProvider.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/GoogleAPI/GoogleContactProvider.cs rename to skills/csharp/experimental/phoneskill/Services/GoogleAPI/GoogleContactProvider.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/IServiceManager.cs b/skills/csharp/experimental/phoneskill/Services/IServiceManager.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/IServiceManager.cs rename to skills/csharp/experimental/phoneskill/Services/IServiceManager.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/Luis/ContactSelectionLuis.cs b/skills/csharp/experimental/phoneskill/Services/Luis/ContactSelectionLuis.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/Luis/ContactSelectionLuis.cs rename to skills/csharp/experimental/phoneskill/Services/Luis/ContactSelectionLuis.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/Luis/PhoneLuis.cs b/skills/csharp/experimental/phoneskill/Services/Luis/PhoneLuis.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/Luis/PhoneLuis.cs rename to skills/csharp/experimental/phoneskill/Services/Luis/PhoneLuis.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/Luis/PhoneNumberSelectionLuis.cs b/skills/csharp/experimental/phoneskill/Services/Luis/PhoneNumberSelectionLuis.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/Luis/PhoneNumberSelectionLuis.cs rename to skills/csharp/experimental/phoneskill/Services/Luis/PhoneNumberSelectionLuis.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/MSGraphAPI/GraphClient.cs b/skills/csharp/experimental/phoneskill/Services/MSGraphAPI/GraphClient.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/MSGraphAPI/GraphClient.cs rename to skills/csharp/experimental/phoneskill/Services/MSGraphAPI/GraphClient.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/MSGraphAPI/GraphContactProvider.cs b/skills/csharp/experimental/phoneskill/Services/MSGraphAPI/GraphContactProvider.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/MSGraphAPI/GraphContactProvider.cs rename to skills/csharp/experimental/phoneskill/Services/MSGraphAPI/GraphContactProvider.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Services/ServiceManager.cs b/skills/csharp/experimental/phoneskill/Services/ServiceManager.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Services/ServiceManager.cs rename to skills/csharp/experimental/phoneskill/Services/ServiceManager.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/SkillUserState.cs b/skills/csharp/experimental/phoneskill/SkillUserState.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/SkillUserState.cs rename to skills/csharp/experimental/phoneskill/SkillUserState.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/Startup.cs b/skills/csharp/experimental/phoneskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/Startup.cs rename to skills/csharp/experimental/phoneskill/Startup.cs diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/appsettings.json b/skills/csharp/experimental/phoneskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/appsettings.json rename to skills/csharp/experimental/phoneskill/appsettings.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/cognitivemodels.json b/skills/csharp/experimental/phoneskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/cognitivemodels.json rename to skills/csharp/experimental/phoneskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/manifestTemplate.json b/skills/csharp/experimental/phoneskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/manifestTemplate.json rename to skills/csharp/experimental/phoneskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/readme.md b/skills/csharp/experimental/phoneskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/readme.md rename to skills/csharp/experimental/phoneskill/readme.md diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/wwwroot/default.htm b/skills/csharp/experimental/phoneskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/wwwroot/default.htm rename to skills/csharp/experimental/phoneskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/phoneskill/phoneskill/.filenesting.json b/skills/csharp/experimental/restaurantbookingskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskill/.filenesting.json rename to skills/csharp/experimental/restaurantbookingskill/.filenesting.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/restaurantbookingskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/restaurantbookingskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Adapters/RestaurantSkillWebSocketBotAdapter.cs b/skills/csharp/experimental/restaurantbookingskill/Adapters/RestaurantSkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Adapters/RestaurantSkillWebSocketBotAdapter.cs rename to skills/csharp/experimental/restaurantbookingskill/Adapters/RestaurantSkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Bots/DialogBot.cs b/skills/csharp/experimental/restaurantbookingskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Bots/DialogBot.cs rename to skills/csharp/experimental/restaurantbookingskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/restaurantbookingskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/restaurantbookingskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.1.0.json b/skills/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.1.0.json rename to skills/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.1.0.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.json b/skills/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.json rename to skills/csharp/experimental/restaurantbookingskill/Content/CuisineChoiceCard.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmCard.json b/skills/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmCard.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmCard.json rename to skills/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmCard.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmationCard.json b/skills/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmationCard.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmationCard.json rename to skills/csharp/experimental/restaurantbookingskill/Content/ReservationConfirmationCard.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.1.0.json b/skills/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.1.0.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.1.0.json rename to skills/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.1.0.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.json b/skills/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.json rename to skills/csharp/experimental/restaurantbookingskill/Content/RestaurantChoiceCard.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.Designer.cs b/skills/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.Designer.cs rename to skills/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.Designer.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.resx b/skills/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.resx rename to skills/csharp/experimental/restaurantbookingskill/Content/RestaurantImages.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Controllers/BotController.cs b/skills/csharp/experimental/restaurantbookingskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Controllers/BotController.cs rename to skills/csharp/experimental/restaurantbookingskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Data/SeedReservationSampleData.cs b/skills/csharp/experimental/restaurantbookingskill/Data/SeedReservationSampleData.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Data/SeedReservationSampleData.cs rename to skills/csharp/experimental/restaurantbookingskill/Data/SeedReservationSampleData.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/General.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/General.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/General.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/General.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/Restaurant.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/Restaurant.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/Restaurant.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/de/Restaurant.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/Restaurant.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/Restaurant.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/Restaurant.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/en/Restaurant.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/General.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/General.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/General.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/General.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/Restaurant.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/Restaurant.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/Restaurant.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/es/Restaurant.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/General.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/General.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/General.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/General.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/Restaurant.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/Restaurant.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/Restaurant.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/fr/Restaurant.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/General.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/General.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/General.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/General.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/Restaurant.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/Restaurant.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/Restaurant.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/it/Restaurant.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/Restaurant.lu b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/Restaurant.lu similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/Restaurant.lu rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/LU/zh/Restaurant.lu diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/template.json b/skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Resources/template.json rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/restaurantbookingskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Dialogs/BookingDialog.cs b/skills/csharp/experimental/restaurantbookingskill/Dialogs/BookingDialog.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Dialogs/BookingDialog.cs rename to skills/csharp/experimental/restaurantbookingskill/Dialogs/BookingDialog.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Dialogs/CancelDialog.cs b/skills/csharp/experimental/restaurantbookingskill/Dialogs/CancelDialog.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Dialogs/CancelDialog.cs rename to skills/csharp/experimental/restaurantbookingskill/Dialogs/CancelDialog.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/restaurantbookingskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/restaurantbookingskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Dialogs/SkillDialogBase.cs b/skills/csharp/experimental/restaurantbookingskill/Dialogs/SkillDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Dialogs/SkillDialogBase.cs rename to skills/csharp/experimental/restaurantbookingskill/Dialogs/SkillDialogBase.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/Booking.cs b/skills/csharp/experimental/restaurantbookingskill/Models/Booking.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/Booking.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/Booking.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/BookingPlace.cs b/skills/csharp/experimental/restaurantbookingskill/Models/BookingPlace.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/BookingPlace.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/BookingPlace.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/CusineChoiceCardData.cs b/skills/csharp/experimental/restaurantbookingskill/Models/CusineChoiceCardData.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/CusineChoiceCardData.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/CusineChoiceCardData.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/FoodTypeInfo.cs b/skills/csharp/experimental/restaurantbookingskill/Models/FoodTypeInfo.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/FoodTypeInfo.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/FoodTypeInfo.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/ListItemData.cs b/skills/csharp/experimental/restaurantbookingskill/Models/ListItemData.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/ListItemData.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/ListItemData.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/LuisEntities.cs b/skills/csharp/experimental/restaurantbookingskill/Models/LuisEntities.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/LuisEntities.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/LuisEntities.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/Meeting.cs b/skills/csharp/experimental/restaurantbookingskill/Models/Meeting.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/Meeting.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/Meeting.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/OAuthConnection.cs b/skills/csharp/experimental/restaurantbookingskill/Models/OAuthConnection.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/OAuthConnection.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/OAuthConnection.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/ReservationBooking.cs b/skills/csharp/experimental/restaurantbookingskill/Models/ReservationBooking.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/ReservationBooking.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/ReservationBooking.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmCard.cs b/skills/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmCard.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmCard.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmCard.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmationData.cs b/skills/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmationData.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmationData.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/ReservationConfirmationData.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/RestaurantBookingState.cs b/skills/csharp/experimental/restaurantbookingskill/Models/RestaurantBookingState.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/RestaurantBookingState.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/RestaurantBookingState.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/RestaurantChoiceCardData.cs b/skills/csharp/experimental/restaurantbookingskill/Models/RestaurantChoiceCardData.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/RestaurantChoiceCardData.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/RestaurantChoiceCardData.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/SkillUserState.cs b/skills/csharp/experimental/restaurantbookingskill/Models/SkillUserState.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/SkillUserState.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/SkillUserState.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Models/TitleImageTextCardData.cs b/skills/csharp/experimental/restaurantbookingskill/Models/TitleImageTextCardData.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Models/TitleImageTextCardData.cs rename to skills/csharp/experimental/restaurantbookingskill/Models/TitleImageTextCardData.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Program.cs b/skills/csharp/experimental/restaurantbookingskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Program.cs rename to skills/csharp/experimental/restaurantbookingskill/Program.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Properties/launchSettings.json b/skills/csharp/experimental/restaurantbookingskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Properties/launchSettings.json rename to skills/csharp/experimental/restaurantbookingskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelResponses.cs b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelResponses.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelResponses.cs rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelResponses.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.Designer.cs b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.Designer.cs rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.Designer.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.de.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.de.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.de.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.de.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.es.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.es.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.es.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.es.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.fr.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.fr.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.fr.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.fr.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.it.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.it.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.it.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.it.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.zh.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.zh.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.zh.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Cancel/CancelStrings.zh.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.cs b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.cs rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.de.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.de.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.de.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.es.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.es.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.es.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.fr.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.fr.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.fr.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.it.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.it.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.it.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.tt b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.tt rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.tt diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.zh.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.zh.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Main/RestaurantBookingMainResponses.zh.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.Designer.cs b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.Designer.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.Designer.cs rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.Designer.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.de.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.de.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.de.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.de.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.es.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.es.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.es.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.es.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.fr.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.fr.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.fr.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.fr.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.it.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.it.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.it.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.it.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.zh.resx b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.zh.resx similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.zh.resx rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/BotStrings.zh.resx diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.cs b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.cs rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.de.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.de.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.de.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.es.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.es.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.es.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.fr.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.fr.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.fr.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.it.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.it.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.it.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.tt b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.tt rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.tt diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.zh.json b/skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.zh.json rename to skills/csharp/experimental/restaurantbookingskill/Responses/Shared/RestaurantBookingSharedResponses.zh.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/RestaurantBookingSkill.csproj b/skills/csharp/experimental/restaurantbookingskill/RestaurantBookingSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/RestaurantBookingSkill.csproj rename to skills/csharp/experimental/restaurantbookingskill/RestaurantBookingSkill.csproj diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Services/BotServices.cs b/skills/csharp/experimental/restaurantbookingskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Services/BotServices.cs rename to skills/csharp/experimental/restaurantbookingskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Services/BotSettings.cs b/skills/csharp/experimental/restaurantbookingskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Services/BotSettings.cs rename to skills/csharp/experimental/restaurantbookingskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Services/ReservationLuis.cs b/skills/csharp/experimental/restaurantbookingskill/Services/ReservationLuis.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Services/ReservationLuis.cs rename to skills/csharp/experimental/restaurantbookingskill/Services/ReservationLuis.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Startup.cs b/skills/csharp/experimental/restaurantbookingskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Startup.cs rename to skills/csharp/experimental/restaurantbookingskill/Startup.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Utilities/Actions.cs b/skills/csharp/experimental/restaurantbookingskill/Utilities/Actions.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Utilities/Actions.cs rename to skills/csharp/experimental/restaurantbookingskill/Utilities/Actions.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Utilities/DateTimeExtensions.cs b/skills/csharp/experimental/restaurantbookingskill/Utilities/DateTimeExtensions.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Utilities/DateTimeExtensions.cs rename to skills/csharp/experimental/restaurantbookingskill/Utilities/DateTimeExtensions.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Utilities/IUrlResolver.cs b/skills/csharp/experimental/restaurantbookingskill/Utilities/IUrlResolver.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Utilities/IUrlResolver.cs rename to skills/csharp/experimental/restaurantbookingskill/Utilities/IUrlResolver.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Utilities/LuisEntityHelper.cs b/skills/csharp/experimental/restaurantbookingskill/Utilities/LuisEntityHelper.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Utilities/LuisEntityHelper.cs rename to skills/csharp/experimental/restaurantbookingskill/Utilities/LuisEntityHelper.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Utilities/MatchName.cs b/skills/csharp/experimental/restaurantbookingskill/Utilities/MatchName.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Utilities/MatchName.cs rename to skills/csharp/experimental/restaurantbookingskill/Utilities/MatchName.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/Utilities/UrlResolver.cs b/skills/csharp/experimental/restaurantbookingskill/Utilities/UrlResolver.cs similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/Utilities/UrlResolver.cs rename to skills/csharp/experimental/restaurantbookingskill/Utilities/UrlResolver.cs diff --git a/skills/src/csharp/experimental/restaurantbookingskill/appsettings.json b/skills/csharp/experimental/restaurantbookingskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/appsettings.json rename to skills/csharp/experimental/restaurantbookingskill/appsettings.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/cognitivemodels.json b/skills/csharp/experimental/restaurantbookingskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/cognitivemodels.json rename to skills/csharp/experimental/restaurantbookingskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/manifestTemplate.json b/skills/csharp/experimental/restaurantbookingskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/manifestTemplate.json rename to skills/csharp/experimental/restaurantbookingskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/restaurantbookingskill/readme.md b/skills/csharp/experimental/restaurantbookingskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/readme.md rename to skills/csharp/experimental/restaurantbookingskill/readme.md diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/bamboo-garden.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/biryani-house.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/biryani-house.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/biryani-house.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/biryani-house.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/chens.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/chens.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/chens.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/chens.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/chinese.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/german.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/german.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/german.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/german.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/indian.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/cuisines/italian.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/euro-bistro.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/euro-bistro.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/euro-bistro.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/euro-bistro.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/german-gourmet.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/german-gourmet.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/german-gourmet.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/german-gourmet.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/kanishka-cuisine.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/maharani-inside.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/maharani-inside.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/maharani-inside.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/maharani-inside.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mamma-mia-pizza.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mandarin.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mandarin.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mandarin.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/mandarin.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/the-bavarian.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/the-bavarian.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/the-bavarian.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/the-bavarian.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tonys.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tonys.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tonys.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tonys.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg b/skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/assets/en/images/restaurants/tuscani-grill.jpg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/wwwroot/default.htm b/skills/csharp/experimental/restaurantbookingskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/wwwroot/default.htm rename to skills/csharp/experimental/restaurantbookingskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/weatherskill/.filenesting.json b/skills/csharp/experimental/weatherskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/.filenesting.json rename to skills/csharp/experimental/weatherskill/.filenesting.json diff --git a/skills/src/csharp/experimental/weatherskill/Adapters/CustomSkillAdapter.cs b/skills/csharp/experimental/weatherskill/Adapters/CustomSkillAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Adapters/CustomSkillAdapter.cs rename to skills/csharp/experimental/weatherskill/Adapters/CustomSkillAdapter.cs diff --git a/skills/src/csharp/experimental/weatherskill/Adapters/DefaultAdapter.cs b/skills/csharp/experimental/weatherskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Adapters/DefaultAdapter.cs rename to skills/csharp/experimental/weatherskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/experimental/weatherskill/Bots/DialogBot.cs b/skills/csharp/experimental/weatherskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Bots/DialogBot.cs rename to skills/csharp/experimental/weatherskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/experimental/weatherskill/Connected Services/Application Insights/ConnectedService.json b/skills/csharp/experimental/weatherskill/Connected Services/Application Insights/ConnectedService.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Connected Services/Application Insights/ConnectedService.json rename to skills/csharp/experimental/weatherskill/Connected Services/Application Insights/ConnectedService.json diff --git a/skills/src/csharp/experimental/weatherskill/Content/SixHourForecast.1.0.json b/skills/csharp/experimental/weatherskill/Content/SixHourForecast.1.0.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Content/SixHourForecast.1.0.json rename to skills/csharp/experimental/weatherskill/Content/SixHourForecast.1.0.json diff --git a/skills/src/csharp/experimental/weatherskill/Content/SixHourForecast.json b/skills/csharp/experimental/weatherskill/Content/SixHourForecast.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Content/SixHourForecast.json rename to skills/csharp/experimental/weatherskill/Content/SixHourForecast.json diff --git a/skills/src/csharp/experimental/weatherskill/Controllers/BotController.cs b/skills/csharp/experimental/weatherskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Controllers/BotController.cs rename to skills/csharp/experimental/weatherskill/Controllers/BotController.cs diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/de/General.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/de/General.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/de/General.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/de/General.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/de/WeatherSkill.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/de/WeatherSkill.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/de/WeatherSkill.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/de/WeatherSkill.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/en/WeatherSkill.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/en/WeatherSkill.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/en/WeatherSkill.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/en/WeatherSkill.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/es/General.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/es/General.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/es/General.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/es/General.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/es/WeatherSkill.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/es/WeatherSkill.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/es/WeatherSkill.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/es/WeatherSkill.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/General.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/General.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/General.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/General.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/WeatherSkill.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/WeatherSkill.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/WeatherSkill.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/fr/WeatherSkill.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/it/General.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/it/General.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/it/General.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/it/General.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/it/WeatherSkill.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/it/WeatherSkill.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/it/WeatherSkill.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/it/WeatherSkill.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/WeatherSkill.lu b/skills/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/WeatherSkill.lu similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/WeatherSkill.lu rename to skills/csharp/experimental/weatherskill/Deployment/Resources/LU/zh/WeatherSkill.lu diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/parameters.template.json b/skills/csharp/experimental/weatherskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/parameters.template.json rename to skills/csharp/experimental/weatherskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Resources/template.json b/skills/csharp/experimental/weatherskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Resources/template.json rename to skills/csharp/experimental/weatherskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/experimental/weatherskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/experimental/weatherskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/experimental/weatherskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/experimental/weatherskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/experimental/weatherskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/experimental/weatherskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Scripts/publish.ps1 b/skills/csharp/experimental/weatherskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/experimental/weatherskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/experimental/weatherskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/experimental/weatherskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/experimental/weatherskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/experimental/weatherskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/experimental/weatherskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/experimental/weatherskill/Dialogs/ForecastDialog.cs b/skills/csharp/experimental/weatherskill/Dialogs/ForecastDialog.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Dialogs/ForecastDialog.cs rename to skills/csharp/experimental/weatherskill/Dialogs/ForecastDialog.cs diff --git a/skills/src/csharp/experimental/weatherskill/Dialogs/MainDialog.cs b/skills/csharp/experimental/weatherskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Dialogs/MainDialog.cs rename to skills/csharp/experimental/weatherskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/experimental/weatherskill/Dialogs/SampleDialog.cs b/skills/csharp/experimental/weatherskill/Dialogs/SampleDialog.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Dialogs/SampleDialog.cs rename to skills/csharp/experimental/weatherskill/Dialogs/SampleDialog.cs diff --git a/skills/src/csharp/experimental/weatherskill/Dialogs/SkillDialogBase.cs b/skills/csharp/experimental/weatherskill/Dialogs/SkillDialogBase.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Dialogs/SkillDialogBase.cs rename to skills/csharp/experimental/weatherskill/Dialogs/SkillDialogBase.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/AdministrativeArea.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/AdministrativeArea.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/AdministrativeArea.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/AdministrativeArea.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Country.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Country.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Country.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Country.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/DailyForecast.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/DailyForecast.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/DailyForecast.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/DailyForecast.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Day.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Day.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Day.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Day.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Direction.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Direction.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Direction.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Direction.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Elevation.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Elevation.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Elevation.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Elevation.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/ForecastResponse.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/ForecastResponse.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/ForecastResponse.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/ForecastResponse.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Geoposition.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Geoposition.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Geoposition.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Geoposition.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Headline.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Headline.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Headline.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Headline.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/HourlyForecast.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/HourlyForecast.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/HourlyForecast.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/HourlyForecast.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Imperial.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Imperial.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Imperial.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Imperial.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Location.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Location.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Location.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Location.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Maximum.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Maximum.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Maximum.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Maximum.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Metric.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Metric.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Metric.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Metric.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Minimum.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Minimum.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Minimum.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Minimum.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Night.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Night.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Night.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Night.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Region.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Region.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Region.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Region.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Speed.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Speed.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Speed.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Speed.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/SupplementalAdminArea.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/SupplementalAdminArea.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/SupplementalAdminArea.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/SupplementalAdminArea.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Temperature.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Temperature.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Temperature.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Temperature.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Timezone.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Timezone.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Timezone.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Timezone.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Accuweather/Wind.cs b/skills/csharp/experimental/weatherskill/Models/Accuweather/Wind.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Accuweather/Wind.cs rename to skills/csharp/experimental/weatherskill/Models/Accuweather/Wind.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Cards/HourDetails.cs b/skills/csharp/experimental/weatherskill/Models/Cards/HourDetails.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Cards/HourDetails.cs rename to skills/csharp/experimental/weatherskill/Models/Cards/HourDetails.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/Cards/SixHourForecastCard.cs b/skills/csharp/experimental/weatherskill/Models/Cards/SixHourForecastCard.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/Cards/SixHourForecastCard.cs rename to skills/csharp/experimental/weatherskill/Models/Cards/SixHourForecastCard.cs diff --git a/skills/src/csharp/experimental/weatherskill/Models/SkillState.cs b/skills/csharp/experimental/weatherskill/Models/SkillState.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Models/SkillState.cs rename to skills/csharp/experimental/weatherskill/Models/SkillState.cs diff --git a/skills/src/csharp/experimental/weatherskill/Program.cs b/skills/csharp/experimental/weatherskill/Program.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Program.cs rename to skills/csharp/experimental/weatherskill/Program.cs diff --git a/skills/src/csharp/experimental/weatherskill/Properties/launchSettings.json b/skills/csharp/experimental/weatherskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Properties/launchSettings.json rename to skills/csharp/experimental/weatherskill/Properties/launchSettings.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.cs b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.cs rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.cs diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.de.json b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.de.json rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.de.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.es.json b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.es.json rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.es.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.fr.json b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.fr.json rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.fr.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.it.json b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.it.json rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.it.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.json b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.json rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.tt b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.tt similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.tt rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.tt diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.zh.json b/skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Main/MainResponses.zh.json rename to skills/csharp/experimental/weatherskill/Responses/Main/MainResponses.zh.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.cs b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.cs rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.cs diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.de.json b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.de.json rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.de.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.es.json b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.es.json rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.es.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.fr.json b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.fr.json rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.fr.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.it.json b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.it.json rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.it.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.json b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.json rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.tt b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.tt similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.tt rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.tt diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.zh.json b/skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.zh.json rename to skills/csharp/experimental/weatherskill/Responses/Sample/SampleResponses.zh.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/experimental/weatherskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/experimental/weatherskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.cs b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.cs rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.cs diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.de.json b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.de.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.de.json rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.de.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.es.json b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.es.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.es.json rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.es.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.fr.json b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.fr.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.fr.json rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.fr.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.it.json b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.it.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.it.json rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.it.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.json b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.json rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.json diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.tt b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.tt similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.tt rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.tt diff --git a/skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.zh.json b/skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.zh.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.zh.json rename to skills/csharp/experimental/weatherskill/Responses/Shared/SharedResponses.zh.json diff --git a/skills/src/csharp/experimental/weatherskill/Services/AccuweatherService.cs b/skills/csharp/experimental/weatherskill/Services/AccuweatherService.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Services/AccuweatherService.cs rename to skills/csharp/experimental/weatherskill/Services/AccuweatherService.cs diff --git a/skills/src/csharp/experimental/weatherskill/Services/BotServices.cs b/skills/csharp/experimental/weatherskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Services/BotServices.cs rename to skills/csharp/experimental/weatherskill/Services/BotServices.cs diff --git a/skills/src/csharp/experimental/weatherskill/Services/BotSettings.cs b/skills/csharp/experimental/weatherskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Services/BotSettings.cs rename to skills/csharp/experimental/weatherskill/Services/BotSettings.cs diff --git a/skills/src/csharp/experimental/weatherskill/Services/GeneralLuis.cs b/skills/csharp/experimental/weatherskill/Services/GeneralLuis.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Services/GeneralLuis.cs rename to skills/csharp/experimental/weatherskill/Services/GeneralLuis.cs diff --git a/skills/src/csharp/experimental/weatherskill/Services/WeatherSkillLuis.cs b/skills/csharp/experimental/weatherskill/Services/WeatherSkillLuis.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Services/WeatherSkillLuis.cs rename to skills/csharp/experimental/weatherskill/Services/WeatherSkillLuis.cs diff --git a/skills/src/csharp/experimental/weatherskill/Startup.cs b/skills/csharp/experimental/weatherskill/Startup.cs similarity index 100% rename from skills/src/csharp/experimental/weatherskill/Startup.cs rename to skills/csharp/experimental/weatherskill/Startup.cs diff --git a/skills/src/csharp/experimental/weatherskill/WeatherSkill.csproj b/skills/csharp/experimental/weatherskill/WeatherSkill.csproj similarity index 100% rename from skills/src/csharp/experimental/weatherskill/WeatherSkill.csproj rename to skills/csharp/experimental/weatherskill/WeatherSkill.csproj diff --git a/skills/src/csharp/experimental/weatherskill/appsettings.json b/skills/csharp/experimental/weatherskill/appsettings.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/appsettings.json rename to skills/csharp/experimental/weatherskill/appsettings.json diff --git a/skills/src/csharp/experimental/weatherskill/cognitivemodels.json b/skills/csharp/experimental/weatherskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/cognitivemodels.json rename to skills/csharp/experimental/weatherskill/cognitivemodels.json diff --git a/skills/src/csharp/experimental/weatherskill/manifestTemplate.json b/skills/csharp/experimental/weatherskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/experimental/weatherskill/manifestTemplate.json rename to skills/csharp/experimental/weatherskill/manifestTemplate.json diff --git a/skills/src/csharp/experimental/weatherskill/readme.md b/skills/csharp/experimental/weatherskill/readme.md similarity index 100% rename from skills/src/csharp/experimental/weatherskill/readme.md rename to skills/csharp/experimental/weatherskill/readme.md diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/default.htm b/skills/csharp/experimental/weatherskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/default.htm rename to skills/csharp/experimental/weatherskill/wwwroot/default.htm diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud.png b/skills/csharp/experimental/weatherskill/wwwroot/images/cloud.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloud.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/cloud.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloud.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud2x.png b/skills/csharp/experimental/weatherskill/wwwroot/images/cloud2x.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud2x.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloud2x.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud2x.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/cloud2x.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloud2x.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloud2x.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudfog.png b/skills/csharp/experimental/weatherskill/wwwroot/images/cloudfog.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudfog.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloudfog.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudfog.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/cloudfog.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudfog.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloudfog.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.png b/skills/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloudmoon.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.png b/skills/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/cloudsunrain.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/lightning.png b/skills/csharp/experimental/weatherskill/wwwroot/images/lightning.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/lightning.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/lightning.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/lightning.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/lightning.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/lightning.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/lightning.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/moonrain.png b/skills/csharp/experimental/weatherskill/wwwroot/images/moonrain.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/moonrain.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/moonrain.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/moonrain.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/moonrain.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/moonrain.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/moonrain.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/nightsnow.png b/skills/csharp/experimental/weatherskill/wwwroot/images/nightsnow.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/nightsnow.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/nightsnow.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/nightsnow.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/nightsnow.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/nightsnow.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/nightsnow.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/rain.png b/skills/csharp/experimental/weatherskill/wwwroot/images/rain.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/rain.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/rain.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/rain.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/rain.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/rain.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/rain.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/rainsnow.png b/skills/csharp/experimental/weatherskill/wwwroot/images/rainsnow.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/rainsnow.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/rainsnow.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/rainsnow.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/rainsnow.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/rainsnow.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/rainsnow.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/sun.png b/skills/csharp/experimental/weatherskill/wwwroot/images/sun.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/sun.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/sun.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/sun.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/sun.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/sun.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/sun.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.png b/skills/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/suncloudhail.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/temperature.png b/skills/csharp/experimental/weatherskill/wwwroot/images/temperature.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/temperature.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/temperature.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/temperature.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/temperature.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/temperature.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/temperature.svg diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/wind.png b/skills/csharp/experimental/weatherskill/wwwroot/images/wind.png similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/wind.png rename to skills/csharp/experimental/weatherskill/wwwroot/images/wind.png diff --git a/skills/src/csharp/experimental/weatherskill/wwwroot/images/wind.svg b/skills/csharp/experimental/weatherskill/wwwroot/images/wind.svg similarity index 100% rename from skills/src/csharp/experimental/weatherskill/wwwroot/images/wind.svg rename to skills/csharp/experimental/weatherskill/wwwroot/images/wind.svg diff --git a/skills/src/csharp/experimental/restaurantbookingskill/.filenesting.json b/skills/csharp/pointofinterestskill/.filenesting.json similarity index 100% rename from skills/src/csharp/experimental/restaurantbookingskill/.filenesting.json rename to skills/csharp/pointofinterestskill/.filenesting.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/DefaultAdapter.cs b/skills/csharp/pointofinterestskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/DefaultAdapter.cs rename to skills/csharp/pointofinterestskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/POISkillWebSocketBotAdapter.cs b/skills/csharp/pointofinterestskill/Adapters/POISkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Adapters/POISkillWebSocketBotAdapter.cs rename to skills/csharp/pointofinterestskill/Adapters/POISkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Bots/DialogBot.cs b/skills/csharp/pointofinterestskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Bots/DialogBot.cs rename to skills/csharp/pointofinterestskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.1.0.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestDetails.1.0.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.1.0.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestDetails.1.0.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestDetails.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetails.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestDetails.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsNoCall.1.0.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsNoCall.1.0.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsNoCall.1.0.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsNoCall.1.0.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsNoCall.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsNoCall.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsNoCall.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsNoCall.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.1.0.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.1.0.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.1.0.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.1.0.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestDetailsWithRoute.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverview.1.0.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestOverview.1.0.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverview.1.0.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestOverview.1.0.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverview.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestOverview.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverview.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestOverview.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverviewContainer.1.0.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestOverviewContainer.1.0.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverviewContainer.1.0.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestOverviewContainer.1.0.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverviewContainer.json b/skills/csharp/pointofinterestskill/Content/PointOfInterestOverviewContainer.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Content/PointOfInterestOverviewContainer.json rename to skills/csharp/pointofinterestskill/Content/PointOfInterestOverviewContainer.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Controllers/BotController.cs b/skills/csharp/pointofinterestskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Controllers/BotController.cs rename to skills/csharp/pointofinterestskill/Controllers/BotController.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/General.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/General.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/General.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/General.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/PointOfInterest.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/PointOfInterest.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/PointOfInterest.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/PointOfInterest.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_parking.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_parking.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_parking.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_parking.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_poi.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_poi.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_poi.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_find_poi.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_get_directions.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_get_directions.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_get_directions.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/de/secondary/poi_navigation_get_directions.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/PointOfInterest.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/PointOfInterest.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/PointOfInterest.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/PointOfInterest.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_parking.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_parking.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_parking.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_parking.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_poi.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_poi.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_poi.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_find_poi.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_get_directions.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_get_directions.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_get_directions.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/en/secondary/poi_navigation_get_directions.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/General.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/General.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/General.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/General.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/PointOfInterest.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/PointOfInterest.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/PointOfInterest.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/PointOfInterest.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_parking.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_parking.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_parking.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_parking.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_poi.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_poi.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_poi.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_find_poi.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_get_directions.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_get_directions.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_get_directions.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/es/secondary/poi_navigation_get_directions.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/General.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/General.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/General.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/General.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/PointOfInterest.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/PointOfInterest.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/PointOfInterest.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/PointOfInterest.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_parking.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_parking.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_parking.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_parking.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_poi.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_poi.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_poi.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_find_poi.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_get_directions.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_get_directions.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_get_directions.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/fr/secondary/poi_navigation_get_directions.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/General.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/General.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/General.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/General.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/PointOfInterest.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/PointOfInterest.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/PointOfInterest.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/PointOfInterest.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_parking.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_parking.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_parking.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_parking.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_poi.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_poi.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_poi.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_find_poi.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_get_directions.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_get_directions.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_get_directions.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/it/secondary/poi_navigation_get_directions.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/PointOfInterest.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/PointOfInterest.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/PointOfInterest.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/PointOfInterest.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_parking.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_parking.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_parking.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_parking.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_poi.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_poi.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_poi.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_find_poi.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_get_directions.lu b/skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_get_directions.lu similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_get_directions.lu rename to skills/csharp/pointofinterestskill/Deployment/Resources/LU/zh/secondary/poi_navigation_get_directions.lu diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/parameters.template.json b/skills/csharp/pointofinterestskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/parameters.template.json rename to skills/csharp/pointofinterestskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/template.json b/skills/csharp/pointofinterestskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Resources/template.json rename to skills/csharp/pointofinterestskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/pointofinterestskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/pointofinterestskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/pointofinterestskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/pointofinterestskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/pointofinterestskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/pointofinterestskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/publish.ps1 b/skills/csharp/pointofinterestskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/pointofinterestskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/pointofinterestskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/pointofinterestskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/pointofinterestskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/pointofinterestskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/CancelRouteDialog.cs b/skills/csharp/pointofinterestskill/Dialogs/CancelRouteDialog.cs similarity index 98% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/CancelRouteDialog.cs rename to skills/csharp/pointofinterestskill/Dialogs/CancelRouteDialog.cs index 97e027cfdf..79257e2544 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/CancelRouteDialog.cs +++ b/skills/csharp/pointofinterestskill/Dialogs/CancelRouteDialog.cs @@ -20,7 +20,7 @@ public CancelRouteDialog( BotSettings settings, BotServices services, ResponseManager responseManager, - ConversationState conversationState, + ConversationState conversationState, IServiceManager serviceManager, IBotTelemetryClient telemetryClient, IHttpContextAccessor httpContext) diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs b/skills/csharp/pointofinterestskill/Dialogs/FindParkingDialog.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs rename to skills/csharp/pointofinterestskill/Dialogs/FindParkingDialog.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs b/skills/csharp/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs similarity index 97% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs rename to skills/csharp/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs index ff2d62dccc..664cfa7774 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs +++ b/skills/csharp/pointofinterestskill/Dialogs/FindPointOfInterestDialog.cs @@ -19,8 +19,8 @@ public FindPointOfInterestDialog( BotSettings settings, BotServices services, ResponseManager responseManager, - ConversationState conversationState, - RouteDialog routeDialog, + ConversationState conversationState, + RouteDialog routeDialog, IServiceManager serviceManager, IBotTelemetryClient telemetryClient, IHttpContextAccessor httpContext) diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/GetDirectionsDialog.cs b/skills/csharp/pointofinterestskill/Dialogs/GetDirectionsDialog.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/GetDirectionsDialog.cs rename to skills/csharp/pointofinterestskill/Dialogs/GetDirectionsDialog.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs b/skills/csharp/pointofinterestskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/MainDialog.cs rename to skills/csharp/pointofinterestskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs b/skills/csharp/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs rename to skills/csharp/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/RouteDialog.cs b/skills/csharp/pointofinterestskill/Dialogs/RouteDialog.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/RouteDialog.cs rename to skills/csharp/pointofinterestskill/Dialogs/RouteDialog.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Address.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/Address.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Address.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/Address.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Classification.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/Classification.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Classification.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/Classification.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/GeocodePoint.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/LatLng.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/LatLng.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/LatLng.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/LatLng.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Name.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/Name.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Name.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/Name.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/PoiInfo.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/PoiInfo.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/PoiInfo.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/PoiInfo.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/RouteDirections.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/RouteDirections.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/RouteDirections.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/RouteDirections.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchAddress.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/SearchAddress.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchAddress.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/SearchAddress.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResult.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/SearchResult.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResult.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/SearchResult.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/SearchResultSet.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Viewport.cs b/skills/csharp/pointofinterestskill/Models/AzureMaps/Viewport.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/AzureMaps/Viewport.cs rename to skills/csharp/pointofinterestskill/Models/AzureMaps/Viewport.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/DirectionsEventResponse.cs b/skills/csharp/pointofinterestskill/Models/DirectionsEventResponse.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/DirectionsEventResponse.cs rename to skills/csharp/pointofinterestskill/Models/DirectionsEventResponse.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Category.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Category.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Category.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Category.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Contact.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Contact.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Contact.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Contact.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Group.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Group.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Group.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Group.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Hours.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Hours.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Hours.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Hours.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Icon.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Icon.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Icon.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Icon.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Item.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Item.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Item.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Item.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Labellatlng.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Labellatlng.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Labellatlng.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Labellatlng.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Location.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Location.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Location.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Location.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Menu.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Menu.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Menu.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Menu.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Photo.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Photo.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Photo.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Photo.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Price.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Price.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Price.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Price.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Provider.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Provider.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Provider.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Provider.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Response.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Response.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Response.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Response.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/RichStatus.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/RichStatus.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/RichStatus.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/RichStatus.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Source.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Source.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Source.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Source.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venue.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Venue.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venue.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Venue.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/VenueResponse.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/VenueResponse.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/VenueResponse.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/VenueResponse.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venuepage.cs b/skills/csharp/pointofinterestskill/Models/Foursquare/Venuepage.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/Foursquare/Venuepage.cs rename to skills/csharp/pointofinterestskill/Models/Foursquare/Venuepage.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/OAuthConnection.cs b/skills/csharp/pointofinterestskill/Models/OAuthConnection.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/OAuthConnection.cs rename to skills/csharp/pointofinterestskill/Models/OAuthConnection.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/OpenDefaultApp.cs b/skills/csharp/pointofinterestskill/Models/OpenDefaultApp.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/OpenDefaultApp.cs rename to skills/csharp/pointofinterestskill/Models/OpenDefaultApp.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointOfInterestSkillState.cs b/skills/csharp/pointofinterestskill/Models/PointOfInterestSkillState.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointOfInterestSkillState.cs rename to skills/csharp/pointofinterestskill/Models/PointOfInterestSkillState.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs b/skills/csharp/pointofinterestskill/Models/PointofInterestModel.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/PointofInterestModel.cs rename to skills/csharp/pointofinterestskill/Models/PointofInterestModel.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/RouteDirectionsModel.cs b/skills/csharp/pointofinterestskill/Models/RouteDirectionsModel.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/RouteDirectionsModel.cs rename to skills/csharp/pointofinterestskill/Models/RouteDirectionsModel.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/UserInformation.cs b/skills/csharp/pointofinterestskill/Models/UserInformation.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Models/UserInformation.cs rename to skills/csharp/pointofinterestskill/Models/UserInformation.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj b/skills/csharp/pointofinterestskill/PointOfInterestSkill.csproj similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj rename to skills/csharp/pointofinterestskill/PointOfInterestSkill.csproj diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Program.cs b/skills/csharp/pointofinterestskill/Program.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Program.cs rename to skills/csharp/pointofinterestskill/Program.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Properties/launchSettings.json b/skills/csharp/pointofinterestskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Properties/launchSettings.json rename to skills/csharp/pointofinterestskill/Properties/launchSettings.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.de.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.es.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.fr.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.it.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.tt diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json b/skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json rename to skills/csharp/pointofinterestskill/Responses/CancelRoute/CancelRouteResponses.zh.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.de.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.es.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.fr.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.it.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.tt diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json b/skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json rename to skills/csharp/pointofinterestskill/Responses/FindPointOfInterest/FindPointOfInterestResponses.zh.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.cs b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.cs rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.de.json b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.de.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.de.json rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.de.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.es.json b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.es.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.es.json rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.es.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.fr.json b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.fr.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.fr.json rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.fr.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.it.json b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.it.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.it.json rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.it.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.json b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.json rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.tt b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.tt similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.tt rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.tt diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.zh.json b/skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.zh.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Main/POIMainResponses.zh.json rename to skills/csharp/pointofinterestskill/Responses/Main/POIMainResponses.zh.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.cs b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.cs rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.de.json b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.de.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.de.json rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.de.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.es.json b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.es.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.es.json rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.es.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.fr.json b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.fr.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.fr.json rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.fr.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.it.json b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.it.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.it.json rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.it.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.json b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.json rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.tt b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.tt similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.tt rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.tt diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.zh.json b/skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.zh.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Route/RouteResponses.zh.json rename to skills/csharp/pointofinterestskill/Responses/Route/RouteResponses.zh.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.cs b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.cs rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.de.json b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.de.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.de.json rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.de.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.es.json b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.es.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.es.json rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.es.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.fr.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.it.json b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.it.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.it.json rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.it.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.json b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.json rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.tt b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.tt similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.tt rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.tt diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json b/skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json rename to skills/csharp/pointofinterestskill/Responses/Shared/POISharedResponses.zh.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs b/skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs rename to skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.Designer.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx b/skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx rename to skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.de.resx diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx b/skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx rename to skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.es.resx diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx b/skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx rename to skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.fr.resx diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx b/skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx rename to skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.it.resx diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx b/skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx rename to skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.resx diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx b/skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx rename to skills/csharp/pointofinterestskill/Responses/Shared/PointOfInterestSharedStrings.zh.resx diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/pointofinterestskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs b/skills/csharp/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs rename to skills/csharp/pointofinterestskill/Services/AzureMapsGeoSpatialService.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotServices.cs b/skills/csharp/pointofinterestskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotServices.cs rename to skills/csharp/pointofinterestskill/Services/BotServices.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotSettings.cs b/skills/csharp/pointofinterestskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/BotSettings.cs rename to skills/csharp/pointofinterestskill/Services/BotSettings.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/FoursquareGeoSpatialService.cs b/skills/csharp/pointofinterestskill/Services/FoursquareGeoSpatialService.cs similarity index 99% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/FoursquareGeoSpatialService.cs rename to skills/csharp/pointofinterestskill/Services/FoursquareGeoSpatialService.cs index 256c3edc94..ce2130d2a8 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/FoursquareGeoSpatialService.cs +++ b/skills/csharp/pointofinterestskill/Services/FoursquareGeoSpatialService.cs @@ -190,7 +190,7 @@ private async Task> GetVenueAsync(string url, string { url = string.Concat(url, $"&client_id={clientId}&client_secret={clientSecret}&v={apiVersion}"); - try + try { var response = await httpClient.GetStringAsync(url); diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/GeoSpatialServiceTypes.cs b/skills/csharp/pointofinterestskill/Services/GeoSpatialServiceTypes.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/GeoSpatialServiceTypes.cs rename to skills/csharp/pointofinterestskill/Services/GeoSpatialServiceTypes.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IGeoSpatialService.cs b/skills/csharp/pointofinterestskill/Services/IGeoSpatialService.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IGeoSpatialService.cs rename to skills/csharp/pointofinterestskill/Services/IGeoSpatialService.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IServiceManager.cs b/skills/csharp/pointofinterestskill/Services/IServiceManager.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/IServiceManager.cs rename to skills/csharp/pointofinterestskill/Services/IServiceManager.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/PointOfInterestLuis.cs b/skills/csharp/pointofinterestskill/Services/PointOfInterestLuis.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/PointOfInterestLuis.cs rename to skills/csharp/pointofinterestskill/Services/PointOfInterestLuis.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceHelper.cs b/skills/csharp/pointofinterestskill/Services/ServiceHelper.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceHelper.cs rename to skills/csharp/pointofinterestskill/Services/ServiceHelper.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceManager.cs b/skills/csharp/pointofinterestskill/Services/ServiceManager.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Services/ServiceManager.cs rename to skills/csharp/pointofinterestskill/Services/ServiceManager.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Startup.cs b/skills/csharp/pointofinterestskill/Startup.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Startup.cs rename to skills/csharp/pointofinterestskill/Startup.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/Actions.cs b/skills/csharp/pointofinterestskill/Utilities/Actions.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/Actions.cs rename to skills/csharp/pointofinterestskill/Utilities/Actions.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/ResponseUtility.cs b/skills/csharp/pointofinterestskill/Utilities/ResponseUtility.cs similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/Utilities/ResponseUtility.cs rename to skills/csharp/pointofinterestskill/Utilities/ResponseUtility.cs diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/appsettings.json b/skills/csharp/pointofinterestskill/appsettings.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/appsettings.json rename to skills/csharp/pointofinterestskill/appsettings.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/cognitivemodels.json b/skills/csharp/pointofinterestskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/cognitivemodels.json rename to skills/csharp/pointofinterestskill/cognitivemodels.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/manifestTemplate.json b/skills/csharp/pointofinterestskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/manifestTemplate.json rename to skills/csharp/pointofinterestskill/manifestTemplate.json diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/readme.md b/skills/csharp/pointofinterestskill/readme.md similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/readme.md rename to skills/csharp/pointofinterestskill/readme.md diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/default.htm b/skills/csharp/pointofinterestskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/default.htm rename to skills/csharp/pointofinterestskill/wwwroot/default.htm diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/background.png b/skills/csharp/pointofinterestskill/wwwroot/images/background.png similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/background.png rename to skills/csharp/pointofinterestskill/wwwroot/images/background.png diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/default_pointofinterest.png b/skills/csharp/pointofinterestskill/wwwroot/images/default_pointofinterest.png similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/default_pointofinterest.png rename to skills/csharp/pointofinterestskill/wwwroot/images/default_pointofinterest.png diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/header_background.png b/skills/csharp/pointofinterestskill/wwwroot/images/header_background.png similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/wwwroot/images/header_background.png rename to skills/csharp/pointofinterestskill/wwwroot/images/header_background.png diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/API/SettingFilterTests.cs b/skills/csharp/tests/automotiveskill.tests/API/SettingFilterTests.cs similarity index 98% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/API/SettingFilterTests.cs rename to skills/csharp/tests/automotiveskill.tests/API/SettingFilterTests.cs index bf1776f55a..f561896581 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/API/SettingFilterTests.cs +++ b/skills/csharp/tests/automotiveskill.tests/API/SettingFilterTests.cs @@ -2,11 +2,11 @@ using System.Linq; using AutomotiveSkill.Dialogs; using AutomotiveSkill.Models; +using AutomotiveSkill.Tests.Flow; using AutomotiveSkill.Utilities; -using AutomotiveSkillTest.Flow; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace AutomotiveSkillTest.API +namespace AutomotiveSkill.Tests.API { [TestClass] public class SettingFilterTests : AutomotiveSkillTestBase diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj b/skills/csharp/tests/automotiveskill.tests/AutomotiveSkill.Tests.csproj similarity index 90% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj rename to skills/csharp/tests/automotiveskill.tests/AutomotiveSkill.Tests.csproj index 24c5937b9f..d125a26a3b 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj +++ b/skills/csharp/tests/automotiveskill.tests/AutomotiveSkill.Tests.csproj @@ -24,7 +24,7 @@ - + diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/AutomotiveSkillTestBase.cs b/skills/csharp/tests/automotiveskill.tests/Flow/AutomotiveSkillTestBase.cs similarity index 95% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/AutomotiveSkillTestBase.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/AutomotiveSkillTestBase.cs index 48bbff7b66..eac6c0ed65 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/AutomotiveSkillTestBase.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/AutomotiveSkillTestBase.cs @@ -7,7 +7,7 @@ using AutomotiveSkill.Responses.Shared; using AutomotiveSkill.Responses.VehicleSettings; using AutomotiveSkill.Services; -using AutomotiveSkillTest.Flow.Fakes; +using AutomotiveSkill.Tests.Flow.Fakes; using Microsoft.AspNetCore.Http; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.Adapters; @@ -20,7 +20,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace AutomotiveSkillTest.Flow +namespace AutomotiveSkill.Tests.Flow { public class AutomotiveSkillTestBase : BotTestBase { @@ -76,8 +76,8 @@ public override void Initialize() Services.AddSingleton(); Services.AddSingleton(); Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient>(); + Services.AddTransient(); + Services.AddTransient>(); // Mock HttpContext for image path resolution var mockHttpContext = new DefaultHttpContext(); diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockGeneralIntent.cs b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockGeneralIntent.cs similarity index 93% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockGeneralIntent.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockGeneralIntent.cs index 1772a71758..9608180ed3 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockGeneralIntent.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockGeneralIntent.cs @@ -1,6 +1,6 @@ using Luis; -namespace AutomotiveSkillTest.Flow.Fakes +namespace AutomotiveSkill.Tests.Flow.Fakes { public class MockGeneralIntent : General { diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockLuisRecognizer.cs b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockLuisRecognizer.cs similarity index 98% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockLuisRecognizer.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockLuisRecognizer.cs index b301c77a3d..5a13cfef42 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockLuisRecognizer.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockLuisRecognizer.cs @@ -7,7 +7,7 @@ using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Dialogs; -namespace AutomotiveSkillTest.Flow.Fakes +namespace AutomotiveSkill.Tests.Flow.Fakes { public class MockLuisRecognizer : ITelemetryRecognizer { diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsIntent.cs b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsIntent.cs similarity index 99% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsIntent.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsIntent.cs index eb168d1f86..841733443c 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsIntent.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsIntent.cs @@ -3,7 +3,7 @@ using Luis; using Microsoft.Bot.Builder; -namespace AutomotiveSkillTest.Flow.Fakes +namespace AutomotiveSkill.Tests.Flow.Fakes { public class MockVehicleSettingsIntent : SettingsLuis { diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsNameIntent.cs b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsNameIntent.cs similarity index 97% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsNameIntent.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsNameIntent.cs index e0ba249080..2a76ef7998 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsNameIntent.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsNameIntent.cs @@ -3,7 +3,7 @@ using Luis; using Microsoft.Bot.Builder; -namespace AutomotiveSkillTest.Flow.Fakes +namespace AutomotiveSkill.Tests.Flow.Fakes { public class MockVehicleSettingsNameIntent : SettingsNameLuis { diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsValueIntent.cs b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsValueIntent.cs similarity index 96% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsValueIntent.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsValueIntent.cs index d8eda19e21..dbc16663be 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/Fakes/MockVehicleSettingsValueIntent.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/Fakes/MockVehicleSettingsValueIntent.cs @@ -3,7 +3,7 @@ using Luis; using Microsoft.Bot.Builder; -namespace AutomotiveSkillTest.Flow.Fakes +namespace AutomotiveSkill.Tests.Flow.Fakes { public class MockVehicleSettingsValueIntent : SettingsValueLuis { diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/GeneralSkillFlowTests.cs b/skills/csharp/tests/automotiveskill.tests/Flow/GeneralSkillFlowTests.cs similarity index 95% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/GeneralSkillFlowTests.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/GeneralSkillFlowTests.cs index 662dabfcaf..7b7a5300b5 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/GeneralSkillFlowTests.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/GeneralSkillFlowTests.cs @@ -4,7 +4,7 @@ using Microsoft.Bot.Schema; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace AutomotiveSkillTest.Flow +namespace AutomotiveSkill.Tests.Flow { [TestClass] public class GeneralSkillFlowTests : AutomotiveSkillTestBase diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs b/skills/csharp/tests/automotiveskill.tests/Flow/VehicleSettingsTests.cs similarity index 99% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs rename to skills/csharp/tests/automotiveskill.tests/Flow/VehicleSettingsTests.cs index aae4b6fb39..d6f860e711 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Flow/VehicleSettingsTests.cs +++ b/skills/csharp/tests/automotiveskill.tests/Flow/VehicleSettingsTests.cs @@ -7,7 +7,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Newtonsoft.Json; -namespace AutomotiveSkillTest.Flow +namespace AutomotiveSkill.Tests.Flow { [TestClass] public class VehicleSettingsTests : AutomotiveSkillTestBase diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Yaml/YamlParseUtilTests.cs b/skills/csharp/tests/automotiveskill.tests/Yaml/YamlParseUtilTests.cs similarity index 99% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Yaml/YamlParseUtilTests.cs rename to skills/csharp/tests/automotiveskill.tests/Yaml/YamlParseUtilTests.cs index f8c82f9147..62c3b32c8e 100644 --- a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Yaml/YamlParseUtilTests.cs +++ b/skills/csharp/tests/automotiveskill.tests/Yaml/YamlParseUtilTests.cs @@ -5,7 +5,7 @@ using AutomotiveSkill.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace AutomotiveSkillTest.Yaml +namespace AutomotiveSkill.Tests.Yaml { [TestClass] public class YamlParseUtilTests diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Yaml/test_available_settings.yaml b/skills/csharp/tests/automotiveskill.tests/Yaml/test_available_settings.yaml similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Yaml/test_available_settings.yaml rename to skills/csharp/tests/automotiveskill.tests/Yaml/test_available_settings.yaml diff --git a/skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Yaml/test_setting_alternative_names.yaml b/skills/csharp/tests/automotiveskill.tests/Yaml/test_setting_alternative_names.yaml similarity index 100% rename from skills/src/csharp/experimental/automotiveskill/automotiveskilltest/Yaml/test_setting_alternative_names.yaml rename to skills/csharp/tests/automotiveskill.tests/Yaml/test_setting_alternative_names.yaml diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceBaseTests.cs b/skills/csharp/tests/calendarskill.tests/API/CalendarServiceBaseTests.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceBaseTests.cs rename to skills/csharp/tests/calendarskill.tests/API/CalendarServiceBaseTests.cs index 4a18585ec5..c4a704fee8 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceBaseTests.cs +++ b/skills/csharp/tests/calendarskill.tests/API/CalendarServiceBaseTests.cs @@ -2,10 +2,10 @@ using System.Threading.Tasks; using CalendarSkill.Models; using CalendarSkill.Services; -using CalendarSkillTest.API.Fakes.MockBaseClient; +using CalendarSkill.Test.API.Fakes.MockBaseClient; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.API +namespace CalendarSkill.Test.API { // this will test all logic in CalendarService only. // only have success test now diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceGoogleTests.cs b/skills/csharp/tests/calendarskill.tests/API/CalendarServiceGoogleTests.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceGoogleTests.cs rename to skills/csharp/tests/calendarskill.tests/API/CalendarServiceGoogleTests.cs index bd0c6f36d7..b2210447f9 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceGoogleTests.cs +++ b/skills/csharp/tests/calendarskill.tests/API/CalendarServiceGoogleTests.cs @@ -4,11 +4,11 @@ using CalendarSkill.Models; using CalendarSkill.Services; using CalendarSkill.Services.GoogleAPI; -using CalendarSkillTest.API.Fakes.MockGoogleClient; +using CalendarSkill.Test.API.Fakes.MockGoogleClient; using Microsoft.Bot.Builder.Skills; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.API +namespace CalendarSkill.Test.API { // this will test all logic in Google Calendar service // only have success test now diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceMSGrapghTests.cs b/skills/csharp/tests/calendarskill.tests/API/CalendarServiceMSGrapghTests.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceMSGrapghTests.cs rename to skills/csharp/tests/calendarskill.tests/API/CalendarServiceMSGrapghTests.cs index 3bcad14972..4a0eb2f93a 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/CalendarServiceMSGrapghTests.cs +++ b/skills/csharp/tests/calendarskill.tests/API/CalendarServiceMSGrapghTests.cs @@ -4,11 +4,11 @@ using CalendarSkill.Models; using CalendarSkill.Services; using CalendarSkill.Services.MSGraphAPI; -using CalendarSkillTest.API.Fakes.MockMSGraphClient; +using CalendarSkill.Test.API.Fakes.MockMSGraphClient; using Microsoft.Bot.Builder.Skills; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.API +namespace CalendarSkill.Test.API { // this will test all logic in MSGraph Calendar service // only have success test now diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseServiceClient.cs b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockBaseClient/MockBaseServiceClient.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseServiceClient.cs rename to skills/csharp/tests/calendarskill.tests/API/Fakes/MockBaseClient/MockBaseServiceClient.cs index b0b6fbf847..ec4005afb3 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseServiceClient.cs +++ b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockBaseClient/MockBaseServiceClient.cs @@ -5,7 +5,7 @@ using CalendarSkill.Services; using Moq; -namespace CalendarSkillTest.API.Fakes.MockBaseClient +namespace CalendarSkill.Test.API.Fakes.MockBaseClient { public static class MockBaseServiceClient { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseUserClient.cs b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockBaseClient/MockBaseUserClient.cs similarity index 95% rename from skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseUserClient.cs rename to skills/csharp/tests/calendarskill.tests/API/Fakes/MockBaseClient/MockBaseUserClient.cs index 2696eeb748..0a21144f85 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockBaseClient/MockBaseUserClient.cs +++ b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockBaseClient/MockBaseUserClient.cs @@ -4,7 +4,7 @@ using CalendarSkill.Services; using Moq; -namespace CalendarSkillTest.API.Fakes.MockBaseClient +namespace CalendarSkill.Test.API.Fakes.MockBaseClient { public static class MockBaseUserClient { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs similarity index 99% rename from skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs rename to skills/csharp/tests/calendarskill.tests/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs index 3d1fbd5110..be7c983e1f 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs +++ b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockGoogleClient/MockGoogleServiceClient.cs @@ -8,7 +8,7 @@ using Moq; using GoogleCalendarService = Google.Apis.Calendar.v3.CalendarService; -namespace CalendarSkillTest.API.Fakes.MockGoogleClient +namespace CalendarSkill.Test.API.Fakes.MockGoogleClient { public static class MockGoogleServiceClient { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs rename to skills/csharp/tests/calendarskill.tests/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs index bd8841068c..4d4a569df1 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs +++ b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockGoogleClient/MockGoogleUserClient.cs @@ -8,7 +8,7 @@ using Moq; using static Google.Apis.People.v1.PeopleResource; -namespace CalendarSkillTest.API.Fakes.MockGoogleClient +namespace CalendarSkill.Test.API.Fakes.MockGoogleClient { public static class MockGoogleUserClient { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs rename to skills/csharp/tests/calendarskill.tests/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs index c4d4cb4bf8..d68c1f1388 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs +++ b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockMSGraphClient/MockMSGraphUserClient.cs @@ -3,7 +3,7 @@ using Microsoft.Graph; using Moq; -namespace CalendarSkillTest.API.Fakes.MockMSGraphClient +namespace CalendarSkill.Test.API.Fakes.MockMSGraphClient { public static class MockMSGraphUserClient { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs rename to skills/csharp/tests/calendarskill.tests/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs index 5a39cc405b..516c0b7197 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs +++ b/skills/csharp/tests/calendarskill.tests/API/Fakes/MockMSGraphClient/MockMsGraphServiceClient.cs @@ -4,7 +4,7 @@ using Microsoft.Graph; using Moq; -namespace CalendarSkillTest.API.Fakes.MockMSGraphClient +namespace CalendarSkill.Test.API.Fakes.MockMSGraphClient { public static class MockMSGraphServiceClient { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/ServiceManagerTests.cs b/skills/csharp/tests/calendarskill.tests/API/ServiceManagerTests.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/API/ServiceManagerTests.cs rename to skills/csharp/tests/calendarskill.tests/API/ServiceManagerTests.cs index 37f32d867a..37dd51faa2 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/ServiceManagerTests.cs +++ b/skills/csharp/tests/calendarskill.tests/API/ServiceManagerTests.cs @@ -3,7 +3,7 @@ using CalendarSkill.Services; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.API +namespace CalendarSkill.Test.API { [TestClass] public class ServiceManagerTests diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceBaseTests.cs b/skills/csharp/tests/calendarskill.tests/API/UserServiceBaseTests.cs similarity index 93% rename from skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceBaseTests.cs rename to skills/csharp/tests/calendarskill.tests/API/UserServiceBaseTests.cs index 988dc9bd7c..34b650b855 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceBaseTests.cs +++ b/skills/csharp/tests/calendarskill.tests/API/UserServiceBaseTests.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; using CalendarSkill.Services; -using CalendarSkillTest.API.Fakes.MockBaseClient; +using CalendarSkill.Test.API.Fakes.MockBaseClient; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.API +namespace CalendarSkill.Test.API { [TestClass] public class UserServiceBaseTests diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceGoogleTests.cs b/skills/csharp/tests/calendarskill.tests/API/UserServiceGoogleTests.cs similarity index 94% rename from skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceGoogleTests.cs rename to skills/csharp/tests/calendarskill.tests/API/UserServiceGoogleTests.cs index 7798e2af7f..b0ec3d5eff 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceGoogleTests.cs +++ b/skills/csharp/tests/calendarskill.tests/API/UserServiceGoogleTests.cs @@ -3,10 +3,10 @@ using CalendarSkill.Models; using CalendarSkill.Services; using CalendarSkill.Services.GoogleAPI; -using CalendarSkillTest.API.Fakes.MockGoogleClient; +using CalendarSkill.Test.API.Fakes.MockGoogleClient; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.API +namespace CalendarSkill.Test.API { [TestClass] public class UserServiceGoogleTests diff --git a/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceMSGraphTests.cs b/skills/csharp/tests/calendarskill.tests/API/UserServiceMSGraphTests.cs similarity index 94% rename from skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceMSGraphTests.cs rename to skills/csharp/tests/calendarskill.tests/API/UserServiceMSGraphTests.cs index 52dd75a03b..46cd02b151 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/API/UserServiceMSGraphTests.cs +++ b/skills/csharp/tests/calendarskill.tests/API/UserServiceMSGraphTests.cs @@ -3,10 +3,10 @@ using CalendarSkill.Models; using CalendarSkill.Services; using CalendarSkill.Services.MSGraphAPI; -using CalendarSkillTest.API.Fakes.MockMSGraphClient; +using CalendarSkill.Test.API.Fakes.MockMSGraphClient; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.API +namespace CalendarSkill.Test.API { [TestClass] public class UserServiceMSGraphTests diff --git a/skills/src/csharp/calendarskill/calendarskilltest/CalendarSkillTest.csproj b/skills/csharp/tests/calendarskill.tests/CalendarSkill.Tests.csproj similarity index 90% rename from skills/src/csharp/calendarskill/calendarskilltest/CalendarSkillTest.csproj rename to skills/csharp/tests/calendarskill.tests/CalendarSkill.Tests.csproj index 2b9de7c079..7ef852668d 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/CalendarSkillTest.csproj +++ b/skills/csharp/tests/calendarskill.tests/CalendarSkill.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Common/TimeConverterTests.cs b/skills/csharp/tests/calendarskill.tests/Common/TimeConverterTests.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Common/TimeConverterTests.cs rename to skills/csharp/tests/calendarskill.tests/Common/TimeConverterTests.cs index 2f52112abb..be8e38b743 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Common/TimeConverterTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Common/TimeConverterTests.cs @@ -2,7 +2,7 @@ using CalendarSkill.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Common +namespace CalendarSkill.Test.Common { [TestClass] public class TimeConverterTests diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Common/TimeZoneConverterTests.cs b/skills/csharp/tests/calendarskill.tests/Common/TimeZoneConverterTests.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Common/TimeZoneConverterTests.cs rename to skills/csharp/tests/calendarskill.tests/Common/TimeZoneConverterTests.cs index 5645378045..d7611cd6b2 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Common/TimeZoneConverterTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Common/TimeZoneConverterTests.cs @@ -2,7 +2,7 @@ using CalendarSkill.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Common +namespace CalendarSkill.Test.Common { [TestClass] public class TimeZoneConverterTests diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/CalendarBotTestBase.cs b/skills/csharp/tests/calendarskill.tests/Flow/CalendarSkillTestBase.cs similarity index 97% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/CalendarBotTestBase.cs rename to skills/csharp/tests/calendarskill.tests/Flow/CalendarSkillTestBase.cs index 60809cebe2..e6a1421be0 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/CalendarBotTestBase.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/CalendarSkillTestBase.cs @@ -14,7 +14,7 @@ using CalendarSkill.Responses.UpcomingEvent; using CalendarSkill.Responses.UpdateEvent; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; +using CalendarSkill.Test.Flow.Fakes; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.Adapters; using Microsoft.Bot.Builder.Solutions.Authentication; @@ -27,9 +27,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { - public class CalendarBotTestBase : BotTestBase + public class CalendarSkillTestBase : BotTestBase { public IServiceCollection Services { get; set; } diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/ChangeCalendarStatusFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/ChangeCalendarStatusFlowTests.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/ChangeCalendarStatusFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/ChangeCalendarStatusFlowTests.cs index 1e8e984646..ec56fe1a67 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/ChangeCalendarStatusFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/ChangeCalendarStatusFlowTests.cs @@ -4,18 +4,18 @@ using System.Threading.Tasks; using CalendarSkill.Responses.ChangeEventStatus; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Schema; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class ChangeCalendarStatusFlowTests : CalendarBotTestBase + public class ChangeCalendarStatusFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/ConnectToMeetingFlowTests.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/ConnectToMeetingFlowTests.cs index bae879fad8..c87883f7dd 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/ConnectToMeetingFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/ConnectToMeetingFlowTests.cs @@ -5,18 +5,18 @@ using CalendarSkill.Models; using CalendarSkill.Responses.JoinEvent; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Schema; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class ConnectToMeetingFlowTests : CalendarBotTestBase + public class ConnectToMeetingFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/CreateCalendarFlowTests.cs similarity index 99% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/CreateCalendarFlowTests.cs index 982644c38d..8be77c348b 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/CreateCalendarFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/CreateCalendarFlowTests.cs @@ -7,8 +7,8 @@ using CalendarSkill.Responses.FindContact; using CalendarSkill.Responses.Shared; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.AspNetCore.Authentication; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; @@ -17,10 +17,10 @@ using Microsoft.Graph; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class CreateCalendarFlowTests : CalendarBotTestBase + public class CreateCalendarFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarService.cs b/skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockCalendarService.cs similarity index 99% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarService.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockCalendarService.cs index e054586670..6230cb579e 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockCalendarService.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockCalendarService.cs @@ -5,7 +5,7 @@ using CalendarSkill.Services; using Microsoft.Graph; -namespace CalendarSkillTest.Flow.Fakes +namespace CalendarSkill.Test.Flow.Fakes { // Leave this mock service for GetEventPrompt test. The moq service has issue when serialize, so need instead by this. public class MockCalendarService : ICalendarService diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockLuisRecognizer.cs b/skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockLuisRecognizer.cs similarity index 97% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockLuisRecognizer.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockLuisRecognizer.cs index fdfe365782..aabab9ee6d 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockLuisRecognizer.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockLuisRecognizer.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Utterances; using Luis; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Dialogs; -namespace CalendarSkillTest.Flow.Fakes +namespace CalendarSkill.Test.Flow.Fakes { public class MockLuisRecognizer : ITelemetryRecognizer { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockServiceManager.cs b/skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockServiceManager.cs similarity index 99% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockServiceManager.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockServiceManager.cs index cf890d0b0e..31dcb2d819 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockServiceManager.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockServiceManager.cs @@ -9,7 +9,7 @@ using Microsoft.Graph; using Moq; -namespace CalendarSkillTest.Flow.Fakes +namespace CalendarSkill.Test.Flow.Fakes { public static class MockServiceManager { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockSkillConfiguration.cs b/skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockSkillConfiguration.cs similarity index 100% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Fakes/MockSkillConfiguration.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Fakes/MockSkillConfiguration.cs diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/GeneralSkillFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/GeneralSkillFlowTests.cs similarity index 90% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/GeneralSkillFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/GeneralSkillFlowTests.cs index 316d5a9ede..ecc1737185 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/GeneralSkillFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/GeneralSkillFlowTests.cs @@ -3,18 +3,18 @@ using System.Threading.Tasks; using CalendarSkill.Responses.Shared; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Schema; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class GeneralSkillFlowTests : CalendarBotTestBase + public class GeneralSkillFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Models/MeetingAdaptiveCard.cs b/skills/csharp/tests/calendarskill.tests/Flow/Models/MeetingAdaptiveCard.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Models/MeetingAdaptiveCard.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Models/MeetingAdaptiveCard.cs index 3f21141bc7..cffdb64ebc 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Models/MeetingAdaptiveCard.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Models/MeetingAdaptiveCard.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace CalendarSkillTest.Flow.Models +namespace CalendarSkill.Test.Flow.Models { public class MeetingAdaptiveCard { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/NextCalendarFlowTests.cs similarity index 97% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/NextCalendarFlowTests.cs index 9dc4cf22ee..f0ea7a5afd 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/NextCalendarFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/NextCalendarFlowTests.cs @@ -4,18 +4,18 @@ using System.Threading.Tasks; using CalendarSkill.Responses.Summary; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Schema; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class NextCalendarFlowTests : CalendarBotTestBase + public class NextCalendarFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Strings/Strings.cs b/skills/csharp/tests/calendarskill.tests/Flow/Strings/Strings.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Strings/Strings.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Strings/Strings.cs index 0c751fd526..a4aee0003b 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Strings/Strings.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Strings/Strings.cs @@ -1,4 +1,4 @@ -namespace CalendarSkillTest.Flow.Strings +namespace CalendarSkill.Test.Flow.Strings { public class Strings { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/SummaryCalendarFlowTests.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/SummaryCalendarFlowTests.cs index 8298e5f428..baa2500efd 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/SummaryCalendarFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/SummaryCalendarFlowTests.cs @@ -6,8 +6,8 @@ using CalendarSkill.Responses.Summary; using CalendarSkill.Responses.UpdateEvent; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Builder.Solutions.Resources; @@ -15,10 +15,10 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class SummaryCalendarFlowTests : CalendarBotTestBase + public class SummaryCalendarFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/TimeRemainingFlowTests.cs similarity index 93% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/TimeRemainingFlowTests.cs index a0a73a5bf7..abe5bbb6b8 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/TimeRemainingFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/TimeRemainingFlowTests.cs @@ -5,18 +5,18 @@ using CalendarSkill.Models; using CalendarSkill.Responses.TimeRemaining; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Schema; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class TimeRemainingFlowTests : CalendarBotTestBase + public class TimeRemainingFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs b/skills/csharp/tests/calendarskill.tests/Flow/UpdateCalendarFlowTests.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs rename to skills/csharp/tests/calendarskill.tests/Flow/UpdateCalendarFlowTests.cs index 4f2b44be3c..cbf2dcff5d 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/UpdateCalendarFlowTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/UpdateCalendarFlowTests.cs @@ -4,18 +4,18 @@ using System.Threading.Tasks; using CalendarSkill.Responses.UpdateEvent; using CalendarSkill.Services; -using CalendarSkillTest.Flow.Fakes; -using CalendarSkillTest.Flow.Utterances; +using CalendarSkill.Test.Flow.Fakes; +using CalendarSkill.Test.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Schema; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Flow +namespace CalendarSkill.Test.Flow { [TestClass] - public class UpdateCalendarFlowTests : CalendarBotTestBase + public class UpdateCalendarFlowTests : CalendarSkillTestBase { [TestInitialize] public void SetupLuisService() diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/BaseTestUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/BaseTestUtterances.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/BaseTestUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/BaseTestUtterances.cs index dd73ab34a9..859d96a08f 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/BaseTestUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/BaseTestUtterances.cs @@ -4,7 +4,7 @@ using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.AI.Luis; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class BaseTestUtterances : Dictionary { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ChangeMeetingStatusTestUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/ChangeMeetingStatusTestUtterances.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ChangeMeetingStatusTestUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/ChangeMeetingStatusTestUtterances.cs index 445907b9c0..3fee439845 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ChangeMeetingStatusTestUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/ChangeMeetingStatusTestUtterances.cs @@ -1,6 +1,6 @@ using Luis; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class ChangeMeetingStatusTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ConnectToMeetingUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/ConnectToMeetingUtterances.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ConnectToMeetingUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/ConnectToMeetingUtterances.cs index 5ab5463e17..eec0f2cf2c 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/ConnectToMeetingUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/ConnectToMeetingUtterances.cs @@ -1,6 +1,6 @@ using Luis; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class ConnectToMeetingUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/CreateMeetingTestUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/CreateMeetingTestUtterances.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/CreateMeetingTestUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/CreateMeetingTestUtterances.cs index f3ef9aea7c..aa2c65a514 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/CreateMeetingTestUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/CreateMeetingTestUtterances.cs @@ -1,6 +1,6 @@ using Luis; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class CreateMeetingTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/FindMeetingTestUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/FindMeetingTestUtterances.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/FindMeetingTestUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/FindMeetingTestUtterances.cs index 790c8f6df0..a252799efe 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/FindMeetingTestUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/FindMeetingTestUtterances.cs @@ -1,6 +1,6 @@ using Luis; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class FindMeetingTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/GeneralTestUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/GeneralTestUtterances.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/GeneralTestUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/GeneralTestUtterances.cs index dca735dc7c..41acb8dd1d 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/GeneralTestUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/GeneralTestUtterances.cs @@ -2,7 +2,7 @@ using Luis; using Microsoft.Bot.Builder; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class GeneralTestUtterances : Dictionary { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/TimeRemainingUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/TimeRemainingUtterances.cs similarity index 96% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/TimeRemainingUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/TimeRemainingUtterances.cs index 6bd3c9e2c9..2405226f3f 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/TimeRemainingUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/TimeRemainingUtterances.cs @@ -1,6 +1,6 @@ using Luis; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class TimeRemainingUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/UpdateMeetingTestUtterances.cs b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/UpdateMeetingTestUtterances.cs similarity index 98% rename from skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/UpdateMeetingTestUtterances.cs rename to skills/csharp/tests/calendarskill.tests/Flow/Utterances/UpdateMeetingTestUtterances.cs index 9f728972eb..dbbd739a4b 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Flow/Utterances/UpdateMeetingTestUtterances.cs +++ b/skills/csharp/tests/calendarskill.tests/Flow/Utterances/UpdateMeetingTestUtterances.cs @@ -1,6 +1,6 @@ using Luis; -namespace CalendarSkillTest.Flow.Utterances +namespace CalendarSkill.Test.Flow.Utterances { public class UpdateMeetingTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Prompt/DatePromptTests.cs b/skills/csharp/tests/calendarskill.tests/Prompt/DatePromptTests.cs similarity index 97% rename from skills/src/csharp/calendarskill/calendarskilltest/Prompt/DatePromptTests.cs rename to skills/csharp/tests/calendarskill.tests/Prompt/DatePromptTests.cs index e55e09d2d6..9151d7a349 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Prompt/DatePromptTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Prompt/DatePromptTests.cs @@ -5,7 +5,7 @@ using CalendarSkill.Models; using CalendarSkill.Prompts; using CalendarSkill.Prompts.Options; -using CalendarSkillTest.Flow.Fakes; +using CalendarSkill.Test.Flow.Fakes; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.Adapters; using Microsoft.Bot.Builder.Dialogs; @@ -13,7 +13,7 @@ using Microsoft.Recognizers.Text; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Prompt +namespace CalendarSkill.Test.Prompt { [TestClass] public class DatePromptTests diff --git a/skills/src/csharp/calendarskill/calendarskilltest/Prompt/GetEventPromptTests.cs b/skills/csharp/tests/calendarskill.tests/Prompt/GetEventPromptTests.cs similarity index 97% rename from skills/src/csharp/calendarskill/calendarskilltest/Prompt/GetEventPromptTests.cs rename to skills/csharp/tests/calendarskill.tests/Prompt/GetEventPromptTests.cs index 8bd393af47..de4aa4bb1b 100644 --- a/skills/src/csharp/calendarskill/calendarskilltest/Prompt/GetEventPromptTests.cs +++ b/skills/csharp/tests/calendarskill.tests/Prompt/GetEventPromptTests.cs @@ -4,7 +4,7 @@ using CalendarSkill.Models; using CalendarSkill.Prompts; using CalendarSkill.Prompts.Options; -using CalendarSkillTest.Flow.Fakes; +using CalendarSkill.Test.Flow.Fakes; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.Adapters; using Microsoft.Bot.Builder.Dialogs; @@ -12,7 +12,7 @@ using Microsoft.Recognizers.Text; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace CalendarSkillTest.Prompt +namespace CalendarSkill.Test.Prompt { [TestClass] public class GetEventPromptTests diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/GmailUtil.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/GmailUtil.cs similarity index 97% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/GmailUtil.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/Google/GmailUtil.cs index 95a3ebb6fe..10b691bf14 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/GmailUtil.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/GmailUtil.cs @@ -5,7 +5,7 @@ using MimeKit; using GmailMessage = Google.Apis.Gmail.v1.Data.Message; -namespace EmailSkillTest.API.Fakes.Google +namespace EmailSkill.Tests.API.Fakes.Google { public class GmailUtil { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleServiceClient.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockGoogleServiceClient.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleServiceClient.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockGoogleServiceClient.cs index d7f1691a69..d87aad544f 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleServiceClient.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockGoogleServiceClient.cs @@ -4,7 +4,7 @@ using static Google.Apis.Gmail.v1.UsersResource; using GmailMessage = Google.Apis.Gmail.v1.Data.Message; -namespace EmailSkillTest.API.Fakes.Google +namespace EmailSkill.Tests.API.Fakes.Google { public class MockGoogleServiceClient { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleUserClient.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockGoogleUserClient.cs similarity index 96% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleUserClient.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockGoogleUserClient.cs index a4580d54f4..feb90d0743 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockGoogleUserClient.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockGoogleUserClient.cs @@ -3,7 +3,7 @@ using Moq; using static Google.Apis.People.v1.PeopleResource; -namespace EmailSkillTest.API.Fakes.Google +namespace EmailSkill.Tests.API.Fakes.Google { public static class MockGoogleUserClient { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockListRequest.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockListRequest.cs similarity index 97% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockListRequest.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockListRequest.cs index 809cbfa0aa..9ee89825e8 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockListRequest.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockListRequest.cs @@ -6,7 +6,7 @@ using Google.Apis.Services; using static Google.Apis.People.v1.PeopleResource; -namespace EmailSkillTest.API.Fakes.Google +namespace EmailSkill.Tests.API.Fakes.Google { public class MockListRequest : ConnectionsResource.ListRequest, IClientServiceRequest { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockMessagesResource.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockMessagesResource.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockMessagesResource.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockMessagesResource.cs index c71a232cab..3336fdfb09 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockMessagesResource.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockMessagesResource.cs @@ -7,7 +7,7 @@ using static Google.Apis.Gmail.v1.UsersResource; using GmailMessage = Google.Apis.Gmail.v1.Data.Message; -namespace EmailSkillTest.API.Fakes.Google +namespace EmailSkill.Tests.API.Fakes.Google { public class MockMessagesResource { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockUsersResource.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockUsersResource.cs similarity index 95% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockUsersResource.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockUsersResource.cs index 9069679722..71521b791d 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/Google/MockUsersResource.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/Google/MockUsersResource.cs @@ -4,7 +4,7 @@ using Google.Apis.Services; using static Google.Apis.Gmail.v1.UsersResource; -namespace EmailSkillTest.API.Fakes.Google +namespace EmailSkill.Tests.API.Fakes.Google { public class MockUsersResource { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MSGraph/MockGraphServiceClient.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/MSGraph/MockGraphServiceClient.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/MSGraph/MockGraphServiceClient.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/MSGraph/MockGraphServiceClient.cs index e34e61dddd..bbb8287329 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MSGraph/MockGraphServiceClient.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/MSGraph/MockGraphServiceClient.cs @@ -3,7 +3,7 @@ using Microsoft.Graph; using Moq; -namespace EmailSkillTest.API.Fakes.MSGraph +namespace EmailSkill.Tests.API.Fakes.MSGraph { public class MockGraphServiceClient { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockDialogStateAccessor.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/MockDialogStateAccessor.cs similarity index 96% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockDialogStateAccessor.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/MockDialogStateAccessor.cs index 89ca22ccc8..f8392bf081 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockDialogStateAccessor.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/MockDialogStateAccessor.cs @@ -4,7 +4,7 @@ using Microsoft.Bot.Builder.Dialogs; using Moq; -namespace EmailSkillTest.API.Fakes +namespace EmailSkill.Tests.API.Fakes { public class MockDialogStateAccessor { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockEmailStateAccessor.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/MockEmailStateAccessor.cs similarity index 97% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockEmailStateAccessor.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/MockEmailStateAccessor.cs index 98ba481563..1969d2b662 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockEmailStateAccessor.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/MockEmailStateAccessor.cs @@ -5,7 +5,7 @@ using Microsoft.Bot.Builder; using Moq; -namespace EmailSkillTest.API.Fakes +namespace EmailSkill.Tests.API.Fakes { public class MockEmailStateAccessor { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockServiceManager.cs b/skills/csharp/tests/emailskill.tests/API/Fakes/MockServiceManager.cs similarity index 93% rename from skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockServiceManager.cs rename to skills/csharp/tests/emailskill.tests/API/Fakes/MockServiceManager.cs index 77c21cb157..ec8fc5c086 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Fakes/MockServiceManager.cs +++ b/skills/csharp/tests/emailskill.tests/API/Fakes/MockServiceManager.cs @@ -2,10 +2,10 @@ using EmailSkill.Models; using EmailSkill.Services; using EmailSkill.Services.MSGraphAPI; -using EmailSkillTest.API.Fakes.MSGraph; +using EmailSkill.Tests.API.Fakes.MSGraph; using Microsoft.Graph; -namespace EmailSkillTest.API.Fakes +namespace EmailSkill.Tests.API.Fakes { public class MockServiceManager : IServiceManager { diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Helper/StepHelperTests.cs b/skills/csharp/tests/emailskill.tests/API/Helper/StepHelperTests.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/API/Helper/StepHelperTests.cs rename to skills/csharp/tests/emailskill.tests/API/Helper/StepHelperTests.cs index a91459f976..e177dea1b3 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Helper/StepHelperTests.cs +++ b/skills/csharp/tests/emailskill.tests/API/Helper/StepHelperTests.cs @@ -3,12 +3,12 @@ using EmailSkill.Dialogs; using EmailSkill.Models; using EmailSkill.Services; +using EmailSkill.Tests.API.Fakes; using EmailSkill.Utilities; -using EmailSkillTest.API.Fakes; using Microsoft.Graph; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.API.Helper +namespace EmailSkill.Tests.API.Helper { [TestClass] public class StepHelperTests : EmailSkillDialogBase diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleMailServiceTests.cs b/skills/csharp/tests/emailskill.tests/API/Service/GoogleMailServiceTests.cs similarity index 96% rename from skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleMailServiceTests.cs rename to skills/csharp/tests/emailskill.tests/API/Service/GoogleMailServiceTests.cs index 5d7bfd9db4..e7e4b83c9b 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleMailServiceTests.cs +++ b/skills/csharp/tests/emailskill.tests/API/Service/GoogleMailServiceTests.cs @@ -3,11 +3,11 @@ using System.Threading.Tasks; using EmailSkill.Services; using EmailSkill.Services.GoogleAPI; -using EmailSkillTest.API.Fakes.Google; +using EmailSkill.Tests.API.Fakes.Google; using Microsoft.Graph; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.API.Service +namespace EmailSkill.Tests.API.Service { [TestClass] public class GoogleMailServiceTests diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleUserServiceTests.cs b/skills/csharp/tests/emailskill.tests/API/Service/GoogleUserServiceTests.cs similarity index 94% rename from skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleUserServiceTests.cs rename to skills/csharp/tests/emailskill.tests/API/Service/GoogleUserServiceTests.cs index ebb85bf4e3..45c51d9fb3 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Service/GoogleUserServiceTests.cs +++ b/skills/csharp/tests/emailskill.tests/API/Service/GoogleUserServiceTests.cs @@ -3,10 +3,10 @@ using EmailSkill.Models; using EmailSkill.Services; using EmailSkill.Services.GoogleAPI; -using EmailSkillTest.API.Fakes.Google; +using EmailSkill.Tests.API.Fakes.Google; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.API.Service +namespace EmailSkill.Tests.API.Service { [TestClass] public class GoogleUserServiceTests diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Service/GraphMailServiceTests.cs b/skills/csharp/tests/emailskill.tests/API/Service/GraphMailServiceTests.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/API/Service/GraphMailServiceTests.cs rename to skills/csharp/tests/emailskill.tests/API/Service/GraphMailServiceTests.cs index 8e8bd2bbaf..a23f7ce9ee 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Service/GraphMailServiceTests.cs +++ b/skills/csharp/tests/emailskill.tests/API/Service/GraphMailServiceTests.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Threading.Tasks; using EmailSkill.Services.MSGraphAPI; -using EmailSkillTest.API.Fakes.MSGraph; +using EmailSkill.Tests.API.Fakes.MSGraph; using Microsoft.Graph; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.API.Service +namespace EmailSkill.Tests.API.Service { [TestClass] public class GraphMailServiceTests diff --git a/skills/src/csharp/emailskill/emailskilltest/API/Service/GraphUserServiceTests.cs b/skills/csharp/tests/emailskill.tests/API/Service/GraphUserServiceTests.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/API/Service/GraphUserServiceTests.cs rename to skills/csharp/tests/emailskill.tests/API/Service/GraphUserServiceTests.cs index 5566175883..971f89a56d 100644 --- a/skills/src/csharp/emailskill/emailskilltest/API/Service/GraphUserServiceTests.cs +++ b/skills/csharp/tests/emailskill.tests/API/Service/GraphUserServiceTests.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; using EmailSkill.Services.MSGraphAPI; -using EmailSkillTest.API.Fakes.MSGraph; +using EmailSkill.Tests.API.Fakes.MSGraph; using Microsoft.Graph; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.API.Service +namespace EmailSkill.Tests.API.Service { [TestClass] public class GraphUserServiceTests diff --git a/skills/src/csharp/emailskill/emailskilltest/EmailSkillTest.csproj b/skills/csharp/tests/emailskill.tests/EmailSkill.Tests.csproj similarity index 86% rename from skills/src/csharp/emailskill/emailskilltest/EmailSkillTest.csproj rename to skills/csharp/tests/emailskill.tests/EmailSkill.Tests.csproj index 34978d0f6d..4dc8628064 100644 --- a/skills/src/csharp/emailskill/emailskilltest/EmailSkillTest.csproj +++ b/skills/csharp/tests/emailskill.tests/EmailSkill.Tests.csproj @@ -15,11 +15,11 @@ - + - + Always diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs b/skills/csharp/tests/emailskill.tests/Flow/DeleteEmailFlowTests.cs similarity index 96% rename from skills/src/csharp/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs rename to skills/csharp/tests/emailskill.tests/Flow/DeleteEmailFlowTests.cs index a6092d8622..c230f1de7e 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/DeleteEmailFlowTests.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/DeleteEmailFlowTests.cs @@ -3,17 +3,17 @@ using System.Threading.Tasks; using EmailSkill.Responses.DeleteEmail; using EmailSkill.Responses.Shared; +using EmailSkill.Tests.Flow.Fakes; +using EmailSkill.Tests.Flow.Utterances; using EmailSkill.Utilities; -using EmailSkillTest.Flow.Fakes; -using EmailSkillTest.Flow.Utterances; using Microsoft.Bot.Builder.Solutions.Util; using Microsoft.Bot.Schema; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.Flow +namespace EmailSkill.Tests.Flow { [TestClass] - public class DeleteEmailFlowTests : EmailBotTestBase + public class DeleteEmailFlowTests : EmailSkillTestBase { [TestMethod] public async Task Test_NotDeleteEmail() diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/EmailBotTestBase.cs b/skills/csharp/tests/emailskill.tests/Flow/EmailSkillTestBase.cs similarity index 97% rename from skills/src/csharp/emailskill/emailskilltest/Flow/EmailBotTestBase.cs rename to skills/csharp/tests/emailskill.tests/Flow/EmailSkillTestBase.cs index 62afaaa6c0..436da021ac 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/EmailBotTestBase.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/EmailSkillTestBase.cs @@ -12,8 +12,8 @@ using EmailSkill.Responses.Shared; using EmailSkill.Responses.ShowEmail; using EmailSkill.Services; -using EmailSkillTest.Flow.Fakes; -using EmailSkillTest.Flow.Utterances; +using EmailSkill.Tests.Flow.Fakes; +using EmailSkill.Tests.Flow.Utterances; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.Adapters; using Microsoft.Bot.Builder.AI.Luis; @@ -29,9 +29,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.Flow +namespace EmailSkill.Tests.Flow { - public class EmailBotTestBase : BotTestBase + public class EmailSkillTestBase : BotTestBase { public IServiceCollection Services { get; set; } diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockEmailLuisRecognizer.cs b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockEmailLuisRecognizer.cs similarity index 97% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockEmailLuisRecognizer.cs rename to skills/csharp/tests/emailskill.tests/Flow/Fakes/MockEmailLuisRecognizer.cs index bdad5b09ff..9d0c2d9b5d 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockEmailLuisRecognizer.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockEmailLuisRecognizer.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using EmailSkillTest.Flow.Utterances; +using EmailSkill.Tests.Flow.Utterances; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Dialogs; -namespace EmailSkillTest.Flow.Fakes +namespace EmailSkill.Tests.Flow.Fakes { public class MockEmailLuisRecognizer : ITelemetryRecognizer { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockGeneralLuisRecognizer.cs b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockGeneralLuisRecognizer.cs similarity index 96% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockGeneralLuisRecognizer.cs rename to skills/csharp/tests/emailskill.tests/Flow/Fakes/MockGeneralLuisRecognizer.cs index eb3b8d9c06..399e287c09 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockGeneralLuisRecognizer.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockGeneralLuisRecognizer.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using EmailSkillTest.Flow.Utterances; +using EmailSkill.Tests.Flow.Utterances; using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Dialogs; -namespace EmailSkillTest.Flow.Fakes +namespace EmailSkill.Tests.Flow.Fakes { public class MockGeneralLuisRecognizer : ITelemetryRecognizer { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockMailService.cs b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockMailService.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockMailService.cs rename to skills/csharp/tests/emailskill.tests/Flow/Fakes/MockMailService.cs index 6a70ffc803..50fde0dd26 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockMailService.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockMailService.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Threading.Tasks; using EmailSkill.Services; -using EmailSkillTest.Flow.Strings; +using EmailSkill.Tests.Flow.Strings; using Microsoft.Graph; -namespace EmailSkillTest.Flow.Fakes +namespace EmailSkill.Tests.Flow.Fakes { public class MockMailService : IMailService { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockServiceManager.cs b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockServiceManager.cs similarity index 95% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockServiceManager.cs rename to skills/csharp/tests/emailskill.tests/Flow/Fakes/MockServiceManager.cs index 6af1aadf8a..f506ab579d 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockServiceManager.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockServiceManager.cs @@ -2,7 +2,7 @@ using EmailSkill.Models; using EmailSkill.Services; -namespace EmailSkillTest.Flow.Fakes +namespace EmailSkill.Tests.Flow.Fakes { public class MockServiceManager : IServiceManager { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockUserService.cs b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockUserService.cs similarity index 99% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockUserService.cs rename to skills/csharp/tests/emailskill.tests/Flow/Fakes/MockUserService.cs index 9de99d56e8..62ee012c57 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Fakes/MockUserService.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Fakes/MockUserService.cs @@ -3,7 +3,7 @@ using EmailSkill.Models; using EmailSkill.Services; -namespace EmailSkillTest.Flow.Fakes +namespace EmailSkill.Tests.Flow.Fakes { public class MockUserService : IUserService { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs b/skills/csharp/tests/emailskill.tests/Flow/ForwardEmailFlowTests.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs rename to skills/csharp/tests/emailskill.tests/Flow/ForwardEmailFlowTests.cs index 19c2cbfe35..aca8a4956e 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/ForwardEmailFlowTests.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/ForwardEmailFlowTests.cs @@ -3,18 +3,18 @@ using System.Threading.Tasks; using EmailSkill.Responses.FindContact; using EmailSkill.Responses.Shared; +using EmailSkill.Tests.Flow.Fakes; +using EmailSkill.Tests.Flow.Strings; +using EmailSkill.Tests.Flow.Utterances; using EmailSkill.Utilities; -using EmailSkillTest.Flow.Fakes; -using EmailSkillTest.Flow.Strings; -using EmailSkillTest.Flow.Utterances; using Microsoft.Bot.Builder.Solutions.Util; using Microsoft.Bot.Schema; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.Flow +namespace EmailSkill.Tests.Flow { [TestClass] - public class ForwardEmailFlowTests : EmailBotTestBase + public class ForwardEmailFlowTests : EmailSkillTestBase { [TestMethod] public async Task Test_NotSendingEmail() diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/GeneralSkillFlowTests.cs b/skills/csharp/tests/emailskill.tests/Flow/GeneralSkillFlowTests.cs similarity index 85% rename from skills/src/csharp/emailskill/emailskilltest/Flow/GeneralSkillFlowTests.cs rename to skills/csharp/tests/emailskill.tests/Flow/GeneralSkillFlowTests.cs index 6bb21b0ad1..9f1117ac2c 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/GeneralSkillFlowTests.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/GeneralSkillFlowTests.cs @@ -1,14 +1,14 @@ using System.Collections.Specialized; using System.Threading.Tasks; using EmailSkill.Responses.Shared; -using EmailSkillTest.Flow.Utterances; +using EmailSkill.Tests.Flow.Utterances; using Microsoft.Bot.Schema; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.Flow +namespace EmailSkill.Tests.Flow { [TestClass] - public class GeneralSkillFlowTests : EmailBotTestBase + public class GeneralSkillFlowTests : EmailSkillTestBase { [TestMethod] public async Task Test_SingleTurnCompletion() diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/ReplyFlowTests.cs b/skills/csharp/tests/emailskill.tests/Flow/ReplyFlowTests.cs similarity index 96% rename from skills/src/csharp/emailskill/emailskilltest/Flow/ReplyFlowTests.cs rename to skills/csharp/tests/emailskill.tests/Flow/ReplyFlowTests.cs index f0426368d8..59e5c2cfd5 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/ReplyFlowTests.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/ReplyFlowTests.cs @@ -4,10 +4,10 @@ using System.Threading.Tasks; using EmailSkill.Responses.Shared; using EmailSkill.Services; +using EmailSkill.Tests.Flow.Fakes; +using EmailSkill.Tests.Flow.Strings; +using EmailSkill.Tests.Flow.Utterances; using EmailSkill.Utilities; -using EmailSkillTest.Flow.Fakes; -using EmailSkillTest.Flow.Strings; -using EmailSkillTest.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Builder.Solutions.Util; @@ -15,10 +15,10 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.Flow +namespace EmailSkill.Tests.Flow { [TestClass] - public class ReplyFlowTests : EmailBotTestBase + public class ReplyFlowTests : EmailSkillTestBase { [TestMethod] public async Task Test_NotSendingEmail() diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs b/skills/csharp/tests/emailskill.tests/Flow/SendEmailFlowTests.cs similarity index 99% rename from skills/src/csharp/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs rename to skills/csharp/tests/emailskill.tests/Flow/SendEmailFlowTests.cs index 431b27914b..222fcd88c0 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/SendEmailFlowTests.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/SendEmailFlowTests.cs @@ -6,19 +6,19 @@ using EmailSkill.Responses.SendEmail; using EmailSkill.Responses.Shared; using EmailSkill.Services; -using EmailSkillTest.Flow.Fakes; -using EmailSkillTest.Flow.Strings; -using EmailSkillTest.Flow.Utterances; +using EmailSkill.Tests.Flow.Fakes; +using EmailSkill.Tests.Flow.Strings; +using EmailSkill.Tests.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Schema; using Microsoft.Extensions.DependencyInjection; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.Flow +namespace EmailSkill.Tests.Flow { [TestClass] - public class SendEmailFlowTests : EmailBotTestBase + public class SendEmailFlowTests : EmailSkillTestBase { [TestMethod] public async Task Test_NotSendingEmail() diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs b/skills/csharp/tests/emailskill.tests/Flow/ShowEmailFlowTests.cs similarity index 99% rename from skills/src/csharp/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs rename to skills/csharp/tests/emailskill.tests/Flow/ShowEmailFlowTests.cs index edd840e42f..4e3a1b4b43 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/ShowEmailFlowTests.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/ShowEmailFlowTests.cs @@ -7,10 +7,10 @@ using EmailSkill.Responses.Shared; using EmailSkill.Responses.ShowEmail; using EmailSkill.Services; +using EmailSkill.Tests.Flow.Fakes; +using EmailSkill.Tests.Flow.Strings; +using EmailSkill.Tests.Flow.Utterances; using EmailSkill.Utilities; -using EmailSkillTest.Flow.Fakes; -using EmailSkillTest.Flow.Strings; -using EmailSkillTest.Flow.Utterances; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions; using Microsoft.Bot.Builder.Solutions.Util; @@ -19,10 +19,10 @@ using Microsoft.Graph; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace EmailSkillTest.Flow +namespace EmailSkill.Tests.Flow { [TestClass] - public class ShowEmailFlowTests : EmailBotTestBase + public class ShowEmailFlowTests : EmailSkillTestBase { [TestMethod] public async Task Test_ShowEmail() diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Strings/ContextStrings.cs b/skills/csharp/tests/emailskill.tests/Flow/Strings/ContextStrings.cs similarity index 94% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Strings/ContextStrings.cs rename to skills/csharp/tests/emailskill.tests/Flow/Strings/ContextStrings.cs index eca1b370fe..bc9cfa4d27 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Strings/ContextStrings.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Strings/ContextStrings.cs @@ -1,4 +1,4 @@ -namespace EmailSkillTest.Flow.Strings +namespace EmailSkill.Tests.Flow.Strings { public class ContextStrings { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/BaseTestUtterances.cs b/skills/csharp/tests/emailskill.tests/Flow/Utterances/BaseTestUtterances.cs similarity index 98% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/BaseTestUtterances.cs rename to skills/csharp/tests/emailskill.tests/Flow/Utterances/BaseTestUtterances.cs index f27975187f..4f4fa2e65c 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/BaseTestUtterances.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Utterances/BaseTestUtterances.cs @@ -4,7 +4,7 @@ using Microsoft.Bot.Builder.AI.Luis; using static Luis.EmailLuis; -namespace EmailSkillTest.Flow.Utterances +namespace EmailSkill.Tests.Flow.Utterances { public class BaseTestUtterances : Dictionary { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/DeleteEmailUtterances.cs b/skills/csharp/tests/emailskill.tests/Flow/Utterances/DeleteEmailUtterances.cs similarity index 94% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/DeleteEmailUtterances.cs rename to skills/csharp/tests/emailskill.tests/Flow/Utterances/DeleteEmailUtterances.cs index 19a6970a8b..106b149635 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/DeleteEmailUtterances.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Utterances/DeleteEmailUtterances.cs @@ -1,6 +1,6 @@ using Luis; -namespace EmailSkillTest.Flow.Utterances +namespace EmailSkill.Tests.Flow.Utterances { public class DeleteEmailUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ForwardEmailUtterances.cs b/skills/csharp/tests/emailskill.tests/Flow/Utterances/ForwardEmailUtterances.cs similarity index 95% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ForwardEmailUtterances.cs rename to skills/csharp/tests/emailskill.tests/Flow/Utterances/ForwardEmailUtterances.cs index 3d7d9f633f..6d81d95eaa 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ForwardEmailUtterances.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Utterances/ForwardEmailUtterances.cs @@ -1,7 +1,7 @@ -using EmailSkillTest.Flow.Strings; +using EmailSkill.Tests.Flow.Strings; using Luis; -namespace EmailSkillTest.Flow.Utterances +namespace EmailSkill.Tests.Flow.Utterances { public class ForwardEmailUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/GeneralTestUtterances.cs b/skills/csharp/tests/emailskill.tests/Flow/Utterances/GeneralTestUtterances.cs similarity index 97% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/GeneralTestUtterances.cs rename to skills/csharp/tests/emailskill.tests/Flow/Utterances/GeneralTestUtterances.cs index e87b0e27dd..9f9db0d9e9 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/GeneralTestUtterances.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Utterances/GeneralTestUtterances.cs @@ -3,7 +3,7 @@ using Microsoft.Bot.Builder; using static Luis.General; -namespace EmailSkillTest.Flow.Utterances +namespace EmailSkill.Tests.Flow.Utterances { public class GeneralTestUtterances : Dictionary { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ReplyEmailUtterances.cs b/skills/csharp/tests/emailskill.tests/Flow/Utterances/ReplyEmailUtterances.cs similarity index 93% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ReplyEmailUtterances.cs rename to skills/csharp/tests/emailskill.tests/Flow/Utterances/ReplyEmailUtterances.cs index 203f0ece73..adcf29a767 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ReplyEmailUtterances.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Utterances/ReplyEmailUtterances.cs @@ -1,7 +1,7 @@ -using EmailSkillTest.Flow.Strings; +using EmailSkill.Tests.Flow.Strings; using Luis; -namespace EmailSkillTest.Flow.Utterances +namespace EmailSkill.Tests.Flow.Utterances { public class ReplyEmailUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/SendEmailUtterances.cs b/skills/csharp/tests/emailskill.tests/Flow/Utterances/SendEmailUtterances.cs similarity index 97% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/SendEmailUtterances.cs rename to skills/csharp/tests/emailskill.tests/Flow/Utterances/SendEmailUtterances.cs index ff76698a9c..9424258088 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/SendEmailUtterances.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Utterances/SendEmailUtterances.cs @@ -1,7 +1,7 @@ -using EmailSkillTest.Flow.Strings; +using EmailSkill.Tests.Flow.Strings; using Luis; -namespace EmailSkillTest.Flow.Utterances +namespace EmailSkill.Tests.Flow.Utterances { public class SendEmailUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ShowEmailUtterances.cs b/skills/csharp/tests/emailskill.tests/Flow/Utterances/ShowEmailUtterances.cs similarity index 90% rename from skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ShowEmailUtterances.cs rename to skills/csharp/tests/emailskill.tests/Flow/Utterances/ShowEmailUtterances.cs index 89c092f84d..e8de7aa4cc 100644 --- a/skills/src/csharp/emailskill/emailskilltest/Flow/Utterances/ShowEmailUtterances.cs +++ b/skills/csharp/tests/emailskill.tests/Flow/Utterances/ShowEmailUtterances.cs @@ -1,7 +1,7 @@ -using EmailSkillTest.Flow.Strings; +using EmailSkill.Tests.Flow.Strings; using Luis; -namespace EmailSkillTest.Flow.Utterances +namespace EmailSkill.Tests.Flow.Utterances { public class ShowEmailUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Common/ContactDeduplicatorTests.cs b/skills/csharp/tests/phoneskill.tests/Common/ContactDeduplicatorTests.cs similarity index 99% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Common/ContactDeduplicatorTests.cs rename to skills/csharp/tests/phoneskill.tests/Common/ContactDeduplicatorTests.cs index aeadc41cde..872795a158 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Common/ContactDeduplicatorTests.cs +++ b/skills/csharp/tests/phoneskill.tests/Common/ContactDeduplicatorTests.cs @@ -4,7 +4,7 @@ using PhoneSkill.Common; using PhoneSkill.Models; -namespace PhoneSkillTest.Common +namespace PhoneSkill.Tests.Common { [TestClass] public class ContactDeduplicatorTests diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/GeneralSkillFlowTests.cs b/skills/csharp/tests/phoneskill.tests/Flow/GeneralSkillFlowTests.cs similarity index 92% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/GeneralSkillFlowTests.cs rename to skills/csharp/tests/phoneskill.tests/Flow/GeneralSkillFlowTests.cs index 9bb4bcc374..e3d56cf09b 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/GeneralSkillFlowTests.cs +++ b/skills/csharp/tests/phoneskill.tests/Flow/GeneralSkillFlowTests.cs @@ -3,9 +3,9 @@ using Microsoft.Bot.Schema; using Microsoft.VisualStudio.TestTools.UnitTesting; using PhoneSkill.Responses.Shared; -using PhoneSkillTest.Flow.Utterances; +using PhoneSkill.Tests.Flow.Utterances; -namespace PhoneSkillTest.Flow +namespace PhoneSkill.Tests.Flow { [TestClass] public class GeneralSkillFlowTests : PhoneSkillTestBase diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/InterruptionTests.cs b/skills/csharp/tests/phoneskill.tests/Flow/InterruptionTests.cs similarity index 94% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/InterruptionTests.cs rename to skills/csharp/tests/phoneskill.tests/Flow/InterruptionTests.cs index a6b5c4a20e..53b1925697 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/InterruptionTests.cs +++ b/skills/csharp/tests/phoneskill.tests/Flow/InterruptionTests.cs @@ -2,9 +2,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using PhoneSkill.Responses.Main; using PhoneSkill.Responses.OutgoingCall; -using PhoneSkillTest.Flow.Utterances; +using PhoneSkill.Tests.Flow.Utterances; -namespace PhoneSkillTest.Flow +namespace PhoneSkill.Tests.Flow { [TestClass] public class InterruptionTests : PhoneSkillTestBase diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/MainDialogTests.cs b/skills/csharp/tests/phoneskill.tests/Flow/MainDialogTests.cs similarity index 91% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/MainDialogTests.cs rename to skills/csharp/tests/phoneskill.tests/Flow/MainDialogTests.cs index de810f7a1a..b16c8f581a 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/MainDialogTests.cs +++ b/skills/csharp/tests/phoneskill.tests/Flow/MainDialogTests.cs @@ -2,9 +2,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using PhoneSkill.Responses.Main; using PhoneSkill.Responses.Shared; -using PhoneSkillTest.Flow.Utterances; +using PhoneSkill.Tests.Flow.Utterances; -namespace PhoneSkillTest.Flow +namespace PhoneSkill.Tests.Flow { [TestClass] public class MainDialogTests : PhoneSkillTestBase diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/OutgoingCallDialogTests.cs b/skills/csharp/tests/phoneskill.tests/Flow/OutgoingCallDialogTests.cs similarity index 99% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/OutgoingCallDialogTests.cs rename to skills/csharp/tests/phoneskill.tests/Flow/OutgoingCallDialogTests.cs index 252ae924bd..c9939ee1ac 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/OutgoingCallDialogTests.cs +++ b/skills/csharp/tests/phoneskill.tests/Flow/OutgoingCallDialogTests.cs @@ -4,10 +4,10 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using PhoneSkill.Models; using PhoneSkill.Responses.OutgoingCall; -using PhoneSkillTest.Flow.Utterances; -using PhoneSkillTest.TestDouble; +using PhoneSkill.Tests.Flow.Utterances; +using PhoneSkill.Tests.TestDouble; -namespace PhoneSkillTest.Flow +namespace PhoneSkill.Tests.Flow { [TestClass] public class OutgoingCallDialogTests : PhoneSkillTestBase diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/PhoneSkillTestBase.cs b/skills/csharp/tests/phoneskill.tests/Flow/PhoneSkillTestBase.cs similarity index 99% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/PhoneSkillTestBase.cs rename to skills/csharp/tests/phoneskill.tests/Flow/PhoneSkillTestBase.cs index 0a5f9376a5..dbecc0312d 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/PhoneSkillTestBase.cs +++ b/skills/csharp/tests/phoneskill.tests/Flow/PhoneSkillTestBase.cs @@ -24,9 +24,9 @@ using PhoneSkill.Responses.OutgoingCall; using PhoneSkill.Responses.Shared; using PhoneSkill.Services; -using PhoneSkillTest.TestDouble; +using PhoneSkill.Tests.TestDouble; -namespace PhoneSkillTest.Flow +namespace PhoneSkill.Tests.Flow { public class PhoneSkillTestBase : BotTestBase { diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/GeneralUtterances.Designer.cs b/skills/csharp/tests/phoneskill.tests/Flow/Utterances/GeneralUtterances.Designer.cs similarity index 95% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/GeneralUtterances.Designer.cs rename to skills/csharp/tests/phoneskill.tests/Flow/Utterances/GeneralUtterances.Designer.cs index 0e76601133..ec0db7ba97 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/GeneralUtterances.Designer.cs +++ b/skills/csharp/tests/phoneskill.tests/Flow/Utterances/GeneralUtterances.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace PhoneSkillTest.Flow.Utterances { +namespace PhoneSkill.Tests.Flow.Utterances { using System; @@ -39,7 +39,7 @@ internal GeneralUtterances() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PhoneSkillTest.Flow.Utterances.GeneralUtterances", typeof(GeneralUtterances).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PhoneSkill.Tests.Flow.Utterances.GeneralUtterances", typeof(GeneralUtterances).Assembly); resourceMan = temp; } return resourceMan; diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/GeneralUtterances.resx b/skills/csharp/tests/phoneskill.tests/Flow/Utterances/GeneralUtterances.resx similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/GeneralUtterances.resx rename to skills/csharp/tests/phoneskill.tests/Flow/Utterances/GeneralUtterances.resx diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/OutgoingCallUtterances.Designer.cs b/skills/csharp/tests/phoneskill.tests/Flow/Utterances/OutgoingCallUtterances.Designer.cs similarity index 98% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/OutgoingCallUtterances.Designer.cs rename to skills/csharp/tests/phoneskill.tests/Flow/Utterances/OutgoingCallUtterances.Designer.cs index 8c36a7f0c1..2ef6792c11 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/OutgoingCallUtterances.Designer.cs +++ b/skills/csharp/tests/phoneskill.tests/Flow/Utterances/OutgoingCallUtterances.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace PhoneSkillTest.Flow.Utterances { +namespace PhoneSkill.Tests.Flow.Utterances { using System; @@ -39,7 +39,7 @@ internal OutgoingCallUtterances() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PhoneSkillTest.Flow.Utterances.OutgoingCallUtterances", typeof(OutgoingCallUtterances).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PhoneSkill.Tests.Flow.Utterances.OutgoingCallUtterances", typeof(OutgoingCallUtterances).Assembly); resourceMan = temp; } return resourceMan; diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/OutgoingCallUtterances.resx b/skills/csharp/tests/phoneskill.tests/Flow/Utterances/OutgoingCallUtterances.resx similarity index 100% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/Flow/Utterances/OutgoingCallUtterances.resx rename to skills/csharp/tests/phoneskill.tests/Flow/Utterances/OutgoingCallUtterances.resx diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/PhoneSkillTest.csproj b/skills/csharp/tests/phoneskill.tests/PhoneSkill.Tests.csproj similarity index 90% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/PhoneSkillTest.csproj rename to skills/csharp/tests/phoneskill.tests/PhoneSkill.Tests.csproj index bf996dc42b..b54d6a9386 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/PhoneSkillTest.csproj +++ b/skills/csharp/tests/phoneskill.tests/PhoneSkill.Tests.csproj @@ -7,6 +7,7 @@ + @@ -37,7 +38,7 @@ - + diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/FakeServiceManager.cs b/skills/csharp/tests/phoneskill.tests/TestDouble/FakeServiceManager.cs similarity index 92% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/FakeServiceManager.cs rename to skills/csharp/tests/phoneskill.tests/TestDouble/FakeServiceManager.cs index 0d28c2a899..cd033104cb 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/FakeServiceManager.cs +++ b/skills/csharp/tests/phoneskill.tests/TestDouble/FakeServiceManager.cs @@ -2,7 +2,7 @@ using PhoneSkill.Models; using PhoneSkill.Services; -namespace PhoneSkillTest.TestDouble +namespace PhoneSkill.Tests.TestDouble { public class FakeServiceManager : IServiceManager { diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/MockLuisEntity.cs b/skills/csharp/tests/phoneskill.tests/TestDouble/MockLuisEntity.cs similarity index 96% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/MockLuisEntity.cs rename to skills/csharp/tests/phoneskill.tests/TestDouble/MockLuisEntity.cs index bed86db255..fedd651d51 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/MockLuisEntity.cs +++ b/skills/csharp/tests/phoneskill.tests/TestDouble/MockLuisEntity.cs @@ -1,4 +1,4 @@ -namespace PhoneSkillTest.TestDouble +namespace PhoneSkill.Tests.TestDouble { /// /// Information about an entity to be returned by a MockLuisRecognizer. diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/MockLuisRecognizerBuilder.cs b/skills/csharp/tests/phoneskill.tests/TestDouble/MockLuisRecognizerBuilder.cs similarity index 99% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/MockLuisRecognizerBuilder.cs rename to skills/csharp/tests/phoneskill.tests/TestDouble/MockLuisRecognizerBuilder.cs index aeff1d7fa9..c5e7543ce6 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/MockLuisRecognizerBuilder.cs +++ b/skills/csharp/tests/phoneskill.tests/TestDouble/MockLuisRecognizerBuilder.cs @@ -4,7 +4,7 @@ using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Solutions.Testing.Mocks; -namespace PhoneSkillTest.TestDouble +namespace PhoneSkill.Tests.TestDouble { /// /// Builder for MockLuisRecognizer's. diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/PhoneSkillMockLuisRecognizerFactory.cs b/skills/csharp/tests/phoneskill.tests/TestDouble/PhoneSkillMockLuisRecognizerFactory.cs similarity index 99% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/PhoneSkillMockLuisRecognizerFactory.cs rename to skills/csharp/tests/phoneskill.tests/TestDouble/PhoneSkillMockLuisRecognizerFactory.cs index a182ecc2b6..55fbef4baa 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/PhoneSkillMockLuisRecognizerFactory.cs +++ b/skills/csharp/tests/phoneskill.tests/TestDouble/PhoneSkillMockLuisRecognizerFactory.cs @@ -2,9 +2,9 @@ using Luis; using Microsoft.Bot.Builder.Solutions.Testing.Mocks; using PhoneSkill.Services.Luis; -using PhoneSkillTest.Flow.Utterances; +using PhoneSkill.Tests.Flow.Utterances; -namespace PhoneSkillTest.TestDouble +namespace PhoneSkill.Tests.TestDouble { public class PhoneSkillMockLuisRecognizerFactory { diff --git a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/StubContactProvider.cs b/skills/csharp/tests/phoneskill.tests/TestDouble/StubContactProvider.cs similarity index 99% rename from skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/StubContactProvider.cs rename to skills/csharp/tests/phoneskill.tests/TestDouble/StubContactProvider.cs index 942a0e642b..1d59ad4389 100644 --- a/skills/src/csharp/experimental/phoneskill/phoneskilltest/TestDouble/StubContactProvider.cs +++ b/skills/csharp/tests/phoneskill.tests/TestDouble/StubContactProvider.cs @@ -3,7 +3,7 @@ using PhoneSkill.Common; using PhoneSkill.Models; -namespace PhoneSkillTest.TestDouble +namespace PhoneSkill.Tests.TestDouble { public class StubContactProvider : IContactProvider { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/AzureMapsGeoSpatialServiceTests.cs b/skills/csharp/tests/pointofinterestskill.tests/API/AzureMapsGeoSpatialServiceTests.cs similarity index 98% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/AzureMapsGeoSpatialServiceTests.cs rename to skills/csharp/tests/pointofinterestskill.tests/API/AzureMapsGeoSpatialServiceTests.cs index 559f6d16f4..17143120f2 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/AzureMapsGeoSpatialServiceTests.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/API/AzureMapsGeoSpatialServiceTests.cs @@ -2,9 +2,9 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using PointOfInterestSkill.Services; -using PointOfInterestSkillTests.API.Fakes; +using PointOfInterestSkill.Tests.API.Fakes; -namespace PointOfInterestSkillTests.API +namespace PointOfInterestSkill.Tests.API { [TestClass] public class AzureMapsGeoSpatialServiceTests diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockData.cs b/skills/csharp/tests/pointofinterestskill.tests/API/Fakes/MockData.cs similarity index 92% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockData.cs rename to skills/csharp/tests/pointofinterestskill.tests/API/Fakes/MockData.cs index 9b2c8c6c4e..8b2eed9ccd 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockData.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/API/Fakes/MockData.cs @@ -1,4 +1,4 @@ -namespace PointOfInterestSkillTests.API.Fakes +namespace PointOfInterestSkill.Tests.API.Fakes { public static class MockData { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockHttpClientHandlerGen.cs b/skills/csharp/tests/pointofinterestskill.tests/API/Fakes/MockHttpClientHandlerGen.cs similarity index 99% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockHttpClientHandlerGen.cs rename to skills/csharp/tests/pointofinterestskill.tests/API/Fakes/MockHttpClientHandlerGen.cs index 8862117bdb..2db34ce962 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/Fakes/MockHttpClientHandlerGen.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/API/Fakes/MockHttpClientHandlerGen.cs @@ -5,7 +5,7 @@ using Moq; using Moq.Protected; -namespace PointOfInterestSkillTests.API.Fakes +namespace PointOfInterestSkill.Tests.API.Fakes { public class MockHttpClientHandlerGen { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/FoursquareGeoSpatialServiceTests.cs b/skills/csharp/tests/pointofinterestskill.tests/API/FoursquareGeoSpatialServiceTests.cs similarity index 98% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/FoursquareGeoSpatialServiceTests.cs rename to skills/csharp/tests/pointofinterestskill.tests/API/FoursquareGeoSpatialServiceTests.cs index 8c4a090cf6..3d625f3547 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/API/FoursquareGeoSpatialServiceTests.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/API/FoursquareGeoSpatialServiceTests.cs @@ -2,9 +2,9 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using PointOfInterestSkill.Services; -using PointOfInterestSkillTests.API.Fakes; +using PointOfInterestSkill.Tests.API.Fakes; -namespace PointOfInterestSkillTests.API +namespace PointOfInterestSkill.Tests.API { [TestClass] public class FoursquareGeoSpatialServiceTests diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockGeneralLuisRecognizer.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockGeneralLuisRecognizer.cs similarity index 95% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockGeneralLuisRecognizer.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockGeneralLuisRecognizer.cs index 052d63836c..a510f9dfc8 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockGeneralLuisRecognizer.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockGeneralLuisRecognizer.cs @@ -6,9 +6,9 @@ using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Dialogs; -using PointOfInterestSkillTests.Flow.Utterances; +using PointOfInterestSkill.Tests.Flow.Utterances; -namespace PointOfInterestSkillTests.Flow.Fakes +namespace PointOfInterestSkill.Tests.Flow.Fakes { public class MockGeneralLuisRecognizer : ITelemetryRecognizer { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockPointOfInterestLuisRecognizer.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockPointOfInterestLuisRecognizer.cs similarity index 96% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockPointOfInterestLuisRecognizer.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockPointOfInterestLuisRecognizer.cs index 2b9f49cea7..df95a05390 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockPointOfInterestLuisRecognizer.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockPointOfInterestLuisRecognizer.cs @@ -6,9 +6,9 @@ using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Dialogs; -using PointOfInterestSkillTests.Flow.Utterances; +using PointOfInterestSkill.Tests.Flow.Utterances; -namespace PointOfInterestSkillTests.Flow.Fakes +namespace PointOfInterestSkill.Tests.Flow.Fakes { public class MockPointOfInterestLuisRecognizer : ITelemetryRecognizer { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockServiceManager.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockServiceManager.cs similarity index 98% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockServiceManager.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockServiceManager.cs index c39a3981d6..d61767bf28 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Fakes/MockServiceManager.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Fakes/MockServiceManager.cs @@ -2,7 +2,7 @@ using System.Net.Http; using PointOfInterestSkill.Services; -namespace PointOfInterestSkillTests.API.Fakes +namespace PointOfInterestSkill.Tests.API.Fakes { public class MockServiceManager : IServiceManager { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/GeneralSkillFlowTests.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/GeneralSkillFlowTests.cs similarity index 84% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/GeneralSkillFlowTests.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/GeneralSkillFlowTests.cs index 88dafa8bda..f3bc92cf70 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/GeneralSkillFlowTests.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/GeneralSkillFlowTests.cs @@ -7,12 +7,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using PointOfInterestSkill.Responses.Main; using PointOfInterestSkill.Responses.Shared; -using PointOfInterestSkillTests.Flow.Utterances; +using PointOfInterestSkill.Tests.Flow.Utterances; -namespace PointOfInterestSkillTests.Flow +namespace PointOfInterestSkill.Tests.Flow { [TestClass] - public class GeneralSkillFlowTests : PointOfInterestTestBase + public class GeneralSkillFlowTests : PointOfInterestSkillTestBase { [TestMethod] public async Task Test_SingleTurnCompletion() diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/PointOfInterestDialogTests.cs similarity index 98% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/PointOfInterestDialogTests.cs index a0b0254974..04e1ac8c79 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestDialogTests.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/PointOfInterestDialogTests.cs @@ -12,13 +12,13 @@ using PointOfInterestSkill.Responses.FindPointOfInterest; using PointOfInterestSkill.Responses.Route; using PointOfInterestSkill.Responses.Shared; -using PointOfInterestSkillTests.Flow.Strings; -using PointOfInterestSkillTests.Flow.Utterances; +using PointOfInterestSkill.Tests.Flow.Strings; +using PointOfInterestSkill.Tests.Flow.Utterances; -namespace PointOfInterestSkillTests.Flow +namespace PointOfInterestSkill.Tests.Flow { [TestClass] - public class PointOfInterestDialogTests : PointOfInterestTestBase + public class PointOfInterestDialogTests : PointOfInterestSkillTestBase { /// /// Find nearest points of interest nearby. diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestTestBase.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/PointOfInterestSkillTestBase.cs similarity index 87% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestTestBase.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/PointOfInterestSkillTestBase.cs index 3b75c1ba54..1b41e57558 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/PointOfInterestTestBase.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/PointOfInterestSkillTestBase.cs @@ -19,12 +19,12 @@ using PointOfInterestSkill.Responses.Route; using PointOfInterestSkill.Responses.Shared; using PointOfInterestSkill.Services; -using PointOfInterestSkillTests.API.Fakes; -using PointOfInterestSkillTests.Flow.Utterances; +using PointOfInterestSkill.Tests.API.Fakes; +using PointOfInterestSkill.Tests.Flow.Utterances; -namespace PointOfInterestSkillTests.Flow +namespace PointOfInterestSkill.Tests.Flow { - public class PointOfInterestTestBase : BotTestBase + public class PointOfInterestSkillTestBase : BotTestBase { public IServiceCollection Services { get; set; } @@ -76,11 +76,11 @@ public override void Initialize() ResponseManager = new ResponseManager( new string[] { "en", "de", "es", "fr", "it", "zh" }, - new POISharedResponses(), - new RouteResponses(), - new FindPointOfInterestResponses(), - new POIMainResponses(), - new CancelRouteResponses()); + new POISharedResponses(), + new RouteResponses(), + new FindPointOfInterestResponses(), + new POIMainResponses(), + new CancelRouteResponses()); Services.AddSingleton(ResponseManager); @@ -88,10 +88,10 @@ public override void Initialize() Services.AddSingleton(); Services.AddSingleton(); Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); Services.AddTransient(); Services.AddTransient>(); diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Strings/CardStrings.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Strings/CardStrings.cs similarity index 89% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Strings/CardStrings.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Strings/CardStrings.cs index 41510f8858..ef6ee1244e 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Strings/CardStrings.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Strings/CardStrings.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace PointOfInterestSkillTests.Flow.Strings +namespace PointOfInterestSkill.Tests.Flow.Strings { public class CardStrings { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Strings/ContextStrings.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Strings/ContextStrings.cs similarity index 87% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Strings/ContextStrings.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Strings/ContextStrings.cs index f340e8b303..e14e1a6eed 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Strings/ContextStrings.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Strings/ContextStrings.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace PointOfInterestSkillTests.Flow.Strings +namespace PointOfInterestSkill.Tests.Flow.Strings { public class ContextStrings { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/BaseTestUtterances.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/BaseTestUtterances.cs similarity index 95% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/BaseTestUtterances.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/BaseTestUtterances.cs index 0c621e0c70..56a834ba2c 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/BaseTestUtterances.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/BaseTestUtterances.cs @@ -3,10 +3,10 @@ using System.Text; using Luis; using Microsoft.Bot.Builder; -using PointOfInterestSkillTests.Flow.Strings; +using PointOfInterestSkill.Tests.Flow.Strings; using static Luis.PointOfInterestLuis; -namespace PointOfInterestSkillTests.Flow.Utterances +namespace PointOfInterestSkill.Tests.Flow.Utterances { public class BaseTestUtterances : Dictionary { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/FindParkingUtterances.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/FindParkingUtterances.cs similarity index 90% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/FindParkingUtterances.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/FindParkingUtterances.cs index 44d19f73cf..6d9101d522 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/FindParkingUtterances.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/FindParkingUtterances.cs @@ -1,8 +1,8 @@ using Luis; using PointOfInterestSkill.Services; -using PointOfInterestSkillTests.Flow.Strings; +using PointOfInterestSkill.Tests.Flow.Strings; -namespace PointOfInterestSkillTests.Flow.Utterances +namespace PointOfInterestSkill.Tests.Flow.Utterances { public class FindParkingUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/FindPointOfInterestUtterances.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/FindPointOfInterestUtterances.cs similarity index 92% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/FindPointOfInterestUtterances.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/FindPointOfInterestUtterances.cs index d290df9c20..87066a6321 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/FindPointOfInterestUtterances.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/FindPointOfInterestUtterances.cs @@ -1,7 +1,7 @@ using Luis; using PointOfInterestSkill.Services; -namespace PointOfInterestSkillTests.Flow.Utterances +namespace PointOfInterestSkill.Tests.Flow.Utterances { public class FindPointOfInterestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralTestUtterances.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/GeneralTestUtterances.cs similarity index 92% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralTestUtterances.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/GeneralTestUtterances.cs index f867f6a30e..243bdf75d7 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/GeneralTestUtterances.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/GeneralTestUtterances.cs @@ -5,7 +5,7 @@ using Microsoft.Bot.Builder; using static Luis.General; -namespace PointOfInterestSkillTests.Flow.Utterances +namespace PointOfInterestSkill.Tests.Flow.Utterances { public class GeneralTestUtterances : Dictionary { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/RouteFromXToYUtterances.cs b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/RouteFromXToYUtterances.cs similarity index 91% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/RouteFromXToYUtterances.cs rename to skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/RouteFromXToYUtterances.cs index 56c0ca025d..24d30ee160 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/Flow/Utterances/RouteFromXToYUtterances.cs +++ b/skills/csharp/tests/pointofinterestskill.tests/Flow/Utterances/RouteFromXToYUtterances.cs @@ -1,8 +1,8 @@ using Luis; using PointOfInterestSkill.Services; -using PointOfInterestSkillTests.Flow.Strings; +using PointOfInterestSkill.Tests.Flow.Strings; -namespace PointOfInterestSkillTests.Flow.Utterances +namespace PointOfInterestSkill.Tests.Flow.Utterances { public class RouteFromXToYUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj b/skills/csharp/tests/pointofinterestskill.tests/PointOfInterestSkill.Tests.csproj similarity index 86% rename from skills/src/csharp/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj rename to skills/csharp/tests/pointofinterestskill.tests/PointOfInterestSkill.Tests.csproj index a9fc0acaad..0c41054d4b 100644 --- a/skills/src/csharp/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj +++ b/skills/csharp/tests/pointofinterestskill.tests/PointOfInterestSkill.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockAppSettings.json b/skills/csharp/tests/todoskill.tests/API/Fakes/MockAppSettings.json similarity index 100% rename from skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockAppSettings.json rename to skills/csharp/tests/todoskill.tests/API/Fakes/MockAppSettings.json diff --git a/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockConfiguration.cs b/skills/csharp/tests/todoskill.tests/API/Fakes/MockConfiguration.cs similarity index 94% rename from skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockConfiguration.cs rename to skills/csharp/tests/todoskill.tests/API/Fakes/MockConfiguration.cs index 34895cb521..45cc250245 100644 --- a/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockConfiguration.cs +++ b/skills/csharp/tests/todoskill.tests/API/Fakes/MockConfiguration.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Primitives; -namespace ToDoSkillTest.API.Fakes +namespace ToDoSkill.Tests.API.Fakes { public static class MockConfiguration { diff --git a/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockData.cs b/skills/csharp/tests/todoskill.tests/API/Fakes/MockData.cs similarity index 93% rename from skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockData.cs rename to skills/csharp/tests/todoskill.tests/API/Fakes/MockData.cs index 0f540e8e54..5ba23fb550 100644 --- a/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockData.cs +++ b/skills/csharp/tests/todoskill.tests/API/Fakes/MockData.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -namespace ToDoSkillTest.API.Fakes +namespace ToDoSkill.Tests.API.Fakes { public static class MockData { diff --git a/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockHttpClientHandlerGen.cs b/skills/csharp/tests/todoskill.tests/API/Fakes/MockHttpClientHandlerGen.cs similarity index 99% rename from skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockHttpClientHandlerGen.cs rename to skills/csharp/tests/todoskill.tests/API/Fakes/MockHttpClientHandlerGen.cs index e58929d4f8..4c9133c406 100644 --- a/skills/src/csharp/todoskill/todoskilltest/API/Fakes/MockHttpClientHandlerGen.cs +++ b/skills/csharp/tests/todoskill.tests/API/Fakes/MockHttpClientHandlerGen.cs @@ -9,7 +9,7 @@ using Newtonsoft.Json.Linq; using ToDoSkill.Models; -namespace ToDoSkillTest.API.Fakes +namespace ToDoSkill.Tests.API.Fakes { public class MockHttpClientHandlerGen { diff --git a/skills/src/csharp/todoskill/todoskilltest/API/OneNoteServiceTests.cs b/skills/csharp/tests/todoskill.tests/API/OneNoteServiceTests.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/API/OneNoteServiceTests.cs rename to skills/csharp/tests/todoskill.tests/API/OneNoteServiceTests.cs index 793ac45bb8..29a208bafc 100644 --- a/skills/src/csharp/todoskill/todoskilltest/API/OneNoteServiceTests.cs +++ b/skills/csharp/tests/todoskill.tests/API/OneNoteServiceTests.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Services; -using ToDoSkillTest.API.Fakes; +using ToDoSkill.Tests.API.Fakes; -namespace ToDoSkillTest.API +namespace ToDoSkill.Tests.API { [TestClass] public class OneNoteServiceTests diff --git a/skills/src/csharp/todoskill/todoskilltest/API/OutlookServiceTests.cs b/skills/csharp/tests/todoskill.tests/API/OutlookServiceTests.cs similarity index 98% rename from skills/src/csharp/todoskill/todoskilltest/API/OutlookServiceTests.cs rename to skills/csharp/tests/todoskill.tests/API/OutlookServiceTests.cs index d5b1634748..726a970119 100644 --- a/skills/src/csharp/todoskill/todoskilltest/API/OutlookServiceTests.cs +++ b/skills/csharp/tests/todoskill.tests/API/OutlookServiceTests.cs @@ -4,9 +4,9 @@ using Microsoft.Bot.Builder.Skills; using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Services; -using ToDoSkillTest.API.Fakes; +using ToDoSkill.Tests.API.Fakes; -namespace ToDoSkillTest.API +namespace ToDoSkill.Tests.API { [TestClass] public class OutlookServiceTests diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/AddToDoFlowTests.cs b/skills/csharp/tests/todoskill.tests/Flow/AddToDoFlowTests.cs similarity index 98% rename from skills/src/csharp/todoskill/todoskilltest/Flow/AddToDoFlowTests.cs rename to skills/csharp/tests/todoskill.tests/Flow/AddToDoFlowTests.cs index 07c4b3abfe..e4ba150768 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/AddToDoFlowTests.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/AddToDoFlowTests.cs @@ -8,13 +8,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Responses.AddToDo; using ToDoSkill.Responses.Shared; -using ToDoSkillTest.Flow.Fakes; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Fakes; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { [TestClass] - public class AddToDoFlowTests : ToDoBotTestBase + public class AddToDoFlowTests : ToDoSkillTestBase { [TestMethod] public async Task Test_AddToDoItem_Prompt_To_Ask_Content() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/DeleteAllToDosFlowTests.cs b/skills/csharp/tests/todoskill.tests/Flow/DeleteAllToDosFlowTests.cs similarity index 96% rename from skills/src/csharp/todoskill/todoskilltest/Flow/DeleteAllToDosFlowTests.cs rename to skills/csharp/tests/todoskill.tests/Flow/DeleteAllToDosFlowTests.cs index 8eff615e4e..c67b9c984e 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/DeleteAllToDosFlowTests.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/DeleteAllToDosFlowTests.cs @@ -8,13 +8,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Responses.DeleteToDo; using ToDoSkill.Responses.Shared; -using ToDoSkillTest.Flow.Fakes; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Fakes; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { [TestClass] - public class DeleteAllToDosFlowTests : ToDoBotTestBase + public class DeleteAllToDosFlowTests : ToDoSkillTestBase { [TestMethod] public async Task Test_DeleteAllToDoItems() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/DeleteToDoFlowTests.cs b/skills/csharp/tests/todoskill.tests/Flow/DeleteToDoFlowTests.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/DeleteToDoFlowTests.cs rename to skills/csharp/tests/todoskill.tests/Flow/DeleteToDoFlowTests.cs index 729c2f91c9..3e7e67f8dd 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/DeleteToDoFlowTests.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/DeleteToDoFlowTests.cs @@ -8,13 +8,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Responses.DeleteToDo; using ToDoSkill.Responses.Shared; -using ToDoSkillTest.Flow.Fakes; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Fakes; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { [TestClass] - public class DeleteToDoFlowTests : ToDoBotTestBase + public class DeleteToDoFlowTests : ToDoSkillTestBase { [TestMethod] public async Task Test_DeleteToDoItem() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/DataOperationType.cs b/skills/csharp/tests/todoskill.tests/Flow/Fakes/DataOperationType.cs similarity index 89% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/DataOperationType.cs rename to skills/csharp/tests/todoskill.tests/Flow/Fakes/DataOperationType.cs index b0ebe15836..92f7fa8a73 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/DataOperationType.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Fakes/DataOperationType.cs @@ -1,4 +1,4 @@ -namespace ToDoSkillTest.Flow.Fakes +namespace ToDoSkill.Tests.Flow.Fakes { public class DataOperationType { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockData.cs b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockData.cs similarity index 99% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockData.cs rename to skills/csharp/tests/todoskill.tests/Flow/Fakes/MockData.cs index 73ed70b7e6..855e67d7b3 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockData.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockData.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using ToDoSkill.Models; -namespace ToDoSkillTest.Flow.Fakes +namespace ToDoSkill.Tests.Flow.Fakes { public static class MockData { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockLuisRecognizer.cs b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockLuisRecognizer.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockLuisRecognizer.cs rename to skills/csharp/tests/todoskill.tests/Flow/Fakes/MockLuisRecognizer.cs index e365d193e1..0988ebff5c 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockLuisRecognizer.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockLuisRecognizer.cs @@ -6,9 +6,9 @@ using Microsoft.Bot.Builder; using Microsoft.Bot.Builder.AI.Luis; using Microsoft.Bot.Builder.Dialogs; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow.Fakes +namespace ToDoSkill.Tests.Flow.Fakes { public class MockLuisRecognizer : ITelemetryRecognizer { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockMailService.cs b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockMailService.cs similarity index 95% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockMailService.cs rename to skills/csharp/tests/todoskill.tests/Flow/Fakes/MockMailService.cs index 27958ee093..460c92bf7a 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockMailService.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockMailService.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using ToDoSkill.Services; -namespace ToDoSkillTest.Fakes +namespace ToDoSkill.Tests.Fakes { public class MockMailService : IMailService { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockServiceManager.cs b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockServiceManager.cs similarity index 91% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockServiceManager.cs rename to skills/csharp/tests/todoskill.tests/Flow/Fakes/MockServiceManager.cs index c8d804393a..fbe6ec8661 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockServiceManager.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockServiceManager.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using ToDoSkill.Models; using ToDoSkill.Services; -using ToDoSkillTest.Fakes; +using ToDoSkill.Tests.Fakes; -namespace ToDoSkillTest.Flow.Fakes +namespace ToDoSkill.Tests.Flow.Fakes { public class MockServiceManager : IServiceManager { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockTaskService.cs b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockTaskService.cs similarity index 99% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockTaskService.cs rename to skills/csharp/tests/todoskill.tests/Flow/Fakes/MockTaskService.cs index 9bb1673aad..ec0733d264 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Fakes/MockTaskService.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Fakes/MockTaskService.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; using ToDoSkill.Models; using ToDoSkill.Services; -using ToDoSkillTest.Flow.Fakes; +using ToDoSkill.Tests.Flow.Fakes; -namespace ToDoSkillTest.Fakes +namespace ToDoSkill.Tests.Fakes { public class MockTaskService : ITaskService { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/GeneralSkillFlowTests.cs b/skills/csharp/tests/todoskill.tests/Flow/GeneralSkillFlowTests.cs similarity index 86% rename from skills/src/csharp/todoskill/todoskilltest/Flow/GeneralSkillFlowTests.cs rename to skills/csharp/tests/todoskill.tests/Flow/GeneralSkillFlowTests.cs index 824248aa04..6c1eb668ca 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/GeneralSkillFlowTests.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/GeneralSkillFlowTests.cs @@ -6,12 +6,12 @@ using Microsoft.Bot.Schema; using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Responses.Main; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { [TestClass] - public class GeneralSkillFlowTests : ToDoBotTestBase + public class GeneralSkillFlowTests : ToDoSkillTestBase { [TestMethod] public async Task Test_SingleTurnCompletion() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/MarkAllToDosFlowTests.cs b/skills/csharp/tests/todoskill.tests/Flow/MarkAllToDosFlowTests.cs similarity index 93% rename from skills/src/csharp/todoskill/todoskilltest/Flow/MarkAllToDosFlowTests.cs rename to skills/csharp/tests/todoskill.tests/Flow/MarkAllToDosFlowTests.cs index b0bc9e4b99..3d2fea1825 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/MarkAllToDosFlowTests.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/MarkAllToDosFlowTests.cs @@ -8,13 +8,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Responses.MarkToDo; using ToDoSkill.Responses.Shared; -using ToDoSkillTest.Flow.Fakes; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Fakes; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { [TestClass] - public class MarkAllToDosFlowTests : ToDoBotTestBase + public class MarkAllToDosFlowTests : ToDoSkillTestBase { [TestMethod] public async Task Test_MarkAllToDoItems() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/MarkToDoFlowTests.cs b/skills/csharp/tests/todoskill.tests/Flow/MarkToDoFlowTests.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/MarkToDoFlowTests.cs rename to skills/csharp/tests/todoskill.tests/Flow/MarkToDoFlowTests.cs index 35c1cf9f16..fe409ce31f 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/MarkToDoFlowTests.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/MarkToDoFlowTests.cs @@ -8,13 +8,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Responses.MarkToDo; using ToDoSkill.Responses.Shared; -using ToDoSkillTest.Flow.Fakes; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Fakes; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { [TestClass] - public class MarkToDoFlowTests : ToDoBotTestBase + public class MarkToDoFlowTests : ToDoSkillTestBase { [TestMethod] public async Task Test_MarkToDoItem() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/ShowToDoFlowTests.cs b/skills/csharp/tests/todoskill.tests/Flow/ShowToDoFlowTests.cs similarity index 98% rename from skills/src/csharp/todoskill/todoskilltest/Flow/ShowToDoFlowTests.cs rename to skills/csharp/tests/todoskill.tests/Flow/ShowToDoFlowTests.cs index 95cc905c5c..9c08037217 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/ShowToDoFlowTests.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/ShowToDoFlowTests.cs @@ -8,13 +8,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using ToDoSkill.Responses.Shared; using ToDoSkill.Responses.ShowToDo; -using ToDoSkillTest.Flow.Fakes; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Fakes; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { [TestClass] - public class ShowToDoFlowTests : ToDoBotTestBase + public class ShowToDoFlowTests : ToDoSkillTestBase { [TestMethod] public async Task Test_ShowToDoItems() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/ToDoBotTestBase.cs b/skills/csharp/tests/todoskill.tests/Flow/ToDoSkillTestBase.cs similarity index 91% rename from skills/src/csharp/todoskill/todoskilltest/Flow/ToDoBotTestBase.cs rename to skills/csharp/tests/todoskill.tests/Flow/ToDoSkillTestBase.cs index 62375c11c9..f718a7d740 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/ToDoBotTestBase.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/ToDoSkillTestBase.cs @@ -26,12 +26,12 @@ using ToDoSkill.Responses.Shared; using ToDoSkill.Responses.ShowToDo; using ToDoSkill.Services; -using ToDoSkillTest.Flow.Fakes; -using ToDoSkillTest.Flow.Utterances; +using ToDoSkill.Tests.Flow.Fakes; +using ToDoSkill.Tests.Flow.Utterances; -namespace ToDoSkillTest.Flow +namespace ToDoSkill.Tests.Flow { - public class ToDoBotTestBase : BotTestBase + public class ToDoSkillTestBase : BotTestBase { public IServiceCollection Services { get; set; } @@ -104,11 +104,11 @@ public override void Initialize() Services.AddSingleton(); Services.AddSingleton(); Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient(); - Services.AddTransient>(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient>(); } public Activity GetAuthResponse() diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/AddToDoFlowTestUtterances.cs b/skills/csharp/tests/todoskill.tests/Flow/Utterances/AddToDoFlowTestUtterances.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/AddToDoFlowTestUtterances.cs rename to skills/csharp/tests/todoskill.tests/Flow/Utterances/AddToDoFlowTestUtterances.cs index 6293a318b6..bfc7671eff 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/AddToDoFlowTestUtterances.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Utterances/AddToDoFlowTestUtterances.cs @@ -1,7 +1,7 @@ using Luis; -using ToDoSkillTest.Flow.Fakes; +using ToDoSkill.Tests.Flow.Fakes; -namespace ToDoSkillTest.Flow.Utterances +namespace ToDoSkill.Tests.Flow.Utterances { public class AddToDoFlowTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/BaseTestUtterances.cs b/skills/csharp/tests/todoskill.tests/Flow/Utterances/BaseTestUtterances.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/BaseTestUtterances.cs rename to skills/csharp/tests/todoskill.tests/Flow/Utterances/BaseTestUtterances.cs index a45c5166f4..cec39dcb8c 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/BaseTestUtterances.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Utterances/BaseTestUtterances.cs @@ -2,7 +2,7 @@ using Luis; using Microsoft.Bot.Builder; -namespace ToDoSkillTest.Flow.Utterances +namespace ToDoSkill.Tests.Flow.Utterances { public class BaseTestUtterances : Dictionary { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/DeleteToDoFlowTestUtterances.cs b/skills/csharp/tests/todoskill.tests/Flow/Utterances/DeleteToDoFlowTestUtterances.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/DeleteToDoFlowTestUtterances.cs rename to skills/csharp/tests/todoskill.tests/Flow/Utterances/DeleteToDoFlowTestUtterances.cs index 09f975192f..48b3c2fc83 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/DeleteToDoFlowTestUtterances.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Utterances/DeleteToDoFlowTestUtterances.cs @@ -1,7 +1,7 @@ using Luis; -using ToDoSkillTest.Flow.Fakes; +using ToDoSkill.Tests.Flow.Fakes; -namespace ToDoSkillTest.Flow.Utterances +namespace ToDoSkill.Tests.Flow.Utterances { public class DeleteToDoFlowTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/GeneralTestUtterances.cs b/skills/csharp/tests/todoskill.tests/Flow/Utterances/GeneralTestUtterances.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/GeneralTestUtterances.cs rename to skills/csharp/tests/todoskill.tests/Flow/Utterances/GeneralTestUtterances.cs index 432fd5335b..7504958854 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/GeneralTestUtterances.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Utterances/GeneralTestUtterances.cs @@ -2,7 +2,7 @@ using Luis; using Microsoft.Bot.Builder; -namespace ToDoSkillTest.Flow.Utterances +namespace ToDoSkill.Tests.Flow.Utterances { public class GeneralTestUtterances : Dictionary { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/MarkToDoFlowTestUtterances.cs b/skills/csharp/tests/todoskill.tests/Flow/Utterances/MarkToDoFlowTestUtterances.cs similarity index 97% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/MarkToDoFlowTestUtterances.cs rename to skills/csharp/tests/todoskill.tests/Flow/Utterances/MarkToDoFlowTestUtterances.cs index c1181fc192..51e0ea3b28 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/MarkToDoFlowTestUtterances.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Utterances/MarkToDoFlowTestUtterances.cs @@ -1,7 +1,7 @@ using Luis; -using ToDoSkillTest.Flow.Fakes; +using ToDoSkill.Tests.Flow.Fakes; -namespace ToDoSkillTest.Flow.Utterances +namespace ToDoSkill.Tests.Flow.Utterances { public class MarkToDoFlowTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/ShowToDoFlowTestUtterances.cs b/skills/csharp/tests/todoskill.tests/Flow/Utterances/ShowToDoFlowTestUtterances.cs similarity index 95% rename from skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/ShowToDoFlowTestUtterances.cs rename to skills/csharp/tests/todoskill.tests/Flow/Utterances/ShowToDoFlowTestUtterances.cs index df4589bc64..e56a67088a 100644 --- a/skills/src/csharp/todoskill/todoskilltest/Flow/Utterances/ShowToDoFlowTestUtterances.cs +++ b/skills/csharp/tests/todoskill.tests/Flow/Utterances/ShowToDoFlowTestUtterances.cs @@ -1,7 +1,7 @@ using Luis; -using ToDoSkillTest.Flow.Fakes; +using ToDoSkill.Tests.Flow.Fakes; -namespace ToDoSkillTest.Flow.Utterances +namespace ToDoSkill.Tests.Flow.Utterances { public class ShowToDoFlowTestUtterances : BaseTestUtterances { diff --git a/skills/src/csharp/todoskill/todoskilltest/ToDoSkillTest.csproj b/skills/csharp/tests/todoskill.tests/ToDoSkill.Tests.csproj similarity index 89% rename from skills/src/csharp/todoskill/todoskilltest/ToDoSkillTest.csproj rename to skills/csharp/tests/todoskill.tests/ToDoSkill.Tests.csproj index 907cb9721b..26a02598f0 100644 --- a/skills/src/csharp/todoskill/todoskilltest/ToDoSkillTest.csproj +++ b/skills/csharp/tests/todoskill.tests/ToDoSkill.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/.filenesting.json b/skills/csharp/todoskill/.filenesting.json similarity index 100% rename from skills/src/csharp/pointofinterestskill/pointofinterestskill/.filenesting.json rename to skills/csharp/todoskill/.filenesting.json diff --git a/skills/src/csharp/todoskill/todoskill/Adapters/DefaultAdapter.cs b/skills/csharp/todoskill/Adapters/DefaultAdapter.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Adapters/DefaultAdapter.cs rename to skills/csharp/todoskill/Adapters/DefaultAdapter.cs diff --git a/skills/src/csharp/todoskill/todoskill/Adapters/ToDoSkillWebSocketBotAdapter.cs b/skills/csharp/todoskill/Adapters/ToDoSkillWebSocketBotAdapter.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Adapters/ToDoSkillWebSocketBotAdapter.cs rename to skills/csharp/todoskill/Adapters/ToDoSkillWebSocketBotAdapter.cs diff --git a/skills/src/csharp/todoskill/todoskill/Bots/DialogBot.cs b/skills/csharp/todoskill/Bots/DialogBot.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Bots/DialogBot.cs rename to skills/csharp/todoskill/Bots/DialogBot.cs diff --git a/skills/src/csharp/todoskill/todoskill/Content/ShowTodoCard.1.0.json b/skills/csharp/todoskill/Content/ShowTodoCard.1.0.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Content/ShowTodoCard.1.0.json rename to skills/csharp/todoskill/Content/ShowTodoCard.1.0.json diff --git a/skills/src/csharp/todoskill/todoskill/Content/ShowTodoCard.json b/skills/csharp/todoskill/Content/ShowTodoCard.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Content/ShowTodoCard.json rename to skills/csharp/todoskill/Content/ShowTodoCard.json diff --git a/skills/src/csharp/todoskill/todoskill/Content/ShowTodoItem.1.0.json b/skills/csharp/todoskill/Content/ShowTodoItem.1.0.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Content/ShowTodoItem.1.0.json rename to skills/csharp/todoskill/Content/ShowTodoItem.1.0.json diff --git a/skills/src/csharp/todoskill/todoskill/Content/ShowTodoItem.json b/skills/csharp/todoskill/Content/ShowTodoItem.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Content/ShowTodoItem.json rename to skills/csharp/todoskill/Content/ShowTodoItem.json diff --git a/skills/src/csharp/todoskill/todoskill/Controllers/BotController.cs b/skills/csharp/todoskill/Controllers/BotController.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Controllers/BotController.cs rename to skills/csharp/todoskill/Controllers/BotController.cs diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/de/General.lu b/skills/csharp/todoskill/Deployment/Resources/LU/de/General.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/de/General.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/de/General.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/de/ToDo.lu b/skills/csharp/todoskill/Deployment/Resources/LU/de/ToDo.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/de/ToDo.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/de/ToDo.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/en/General.lu b/skills/csharp/todoskill/Deployment/Resources/LU/en/General.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/en/General.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/en/General.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/en/ToDo.lu b/skills/csharp/todoskill/Deployment/Resources/LU/en/ToDo.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/en/ToDo.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/en/ToDo.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/es/General.lu b/skills/csharp/todoskill/Deployment/Resources/LU/es/General.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/es/General.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/es/General.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/es/ToDo.lu b/skills/csharp/todoskill/Deployment/Resources/LU/es/ToDo.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/es/ToDo.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/es/ToDo.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/fr/General.lu b/skills/csharp/todoskill/Deployment/Resources/LU/fr/General.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/fr/General.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/fr/General.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/fr/ToDo.lu b/skills/csharp/todoskill/Deployment/Resources/LU/fr/ToDo.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/fr/ToDo.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/fr/ToDo.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/it/General.lu b/skills/csharp/todoskill/Deployment/Resources/LU/it/General.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/it/General.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/it/General.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/it/ToDo.lu b/skills/csharp/todoskill/Deployment/Resources/LU/it/ToDo.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/it/ToDo.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/it/ToDo.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/zh/General.lu b/skills/csharp/todoskill/Deployment/Resources/LU/zh/General.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/zh/General.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/zh/General.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/zh/ToDo.lu b/skills/csharp/todoskill/Deployment/Resources/LU/zh/ToDo.lu similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/LU/zh/ToDo.lu rename to skills/csharp/todoskill/Deployment/Resources/LU/zh/ToDo.lu diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/parameters.template.json b/skills/csharp/todoskill/Deployment/Resources/parameters.template.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/parameters.template.json rename to skills/csharp/todoskill/Deployment/Resources/parameters.template.json diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Resources/template.json b/skills/csharp/todoskill/Deployment/Resources/template.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Resources/template.json rename to skills/csharp/todoskill/Deployment/Resources/template.json diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Scripts/deploy.ps1 b/skills/csharp/todoskill/Deployment/Scripts/deploy.ps1 similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Scripts/deploy.ps1 rename to skills/csharp/todoskill/Deployment/Scripts/deploy.ps1 diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Scripts/deploy_cognitive_models.ps1 b/skills/csharp/todoskill/Deployment/Scripts/deploy_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Scripts/deploy_cognitive_models.ps1 rename to skills/csharp/todoskill/Deployment/Scripts/deploy_cognitive_models.ps1 diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Scripts/luis_functions.ps1 b/skills/csharp/todoskill/Deployment/Scripts/luis_functions.ps1 similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Scripts/luis_functions.ps1 rename to skills/csharp/todoskill/Deployment/Scripts/luis_functions.ps1 diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Scripts/publish.ps1 b/skills/csharp/todoskill/Deployment/Scripts/publish.ps1 similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Scripts/publish.ps1 rename to skills/csharp/todoskill/Deployment/Scripts/publish.ps1 diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Scripts/qna_functions.ps1 b/skills/csharp/todoskill/Deployment/Scripts/qna_functions.ps1 similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Scripts/qna_functions.ps1 rename to skills/csharp/todoskill/Deployment/Scripts/qna_functions.ps1 diff --git a/skills/src/csharp/todoskill/todoskill/Deployment/Scripts/update_cognitive_models.ps1 b/skills/csharp/todoskill/Deployment/Scripts/update_cognitive_models.ps1 similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Deployment/Scripts/update_cognitive_models.ps1 rename to skills/csharp/todoskill/Deployment/Scripts/update_cognitive_models.ps1 diff --git a/skills/src/csharp/todoskill/todoskill/Dialogs/AddToDoItemDialog.cs b/skills/csharp/todoskill/Dialogs/AddToDoItemDialog.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Dialogs/AddToDoItemDialog.cs rename to skills/csharp/todoskill/Dialogs/AddToDoItemDialog.cs diff --git a/skills/src/csharp/todoskill/todoskill/Dialogs/DeleteToDoItemDialog.cs b/skills/csharp/todoskill/Dialogs/DeleteToDoItemDialog.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Dialogs/DeleteToDoItemDialog.cs rename to skills/csharp/todoskill/Dialogs/DeleteToDoItemDialog.cs diff --git a/skills/src/csharp/todoskill/todoskill/Dialogs/MainDialog.cs b/skills/csharp/todoskill/Dialogs/MainDialog.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Dialogs/MainDialog.cs rename to skills/csharp/todoskill/Dialogs/MainDialog.cs diff --git a/skills/src/csharp/todoskill/todoskill/Dialogs/MarkToDoItemDialog.cs b/skills/csharp/todoskill/Dialogs/MarkToDoItemDialog.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Dialogs/MarkToDoItemDialog.cs rename to skills/csharp/todoskill/Dialogs/MarkToDoItemDialog.cs diff --git a/skills/src/csharp/todoskill/todoskill/Dialogs/ShowToDoItemDialog.cs b/skills/csharp/todoskill/Dialogs/ShowToDoItemDialog.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Dialogs/ShowToDoItemDialog.cs rename to skills/csharp/todoskill/Dialogs/ShowToDoItemDialog.cs diff --git a/skills/src/csharp/todoskill/todoskill/Dialogs/ToDoSkillDialogBase.cs b/skills/csharp/todoskill/Dialogs/ToDoSkillDialogBase.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Dialogs/ToDoSkillDialogBase.cs rename to skills/csharp/todoskill/Dialogs/ToDoSkillDialogBase.cs diff --git a/skills/src/csharp/todoskill/todoskill/Models/ServiceProviderType.cs b/skills/csharp/todoskill/Models/ServiceProviderType.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Models/ServiceProviderType.cs rename to skills/csharp/todoskill/Models/ServiceProviderType.cs diff --git a/skills/src/csharp/todoskill/todoskill/Models/TaskItem.cs b/skills/csharp/todoskill/Models/TaskItem.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Models/TaskItem.cs rename to skills/csharp/todoskill/Models/TaskItem.cs diff --git a/skills/src/csharp/todoskill/todoskill/Models/ToDoSkillState.cs b/skills/csharp/todoskill/Models/ToDoSkillState.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Models/ToDoSkillState.cs rename to skills/csharp/todoskill/Models/ToDoSkillState.cs diff --git a/skills/src/csharp/todoskill/todoskill/Models/ToDoSkillUserState.cs b/skills/csharp/todoskill/Models/ToDoSkillUserState.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Models/ToDoSkillUserState.cs rename to skills/csharp/todoskill/Models/ToDoSkillUserState.cs diff --git a/skills/src/csharp/todoskill/todoskill/Models/TodoItemData.cs b/skills/csharp/todoskill/Models/TodoItemData.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Models/TodoItemData.cs rename to skills/csharp/todoskill/Models/TodoItemData.cs diff --git a/skills/src/csharp/todoskill/todoskill/Models/TodoListData.cs b/skills/csharp/todoskill/Models/TodoListData.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Models/TodoListData.cs rename to skills/csharp/todoskill/Models/TodoListData.cs diff --git a/skills/src/csharp/todoskill/todoskill/Program.cs b/skills/csharp/todoskill/Program.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Program.cs rename to skills/csharp/todoskill/Program.cs diff --git a/skills/src/csharp/todoskill/todoskill/Properties/launchSettings.json b/skills/csharp/todoskill/Properties/launchSettings.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Properties/launchSettings.json rename to skills/csharp/todoskill/Properties/launchSettings.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.cs b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.cs rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.de.json b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.de.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.de.json rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.de.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.es.json b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.es.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.es.json rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.es.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.fr.json b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.fr.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.fr.json rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.fr.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.it.json b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.it.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.it.json rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.it.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.json b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.json rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.tt b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.tt similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.tt rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.tt diff --git a/skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.zh.json b/skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.zh.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/AddToDo/AddToDoResponses.zh.json rename to skills/csharp/todoskill/Responses/AddToDo/AddToDoResponses.zh.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.de.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.es.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.fr.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.it.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.tt diff --git a/skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json b/skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json rename to skills/csharp/todoskill/Responses/DeleteToDo/DeleteToDoResponses.zh.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.cs b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.cs rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.de.json b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.de.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.de.json rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.de.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.es.json b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.es.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.es.json rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.es.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.fr.json b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.fr.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.fr.json rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.fr.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.it.json b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.it.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.it.json rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.it.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.json b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.json rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.tt b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.tt similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.tt rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.tt diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.zh.json b/skills/csharp/todoskill/Responses/Main/ToDoMainResponses.zh.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Main/ToDoMainResponses.zh.json rename to skills/csharp/todoskill/Responses/Main/ToDoMainResponses.zh.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.cs b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.cs rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.de.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.es.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.fr.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.it.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.json b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.json rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.tt b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.tt similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.tt rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.tt diff --git a/skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json b/skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json rename to skills/csharp/todoskill/Responses/MarkToDo/MarkToDoResponses.zh.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/IconImageSource.cs b/skills/csharp/todoskill/Responses/Shared/IconImageSource.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/IconImageSource.cs rename to skills/csharp/todoskill/Responses/Shared/IconImageSource.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ResponseIdCollection.t4 b/skills/csharp/todoskill/Responses/Shared/ResponseIdCollection.t4 similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ResponseIdCollection.t4 rename to skills/csharp/todoskill/Responses/Shared/ResponseIdCollection.t4 diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.cs b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.cs rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.de.json b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.de.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.de.json rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.de.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.es.json b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.es.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.es.json rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.es.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.fr.json b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.fr.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.fr.json rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.fr.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.it.json b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.it.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.it.json rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.it.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.json b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.json rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.tt b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.tt similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.tt rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.tt diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.zh.json b/skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.zh.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoSharedResponses.zh.json rename to skills/csharp/todoskill/Responses/Shared/ToDoSharedResponses.zh.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.Designer.cs b/skills/csharp/todoskill/Responses/Shared/ToDoStrings.Designer.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.Designer.cs rename to skills/csharp/todoskill/Responses/Shared/ToDoStrings.Designer.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.de.resx b/skills/csharp/todoskill/Responses/Shared/ToDoStrings.de.resx similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.de.resx rename to skills/csharp/todoskill/Responses/Shared/ToDoStrings.de.resx diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.es.resx b/skills/csharp/todoskill/Responses/Shared/ToDoStrings.es.resx similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.es.resx rename to skills/csharp/todoskill/Responses/Shared/ToDoStrings.es.resx diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.fr.resx b/skills/csharp/todoskill/Responses/Shared/ToDoStrings.fr.resx similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.fr.resx rename to skills/csharp/todoskill/Responses/Shared/ToDoStrings.fr.resx diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.it.resx b/skills/csharp/todoskill/Responses/Shared/ToDoStrings.it.resx similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.it.resx rename to skills/csharp/todoskill/Responses/Shared/ToDoStrings.it.resx diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.resx b/skills/csharp/todoskill/Responses/Shared/ToDoStrings.resx similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.resx rename to skills/csharp/todoskill/Responses/Shared/ToDoStrings.resx diff --git a/skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.zh.resx b/skills/csharp/todoskill/Responses/Shared/ToDoStrings.zh.resx similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/Shared/ToDoStrings.zh.resx rename to skills/csharp/todoskill/Responses/Shared/ToDoStrings.zh.resx diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.cs b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.cs rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.cs diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.de.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.es.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.fr.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.it.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.json b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.json rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.json diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.tt b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.tt similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.tt rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.tt diff --git a/skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json b/skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json rename to skills/csharp/todoskill/Responses/ShowToDo/ShowToDoResponses.zh.json diff --git a/skills/src/csharp/todoskill/todoskill/Services/BotServices.cs b/skills/csharp/todoskill/Services/BotServices.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/BotServices.cs rename to skills/csharp/todoskill/Services/BotServices.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/BotSettings.cs b/skills/csharp/todoskill/Services/BotSettings.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/BotSettings.cs rename to skills/csharp/todoskill/Services/BotSettings.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/IMailService.cs b/skills/csharp/todoskill/Services/IMailService.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/IMailService.cs rename to skills/csharp/todoskill/Services/IMailService.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/IServiceManager.cs b/skills/csharp/todoskill/Services/IServiceManager.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/IServiceManager.cs rename to skills/csharp/todoskill/Services/IServiceManager.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/ITaskService.cs b/skills/csharp/todoskill/Services/ITaskService.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/ITaskService.cs rename to skills/csharp/todoskill/Services/ITaskService.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/MailService.cs b/skills/csharp/todoskill/Services/MailService.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/MailService.cs rename to skills/csharp/todoskill/Services/MailService.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/OneNoteService.cs b/skills/csharp/todoskill/Services/OneNoteService.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/OneNoteService.cs rename to skills/csharp/todoskill/Services/OneNoteService.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/OutlookService.cs b/skills/csharp/todoskill/Services/OutlookService.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/OutlookService.cs rename to skills/csharp/todoskill/Services/OutlookService.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/ServiceHelper.cs b/skills/csharp/todoskill/Services/ServiceHelper.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/ServiceHelper.cs rename to skills/csharp/todoskill/Services/ServiceHelper.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/ServiceManager.cs b/skills/csharp/todoskill/Services/ServiceManager.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/ServiceManager.cs rename to skills/csharp/todoskill/Services/ServiceManager.cs diff --git a/skills/src/csharp/todoskill/todoskill/Services/ToDoLuis.cs b/skills/csharp/todoskill/Services/ToDoLuis.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Services/ToDoLuis.cs rename to skills/csharp/todoskill/Services/ToDoLuis.cs diff --git a/skills/src/csharp/todoskill/todoskill/Startup.cs b/skills/csharp/todoskill/Startup.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Startup.cs rename to skills/csharp/todoskill/Startup.cs diff --git a/skills/src/csharp/todoskill/todoskill/ToDoSkill.csproj b/skills/csharp/todoskill/ToDoSkill.csproj similarity index 100% rename from skills/src/csharp/todoskill/todoskill/ToDoSkill.csproj rename to skills/csharp/todoskill/ToDoSkill.csproj diff --git a/skills/src/csharp/todoskill/todoskill/Utilities/Actions.cs b/skills/csharp/todoskill/Utilities/Actions.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Utilities/Actions.cs rename to skills/csharp/todoskill/Utilities/Actions.cs diff --git a/skills/src/csharp/todoskill/todoskill/Utilities/ToDoCommonUtil.cs b/skills/csharp/todoskill/Utilities/ToDoCommonUtil.cs similarity index 100% rename from skills/src/csharp/todoskill/todoskill/Utilities/ToDoCommonUtil.cs rename to skills/csharp/todoskill/Utilities/ToDoCommonUtil.cs diff --git a/skills/src/csharp/todoskill/todoskill/appsettings.json b/skills/csharp/todoskill/appsettings.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/appsettings.json rename to skills/csharp/todoskill/appsettings.json diff --git a/skills/src/csharp/todoskill/todoskill/cognitivemodels.json b/skills/csharp/todoskill/cognitivemodels.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/cognitivemodels.json rename to skills/csharp/todoskill/cognitivemodels.json diff --git a/skills/src/csharp/todoskill/todoskill/manifestTemplate.json b/skills/csharp/todoskill/manifestTemplate.json similarity index 100% rename from skills/src/csharp/todoskill/todoskill/manifestTemplate.json rename to skills/csharp/todoskill/manifestTemplate.json diff --git a/skills/src/csharp/todoskill/todoskill/readme.md b/skills/csharp/todoskill/readme.md similarity index 100% rename from skills/src/csharp/todoskill/todoskill/readme.md rename to skills/csharp/todoskill/readme.md diff --git a/skills/src/csharp/todoskill/todoskill/wwwroot/default.htm b/skills/csharp/todoskill/wwwroot/default.htm similarity index 100% rename from skills/src/csharp/todoskill/todoskill/wwwroot/default.htm rename to skills/csharp/todoskill/wwwroot/default.htm diff --git a/skills/src/csharp/todoskill/todoskill/wwwroot/images/check.png b/skills/csharp/todoskill/wwwroot/images/check.png similarity index 100% rename from skills/src/csharp/todoskill/todoskill/wwwroot/images/check.png rename to skills/csharp/todoskill/wwwroot/images/check.png diff --git a/skills/src/csharp/todoskill/todoskill/wwwroot/images/check.svg b/skills/csharp/todoskill/wwwroot/images/check.svg similarity index 100% rename from skills/src/csharp/todoskill/todoskill/wwwroot/images/check.svg rename to skills/csharp/todoskill/wwwroot/images/check.svg diff --git a/skills/src/csharp/todoskill/todoskill/wwwroot/images/uncheck.png b/skills/csharp/todoskill/wwwroot/images/uncheck.png similarity index 100% rename from skills/src/csharp/todoskill/todoskill/wwwroot/images/uncheck.png rename to skills/csharp/todoskill/wwwroot/images/uncheck.png diff --git a/skills/src/csharp/todoskill/todoskill/wwwroot/images/uncheck.svg b/skills/csharp/todoskill/wwwroot/images/uncheck.svg similarity index 100% rename from skills/src/csharp/todoskill/todoskill/wwwroot/images/uncheck.svg rename to skills/csharp/todoskill/wwwroot/images/uncheck.svg diff --git a/skills/src/csharp/todoskill/todoskill/.filenesting.json b/skills/src/csharp/todoskill/todoskill/.filenesting.json deleted file mode 100644 index 31783c919e..0000000000 --- a/skills/src/csharp/todoskill/todoskill/.filenesting.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "help": "https://go.microsoft.com/fwlink/?linkid=866610", - "dependentFileProviders": { - "add": { - "pathSegment": { - "add": { - ".*": [ - ".json", - ".resx" - ] - } - }, - "allExtensions": { - "remove": { - ".*": [ - ".tt" - ] - } - } - } - } -} \ No newline at end of file