diff --git a/README.md b/README.md index 7f50e3a3ed..46b26f298f 100644 --- a/README.md +++ b/README.md @@ -82,39 +82,39 @@ |3|Complete Samples | A template for building complex bots (SDK V3) for Microsoft Teams. |[View][app-complete#cs] |[View][app-complete#ts] -[app-hello-world#cs]:csharp/app-hello-world -[app-hello-world#ts]:nodejs/app-hello-world +[app-hello-world#cs]:samples/app-hello-world/csharp +[app-hello-world#ts]:samples/app-hello-world/nodejs -[personal-tab#cs#razor]:csharp/tab-personal-razor -[personal-tab#cs#mvc]:csharp/tab-personal-mvc +[personal-tab#cs#razor]:samples/tab-personal/razor-csharp +[personal-tab#cs#mvc]:samples/tab-personal/mvc-csharp -[group-channel-tab#cs#razor]:csharp/tab-channel-group-razor -[group-channel-tab#cs#mvc]:csharp/tab-channel-group-mvc +[group-channel-tab#cs#razor]:samples/tab-channel-group/razor-csharp +[group-channel-tab#cs#mvc]:samples/tab-channel-group/mvc-csharp -[connector#cs]:csharp/connector-todo-notification -[connector#ts]:nodejs/connector-github-notification -[connector-generic#ts]:nodejs/connector-generic +[connector#cs]:samples/connector-todo-notification/csharp +[connector#ts]:samples/connector-github-notification/nodejs +[connector-generic#ts]:samples/connector-generic/nodejs -[app-auth#ts]:nodejs/app-auth +[app-auth#ts]:samples/app-auth/nodejs -[app-task-module#cs]:csharp/app-task-module -[app-task-module#ts]:nodejs/app-task-module +[app-task-module#cs]:samples/app-task-module/csharp +[app-task-module#ts]:samples/app-task-module/nodejs -[app-complete#cs]:csharp/app-complete-sample -[app-complete#ts]:nodejs/app-complete-sample +[app-complete#cs]:samples/app-complete-sample/csharp +[app-complete#ts]:samples/app-complete-sample/nodejs -[outgoing-webhook#cs]:csharp/outgoing-webhook -[outgoing-webhook#ts]:nodejs/outgoing-webhook +[outgoing-webhook#cs]:samples/outgoing-webhook/csharp +[outgoing-webhook#ts]:samples/outgoing-webhook/nodejs -[msgext-link-unfurl#cs]:csharp/msgext-link-unfurling-reddit +[msgext-link-unfurl#cs]:samples/msgext-link-unfurling-reddit/csharp -[tab-sso#ts]:nodejs/tabs-sso +[tab-sso#ts]:samples/tabs-sso/nodejs -[bot-proactive-msg#cs]:csharp/bot-proactive-messaging +[bot-proactive-msg#cs]:samples/bot-proactive-messaging/csharp -[mtgext-token-app#cs]:csharp/mtgext-token-app +[mtgext-token-app#cs]:samples/mtgext-token-app/csharp [botframework]:https://github.com/microsoft/BotBuilder-Samples#teams-samples diff --git a/nodejs/app-auth/.deployment b/samples/app-auth/nodejs/.deployment similarity index 100% rename from nodejs/app-auth/.deployment rename to samples/app-auth/nodejs/.deployment diff --git a/nodejs/app-auth/.gitignore b/samples/app-auth/nodejs/.gitignore similarity index 100% rename from nodejs/app-auth/.gitignore rename to samples/app-auth/nodejs/.gitignore diff --git a/nodejs/app-auth/.prettierrc b/samples/app-auth/nodejs/.prettierrc similarity index 100% rename from nodejs/app-auth/.prettierrc rename to samples/app-auth/nodejs/.prettierrc diff --git a/nodejs/app-auth/.vscode/launch_example.json b/samples/app-auth/nodejs/.vscode/launch_example.json similarity index 100% rename from nodejs/app-auth/.vscode/launch_example.json rename to samples/app-auth/nodejs/.vscode/launch_example.json diff --git a/nodejs/app-auth/.vscode/tasks.json b/samples/app-auth/nodejs/.vscode/tasks.json similarity index 100% rename from nodejs/app-auth/.vscode/tasks.json rename to samples/app-auth/nodejs/.vscode/tasks.json diff --git a/nodejs/app-auth/README.md b/samples/app-auth/nodejs/README.md similarity index 100% rename from nodejs/app-auth/README.md rename to samples/app-auth/nodejs/README.md diff --git a/nodejs/app-auth/deploy.cmd b/samples/app-auth/nodejs/deploy.cmd similarity index 100% rename from nodejs/app-auth/deploy.cmd rename to samples/app-auth/nodejs/deploy.cmd diff --git a/nodejs/app-auth/fallbackUrl.md b/samples/app-auth/nodejs/fallbackUrl.md similarity index 100% rename from nodejs/app-auth/fallbackUrl.md rename to samples/app-auth/nodejs/fallbackUrl.md diff --git a/nodejs/app-auth/gulpfile.js b/samples/app-auth/nodejs/gulpfile.js similarity index 100% rename from nodejs/app-auth/gulpfile.js rename to samples/app-auth/nodejs/gulpfile.js diff --git a/nodejs/app-auth/iisnode.yml b/samples/app-auth/nodejs/iisnode.yml similarity index 100% rename from nodejs/app-auth/iisnode.yml rename to samples/app-auth/nodejs/iisnode.yml diff --git a/nodejs/app-auth/manifest/color.png b/samples/app-auth/nodejs/manifest/color.png similarity index 100% rename from nodejs/app-auth/manifest/color.png rename to samples/app-auth/nodejs/manifest/color.png diff --git a/nodejs/app-auth/manifest/manifest.json b/samples/app-auth/nodejs/manifest/manifest.json similarity index 100% rename from nodejs/app-auth/manifest/manifest.json rename to samples/app-auth/nodejs/manifest/manifest.json diff --git a/nodejs/app-auth/manifest/outline.png b/samples/app-auth/nodejs/manifest/outline.png similarity index 100% rename from nodejs/app-auth/manifest/outline.png rename to samples/app-auth/nodejs/manifest/outline.png diff --git a/nodejs/app-auth/package-lock.json b/samples/app-auth/nodejs/package-lock.json similarity index 100% rename from nodejs/app-auth/package-lock.json rename to samples/app-auth/nodejs/package-lock.json diff --git a/nodejs/app-auth/package.json b/samples/app-auth/nodejs/package.json similarity index 100% rename from nodejs/app-auth/package.json rename to samples/app-auth/nodejs/package.json diff --git a/nodejs/app-auth/public/assets/favicon.ico b/samples/app-auth/nodejs/public/assets/favicon.ico similarity index 100% rename from nodejs/app-auth/public/assets/favicon.ico rename to samples/app-auth/nodejs/public/assets/favicon.ico diff --git a/nodejs/app-auth/public/html/auth-start.html b/samples/app-auth/nodejs/public/html/auth-start.html similarity index 100% rename from nodejs/app-auth/public/html/auth-start.html rename to samples/app-auth/nodejs/public/html/auth-start.html diff --git a/nodejs/app-auth/public/styles/bot-auth.css b/samples/app-auth/nodejs/public/styles/bot-auth.css similarity index 100% rename from nodejs/app-auth/public/styles/bot-auth.css rename to samples/app-auth/nodejs/public/styles/bot-auth.css diff --git a/nodejs/app-auth/public/styles/msteams-16.css b/samples/app-auth/nodejs/public/styles/msteams-16.css similarity index 100% rename from nodejs/app-auth/public/styles/msteams-16.css rename to samples/app-auth/nodejs/public/styles/msteams-16.css diff --git a/nodejs/app-auth/src/AuthBot.ts b/samples/app-auth/nodejs/src/AuthBot.ts similarity index 100% rename from nodejs/app-auth/src/AuthBot.ts rename to samples/app-auth/nodejs/src/AuthBot.ts diff --git a/nodejs/app-auth/src/UserMappingMiddleware.ts b/samples/app-auth/nodejs/src/UserMappingMiddleware.ts similarity index 100% rename from nodejs/app-auth/src/UserMappingMiddleware.ts rename to samples/app-auth/nodejs/src/UserMappingMiddleware.ts diff --git a/nodejs/app-auth/src/apis/DecodeToken.ts b/samples/app-auth/nodejs/src/apis/DecodeToken.ts similarity index 100% rename from nodejs/app-auth/src/apis/DecodeToken.ts rename to samples/app-auth/nodejs/src/apis/DecodeToken.ts diff --git a/nodejs/app-auth/src/apis/GetProfileFromGraph.ts b/samples/app-auth/nodejs/src/apis/GetProfileFromGraph.ts similarity index 100% rename from nodejs/app-auth/src/apis/GetProfileFromGraph.ts rename to samples/app-auth/nodejs/src/apis/GetProfileFromGraph.ts diff --git a/nodejs/app-auth/src/apis/OpenIdMetadata.ts b/samples/app-auth/nodejs/src/apis/OpenIdMetadata.ts similarity index 100% rename from nodejs/app-auth/src/apis/OpenIdMetadata.ts rename to samples/app-auth/nodejs/src/apis/OpenIdMetadata.ts diff --git a/nodejs/app-auth/src/apis/ValidateAzureADToken.ts b/samples/app-auth/nodejs/src/apis/ValidateAzureADToken.ts similarity index 100% rename from nodejs/app-auth/src/apis/ValidateAzureADToken.ts rename to samples/app-auth/nodejs/src/apis/ValidateAzureADToken.ts diff --git a/nodejs/app-auth/src/apis/index.ts b/samples/app-auth/nodejs/src/apis/index.ts similarity index 100% rename from nodejs/app-auth/src/apis/index.ts rename to samples/app-auth/nodejs/src/apis/index.ts diff --git a/nodejs/app-auth/src/app.ts b/samples/app-auth/nodejs/src/app.ts similarity index 100% rename from nodejs/app-auth/src/app.ts rename to samples/app-auth/nodejs/src/app.ts diff --git a/nodejs/app-auth/src/config/custom-environment-variables.json b/samples/app-auth/nodejs/src/config/custom-environment-variables.json similarity index 100% rename from nodejs/app-auth/src/config/custom-environment-variables.json rename to samples/app-auth/nodejs/src/config/custom-environment-variables.json diff --git a/nodejs/app-auth/src/config/default.json b/samples/app-auth/nodejs/src/config/default.json similarity index 100% rename from nodejs/app-auth/src/config/default.json rename to samples/app-auth/nodejs/src/config/default.json diff --git a/nodejs/app-auth/src/dialogs/AzureADDialog.ts b/samples/app-auth/nodejs/src/dialogs/AzureADDialog.ts similarity index 100% rename from nodejs/app-auth/src/dialogs/AzureADDialog.ts rename to samples/app-auth/nodejs/src/dialogs/AzureADDialog.ts diff --git a/nodejs/app-auth/src/dialogs/GoogleDialog.ts b/samples/app-auth/nodejs/src/dialogs/GoogleDialog.ts similarity index 100% rename from nodejs/app-auth/src/dialogs/GoogleDialog.ts rename to samples/app-auth/nodejs/src/dialogs/GoogleDialog.ts diff --git a/nodejs/app-auth/src/dialogs/IdentityProviderDialog.ts b/samples/app-auth/nodejs/src/dialogs/IdentityProviderDialog.ts similarity index 100% rename from nodejs/app-auth/src/dialogs/IdentityProviderDialog.ts rename to samples/app-auth/nodejs/src/dialogs/IdentityProviderDialog.ts diff --git a/nodejs/app-auth/src/dialogs/LinkedInDialog.ts b/samples/app-auth/nodejs/src/dialogs/LinkedInDialog.ts similarity index 100% rename from nodejs/app-auth/src/dialogs/LinkedInDialog.ts rename to samples/app-auth/nodejs/src/dialogs/LinkedInDialog.ts diff --git a/nodejs/app-auth/src/dialogs/RootDialog.ts b/samples/app-auth/nodejs/src/dialogs/RootDialog.ts similarity index 100% rename from nodejs/app-auth/src/dialogs/RootDialog.ts rename to samples/app-auth/nodejs/src/dialogs/RootDialog.ts diff --git a/nodejs/app-auth/src/utils/Logger.ts b/samples/app-auth/nodejs/src/utils/Logger.ts similarity index 100% rename from nodejs/app-auth/src/utils/Logger.ts rename to samples/app-auth/nodejs/src/utils/Logger.ts diff --git a/nodejs/app-auth/src/utils/index.ts b/samples/app-auth/nodejs/src/utils/index.ts similarity index 100% rename from nodejs/app-auth/src/utils/index.ts rename to samples/app-auth/nodejs/src/utils/index.ts diff --git a/nodejs/app-auth/src/views/oauth-callback-error.hbs b/samples/app-auth/nodejs/src/views/oauth-callback-error.hbs similarity index 100% rename from nodejs/app-auth/src/views/oauth-callback-error.hbs rename to samples/app-auth/nodejs/src/views/oauth-callback-error.hbs diff --git a/nodejs/app-auth/src/views/oauth-callback-success.hbs b/samples/app-auth/nodejs/src/views/oauth-callback-success.hbs similarity index 100% rename from nodejs/app-auth/src/views/oauth-callback-success.hbs rename to samples/app-auth/nodejs/src/views/oauth-callback-success.hbs diff --git a/nodejs/app-auth/src/views/tab/silent/silent-end.hbs b/samples/app-auth/nodejs/src/views/tab/silent/silent-end.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/silent/silent-end.hbs rename to samples/app-auth/nodejs/src/views/tab/silent/silent-end.hbs diff --git a/nodejs/app-auth/src/views/tab/silent/silent-start.hbs b/samples/app-auth/nodejs/src/views/tab/silent/silent-start.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/silent/silent-start.hbs rename to samples/app-auth/nodejs/src/views/tab/silent/silent-start.hbs diff --git a/nodejs/app-auth/src/views/tab/silent/silent.hbs b/samples/app-auth/nodejs/src/views/tab/silent/silent.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/silent/silent.hbs rename to samples/app-auth/nodejs/src/views/tab/silent/silent.hbs diff --git a/nodejs/app-auth/src/views/tab/simple/simple-end.hbs b/samples/app-auth/nodejs/src/views/tab/simple/simple-end.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/simple/simple-end.hbs rename to samples/app-auth/nodejs/src/views/tab/simple/simple-end.hbs diff --git a/nodejs/app-auth/src/views/tab/simple/simple-start-v2.hbs b/samples/app-auth/nodejs/src/views/tab/simple/simple-start-v2.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/simple/simple-start-v2.hbs rename to samples/app-auth/nodejs/src/views/tab/simple/simple-start-v2.hbs diff --git a/nodejs/app-auth/src/views/tab/simple/simple-start.hbs b/samples/app-auth/nodejs/src/views/tab/simple/simple-start.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/simple/simple-start.hbs rename to samples/app-auth/nodejs/src/views/tab/simple/simple-start.hbs diff --git a/nodejs/app-auth/src/views/tab/simple/simple.hbs b/samples/app-auth/nodejs/src/views/tab/simple/simple.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/simple/simple.hbs rename to samples/app-auth/nodejs/src/views/tab/simple/simple.hbs diff --git a/nodejs/app-auth/src/views/tab/sso/sso.hbs b/samples/app-auth/nodejs/src/views/tab/sso/sso.hbs similarity index 100% rename from nodejs/app-auth/src/views/tab/sso/sso.hbs rename to samples/app-auth/nodejs/src/views/tab/sso/sso.hbs diff --git a/nodejs/app-auth/tsconfig.json b/samples/app-auth/nodejs/tsconfig.json similarity index 100% rename from nodejs/app-auth/tsconfig.json rename to samples/app-auth/nodejs/tsconfig.json diff --git a/nodejs/app-auth/tsconfig.prod.json b/samples/app-auth/nodejs/tsconfig.prod.json similarity index 100% rename from nodejs/app-auth/tsconfig.prod.json rename to samples/app-auth/nodejs/tsconfig.prod.json diff --git a/nodejs/app-auth/tslint.json b/samples/app-auth/nodejs/tslint.json similarity index 100% rename from nodejs/app-auth/tslint.json rename to samples/app-auth/nodejs/tslint.json diff --git a/nodejs/app-auth/web.config b/samples/app-auth/nodejs/web.config similarity index 100% rename from nodejs/app-auth/web.config rename to samples/app-auth/nodejs/web.config diff --git a/csharp/app-complete-sample/.gitignore b/samples/app-complete-sample/csharp/.gitignore similarity index 100% rename from csharp/app-complete-sample/.gitignore rename to samples/app-complete-sample/csharp/.gitignore diff --git a/csharp/app-complete-sample/README.md b/samples/app-complete-sample/csharp/README.md similarity index 100% rename from csharp/app-complete-sample/README.md rename to samples/app-complete-sample/csharp/README.md diff --git a/csharp/app-complete-sample/template-bot-master-csharp.sln b/samples/app-complete-sample/csharp/template-bot-master-csharp.sln similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp.sln rename to samples/app-complete-sample/csharp/template-bot-master-csharp.sln diff --git a/csharp/app-complete-sample/template-bot-master-csharp/App_Start/WebApiConfig.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/App_Start/WebApiConfig.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/App_Start/WebApiConfig.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/App_Start/WebApiConfig.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/DialogMatches.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/DialogMatches.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/DialogMatches.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/DialogMatches.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Global.asax b/samples/app-complete-sample/csharp/template-bot-master-csharp/Global.asax similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Global.asax rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Global.asax diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Global.asax.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/Global.asax.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Global.asax.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Global.asax.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Properties/AssemblyInfo.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/Properties/AssemblyInfo.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Properties/AssemblyInfo.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Properties/AssemblyInfo.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Properties/Strings.Designer.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/Properties/Strings.Designer.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Properties/Strings.Designer.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Properties/Strings.Designer.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Properties/Strings.resx b/samples/app-complete-sample/csharp/template-bot-master-csharp/Properties/Strings.resx similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Properties/Strings.resx rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Properties/Strings.resx diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Web.Debug.config b/samples/app-complete-sample/csharp/template-bot-master-csharp/Web.Debug.config similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Web.Debug.config rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Web.Debug.config diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Web.Release.config b/samples/app-complete-sample/csharp/template-bot-master-csharp/Web.Release.config similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Web.Release.config rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Web.Release.config diff --git a/csharp/app-complete-sample/template-bot-master-csharp/Web.config b/samples/app-complete-sample/csharp/template-bot-master-csharp/Web.config similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/Web.config rename to samples/app-complete-sample/csharp/template-bot-master-csharp/Web.config diff --git a/csharp/app-complete-sample/template-bot-master-csharp/composeExtensionSettings.html b/samples/app-complete-sample/csharp/template-bot-master-csharp/composeExtensionSettings.html similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/composeExtensionSettings.html rename to samples/app-complete-sample/csharp/template-bot-master-csharp/composeExtensionSettings.html diff --git a/csharp/app-complete-sample/template-bot-master-csharp/default.htm b/samples/app-complete-sample/csharp/template-bot-master-csharp/default.htm similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/default.htm rename to samples/app-complete-sample/csharp/template-bot-master-csharp/default.htm diff --git a/csharp/app-complete-sample/template-bot-master-csharp/manifest/bot_blue.png b/samples/app-complete-sample/csharp/template-bot-master-csharp/manifest/bot_blue.png similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/manifest/bot_blue.png rename to samples/app-complete-sample/csharp/template-bot-master-csharp/manifest/bot_blue.png diff --git a/csharp/app-complete-sample/template-bot-master-csharp/manifest/manifest.json b/samples/app-complete-sample/csharp/template-bot-master-csharp/manifest/manifest.json similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/manifest/manifest.json rename to samples/app-complete-sample/csharp/template-bot-master-csharp/manifest/manifest.json diff --git a/csharp/app-complete-sample/template-bot-master-csharp/middleware/AdaptiveCardSubmitActionHandler.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/middleware/AdaptiveCardSubmitActionHandler.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/middleware/AdaptiveCardSubmitActionHandler.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/middleware/AdaptiveCardSubmitActionHandler.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/middleware/Middleware.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/middleware/Middleware.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/middleware/Middleware.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/middleware/Middleware.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/middleware/StripBotAtMentions.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/middleware/StripBotAtMentions.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/middleware/StripBotAtMentions.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/middleware/StripBotAtMentions.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/packages.config b/samples/app-complete-sample/csharp/template-bot-master-csharp/packages.config similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/packages.config rename to samples/app-complete-sample/csharp/template-bot-master-csharp/packages.config diff --git a/csharp/app-complete-sample/template-bot-master-csharp/popUpSignin.html b/samples/app-complete-sample/csharp/template-bot-master-csharp/popUpSignin.html similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/popUpSignin.html rename to samples/app-complete-sample/csharp/template-bot-master-csharp/popUpSignin.html diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/assets/ActionableCardIconImage.png b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/ActionableCardIconImage.png similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/assets/ActionableCardIconImage.png rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/ActionableCardIconImage.png diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/assets/computer.jpg b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/computer.jpg similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/assets/computer.jpg rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/computer.jpg diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/assets/computer_people.jpg b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/computer_people.jpg similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/assets/computer_people.jpg rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/computer_people.jpg diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/assets/computer_person.jpg b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/computer_person.jpg similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/assets/computer_person.jpg rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/computer_person.jpg diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/assets/mascot.png b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/mascot.png similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/assets/mascot.png rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/assets/mascot.png diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/index.html b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/index.html similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/index.html rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/index.html diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/tab.aspx b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/tab.aspx similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/tab.aspx rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/tab.aspx diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.designer.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.designer.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.designer.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/public/tab/tabConfig/tab.aspx.designer.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/controllers/MessagesController.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/controllers/MessagesController.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/controllers/MessagesController.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/controllers/MessagesController.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/RootDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/RootDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/RootDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/RootDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/facebook/FacebookHelpers.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/facebook/FacebookHelpers.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/facebook/FacebookHelpers.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/facebook/FacebookHelpers.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/facebook/OAuthCallbackController.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/facebook/OAuthCallbackController.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/facebook/OAuthCallbackController.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/facebook/OAuthCallbackController.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/facebook/SimpleFacebookAuthDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/facebook/SimpleFacebookAuthDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/facebook/SimpleFacebookAuthDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/facebook/SimpleFacebookAuthDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/OAuthCallbackVSTSController.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/OAuthCallbackVSTSController.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/OAuthCallbackVSTSController.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/OAuthCallbackVSTSController.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSAPICallDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSAPICallDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSAPICallDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSAPICallDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSGetworkItemDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSGetworkItemDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSGetworkItemDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSGetworkItemDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSHelpers.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSHelpers.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSHelpers.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/auth/vsts/VSTSHelpers.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/AdaptiveCardDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/AdaptiveCardDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/AdaptiveCardDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/AdaptiveCardDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/GetLastDialogUsedDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/GetLastDialogUsedDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/GetLastDialogUsedDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/GetLastDialogUsedDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/HelloDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/HelloDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/HelloDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/HelloDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/HeroCardDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/HeroCardDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/HeroCardDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/HeroCardDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/MessagebackDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/MessagebackDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/MessagebackDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/MessagebackDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/MultiDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/MultiDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/MultiDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/MultiDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/O365ConnectorCardDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/PopupSigninCardDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/PopupSigninCardDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/PopupSigninCardDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/PopupSigninCardDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/ThumbnailcardDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/ThumbnailcardDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/basic/ThumbnailcardDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/basic/ThumbnailcardDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/BeginDialogExampleDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/BeginDialogExampleDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/BeginDialogExampleDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/BeginDialogExampleDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/ListNamesDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/ListNamesDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/ListNamesDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/ListNamesDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/PromptDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/PromptDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/PromptDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/PromptDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz1Dialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz1Dialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz1Dialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz1Dialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz2Dialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz2Dialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz2Dialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/Quiz2Dialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/QuizFullDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/QuizFullDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/moderate/QuizFullDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/moderate/QuizFullDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/AtMentionDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/AtMentionDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/AtMentionDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/AtMentionDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/DeepLinkStaticTabDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/DeepLinkStaticTabDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/DeepLinkStaticTabDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/DeepLinkStaticTabDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/DisplayCardsDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/DisplayCardsDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/DisplayCardsDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/DisplayCardsDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/FetchRosterDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/FetchRosterDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/FetchRosterDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/FetchRosterDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/FetchTeamsInfoDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/FetchTeamsInfoDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/FetchTeamsInfoDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/FetchTeamsInfoDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/HelpDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/HelpDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/HelpDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/HelpDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/template-bot-master-csharp.csproj b/samples/app-complete-sample/csharp/template-bot-master-csharp/template-bot-master-csharp.csproj similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/template-bot-master-csharp.csproj rename to samples/app-complete-sample/csharp/template-bot-master-csharp/template-bot-master-csharp.csproj diff --git a/csharp/app-complete-sample/template-bot-master-csharp/utility/InvokeHandler.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/utility/InvokeHandler.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/utility/InvokeHandler.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/utility/InvokeHandler.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/utility/TemplateUtility.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/utility/TemplateUtility.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/utility/TemplateUtility.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/utility/TemplateUtility.cs diff --git a/csharp/app-complete-sample/template-bot-master-csharp/utility/WikipediaComposeExtension.cs b/samples/app-complete-sample/csharp/template-bot-master-csharp/utility/WikipediaComposeExtension.cs similarity index 100% rename from csharp/app-complete-sample/template-bot-master-csharp/utility/WikipediaComposeExtension.cs rename to samples/app-complete-sample/csharp/template-bot-master-csharp/utility/WikipediaComposeExtension.cs diff --git a/nodejs/app-complete-sample/.deployment b/samples/app-complete-sample/nodejs/.deployment similarity index 100% rename from nodejs/app-complete-sample/.deployment rename to samples/app-complete-sample/nodejs/.deployment diff --git a/nodejs/app-complete-sample/.gitignore b/samples/app-complete-sample/nodejs/.gitignore similarity index 100% rename from nodejs/app-complete-sample/.gitignore rename to samples/app-complete-sample/nodejs/.gitignore diff --git a/nodejs/app-complete-sample/.vscode/README.md b/samples/app-complete-sample/nodejs/.vscode/README.md similarity index 100% rename from nodejs/app-complete-sample/.vscode/README.md rename to samples/app-complete-sample/nodejs/.vscode/README.md diff --git a/nodejs/app-complete-sample/.vscode/launch.json b/samples/app-complete-sample/nodejs/.vscode/launch.json similarity index 100% rename from nodejs/app-complete-sample/.vscode/launch.json rename to samples/app-complete-sample/nodejs/.vscode/launch.json diff --git a/nodejs/app-complete-sample/.vscode/tasks.json b/samples/app-complete-sample/nodejs/.vscode/tasks.json similarity index 100% rename from nodejs/app-complete-sample/.vscode/tasks.json rename to samples/app-complete-sample/nodejs/.vscode/tasks.json diff --git a/nodejs/app-complete-sample/README.md b/samples/app-complete-sample/nodejs/README.md similarity index 100% rename from nodejs/app-complete-sample/README.md rename to samples/app-complete-sample/nodejs/README.md diff --git a/nodejs/app-complete-sample/README_Template.md b/samples/app-complete-sample/nodejs/README_Template.md similarity index 100% rename from nodejs/app-complete-sample/README_Template.md rename to samples/app-complete-sample/nodejs/README_Template.md diff --git a/nodejs/app-complete-sample/deploy.cmd b/samples/app-complete-sample/nodejs/deploy.cmd similarity index 100% rename from nodejs/app-complete-sample/deploy.cmd rename to samples/app-complete-sample/nodejs/deploy.cmd diff --git a/nodejs/app-complete-sample/gulpfile.js b/samples/app-complete-sample/nodejs/gulpfile.js similarity index 100% rename from nodejs/app-complete-sample/gulpfile.js rename to samples/app-complete-sample/nodejs/gulpfile.js diff --git a/nodejs/app-complete-sample/luis/Example.json b/samples/app-complete-sample/nodejs/luis/Example.json similarity index 100% rename from nodejs/app-complete-sample/luis/Example.json rename to samples/app-complete-sample/nodejs/luis/Example.json diff --git a/nodejs/app-complete-sample/luis/README.md b/samples/app-complete-sample/nodejs/luis/README.md similarity index 100% rename from nodejs/app-complete-sample/luis/README.md rename to samples/app-complete-sample/nodejs/luis/README.md diff --git a/nodejs/app-complete-sample/manifest/README.md b/samples/app-complete-sample/nodejs/manifest/README.md similarity index 100% rename from nodejs/app-complete-sample/manifest/README.md rename to samples/app-complete-sample/nodejs/manifest/README.md diff --git a/nodejs/app-complete-sample/manifest/bot_blue.png b/samples/app-complete-sample/nodejs/manifest/bot_blue.png similarity index 100% rename from nodejs/app-complete-sample/manifest/bot_blue.png rename to samples/app-complete-sample/nodejs/manifest/bot_blue.png diff --git a/nodejs/app-complete-sample/manifest/createdManifest/bot_blue.png b/samples/app-complete-sample/nodejs/manifest/createdManifest/bot_blue.png similarity index 100% rename from nodejs/app-complete-sample/manifest/createdManifest/bot_blue.png rename to samples/app-complete-sample/nodejs/manifest/createdManifest/bot_blue.png diff --git a/nodejs/app-complete-sample/manifest/manifest.json b/samples/app-complete-sample/nodejs/manifest/manifest.json similarity index 100% rename from nodejs/app-complete-sample/manifest/manifest.json rename to samples/app-complete-sample/nodejs/manifest/manifest.json diff --git a/nodejs/app-complete-sample/package-lock.json b/samples/app-complete-sample/nodejs/package-lock.json similarity index 100% rename from nodejs/app-complete-sample/package-lock.json rename to samples/app-complete-sample/nodejs/package-lock.json diff --git a/nodejs/app-complete-sample/package.json b/samples/app-complete-sample/nodejs/package.json similarity index 100% rename from nodejs/app-complete-sample/package.json rename to samples/app-complete-sample/nodejs/package.json diff --git a/nodejs/app-complete-sample/public/README.md b/samples/app-complete-sample/nodejs/public/README.md similarity index 100% rename from nodejs/app-complete-sample/public/README.md rename to samples/app-complete-sample/nodejs/public/README.md diff --git a/nodejs/app-complete-sample/public/assets/bot_blue.png b/samples/app-complete-sample/nodejs/public/assets/bot_blue.png similarity index 100% rename from nodejs/app-complete-sample/public/assets/bot_blue.png rename to samples/app-complete-sample/nodejs/public/assets/bot_blue.png diff --git a/nodejs/app-complete-sample/public/assets/computer.jpg b/samples/app-complete-sample/nodejs/public/assets/computer.jpg similarity index 100% rename from nodejs/app-complete-sample/public/assets/computer.jpg rename to samples/app-complete-sample/nodejs/public/assets/computer.jpg diff --git a/nodejs/app-complete-sample/public/assets/computer_people.jpg b/samples/app-complete-sample/nodejs/public/assets/computer_people.jpg similarity index 100% rename from nodejs/app-complete-sample/public/assets/computer_people.jpg rename to samples/app-complete-sample/nodejs/public/assets/computer_people.jpg diff --git a/nodejs/app-complete-sample/public/assets/computer_person.jpg b/samples/app-complete-sample/nodejs/public/assets/computer_person.jpg similarity index 100% rename from nodejs/app-complete-sample/public/assets/computer_person.jpg rename to samples/app-complete-sample/nodejs/public/assets/computer_person.jpg diff --git a/nodejs/app-complete-sample/public/assets/favicon.ico b/samples/app-complete-sample/nodejs/public/assets/favicon.ico similarity index 100% rename from nodejs/app-complete-sample/public/assets/favicon.ico rename to samples/app-complete-sample/nodejs/public/assets/favicon.ico diff --git a/nodejs/app-complete-sample/public/assets/mascot.png b/samples/app-complete-sample/nodejs/public/assets/mascot.png similarity index 100% rename from nodejs/app-complete-sample/public/assets/mascot.png rename to samples/app-complete-sample/nodejs/public/assets/mascot.png diff --git a/nodejs/app-complete-sample/public/assets/tablet_person.jpg b/samples/app-complete-sample/nodejs/public/assets/tablet_person.jpg similarity index 100% rename from nodejs/app-complete-sample/public/assets/tablet_person.jpg rename to samples/app-complete-sample/nodejs/public/assets/tablet_person.jpg diff --git a/nodejs/app-complete-sample/public/tab/error_generic.png b/samples/app-complete-sample/nodejs/public/tab/error_generic.png similarity index 100% rename from nodejs/app-complete-sample/public/tab/error_generic.png rename to samples/app-complete-sample/nodejs/public/tab/error_generic.png diff --git a/nodejs/app-complete-sample/public/tab/tabConfig/index.html b/samples/app-complete-sample/nodejs/public/tab/tabConfig/index.html similarity index 100% rename from nodejs/app-complete-sample/public/tab/tabConfig/index.html rename to samples/app-complete-sample/nodejs/public/tab/tabConfig/index.html diff --git a/nodejs/app-complete-sample/public/tab/tabConfig/popUpSignin.html b/samples/app-complete-sample/nodejs/public/tab/tabConfig/popUpSignin.html similarity index 100% rename from nodejs/app-complete-sample/public/tab/tabConfig/popUpSignin.html rename to samples/app-complete-sample/nodejs/public/tab/tabConfig/popUpSignin.html diff --git a/nodejs/app-complete-sample/public/tab/tabConfig/tabConfig.js b/samples/app-complete-sample/nodejs/public/tab/tabConfig/tabConfig.js similarity index 100% rename from nodejs/app-complete-sample/public/tab/tabConfig/tabConfig.js rename to samples/app-complete-sample/nodejs/public/tab/tabConfig/tabConfig.js diff --git a/nodejs/app-complete-sample/src/Bot.ts b/samples/app-complete-sample/nodejs/src/Bot.ts similarity index 100% rename from nodejs/app-complete-sample/src/Bot.ts rename to samples/app-complete-sample/nodejs/src/Bot.ts diff --git a/nodejs/app-complete-sample/src/README.md b/samples/app-complete-sample/nodejs/src/README.md similarity index 100% rename from nodejs/app-complete-sample/src/README.md rename to samples/app-complete-sample/nodejs/src/README.md diff --git a/nodejs/app-complete-sample/src/apis/AADAPI.ts b/samples/app-complete-sample/nodejs/src/apis/AADAPI.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/AADAPI.ts rename to samples/app-complete-sample/nodejs/src/apis/AADAPI.ts diff --git a/nodejs/app-complete-sample/src/apis/AADRequestAPI.ts b/samples/app-complete-sample/nodejs/src/apis/AADRequestAPI.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/AADRequestAPI.ts rename to samples/app-complete-sample/nodejs/src/apis/AADRequestAPI.ts diff --git a/nodejs/app-complete-sample/src/apis/AADUserValidation.ts b/samples/app-complete-sample/nodejs/src/apis/AADUserValidation.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/AADUserValidation.ts rename to samples/app-complete-sample/nodejs/src/apis/AADUserValidation.ts diff --git a/nodejs/app-complete-sample/src/apis/ExampleOAuth1API.ts b/samples/app-complete-sample/nodejs/src/apis/ExampleOAuth1API.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/ExampleOAuth1API.ts rename to samples/app-complete-sample/nodejs/src/apis/ExampleOAuth1API.ts diff --git a/nodejs/app-complete-sample/src/apis/VSTSAPI.ts b/samples/app-complete-sample/nodejs/src/apis/VSTSAPI.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/VSTSAPI.ts rename to samples/app-complete-sample/nodejs/src/apis/VSTSAPI.ts diff --git a/nodejs/app-complete-sample/src/apis/VSTSRequestAPI.ts b/samples/app-complete-sample/nodejs/src/apis/VSTSRequestAPI.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/VSTSRequestAPI.ts rename to samples/app-complete-sample/nodejs/src/apis/VSTSRequestAPI.ts diff --git a/nodejs/app-complete-sample/src/apis/VSTSTokenOAuth2API.ts b/samples/app-complete-sample/nodejs/src/apis/VSTSTokenOAuth2API.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/VSTSTokenOAuth2API.ts rename to samples/app-complete-sample/nodejs/src/apis/VSTSTokenOAuth2API.ts diff --git a/nodejs/app-complete-sample/src/apis/ValidateAADToken.ts b/samples/app-complete-sample/nodejs/src/apis/ValidateAADToken.ts similarity index 100% rename from nodejs/app-complete-sample/src/apis/ValidateAADToken.ts rename to samples/app-complete-sample/nodejs/src/apis/ValidateAADToken.ts diff --git a/nodejs/app-complete-sample/src/app.ts b/samples/app-complete-sample/nodejs/src/app.ts similarity index 100% rename from nodejs/app-complete-sample/src/app.ts rename to samples/app-complete-sample/nodejs/src/app.ts diff --git a/nodejs/app-complete-sample/src/composeExtension/ComposeExtensionHandlers.ts b/samples/app-complete-sample/nodejs/src/composeExtension/ComposeExtensionHandlers.ts similarity index 100% rename from nodejs/app-complete-sample/src/composeExtension/ComposeExtensionHandlers.ts rename to samples/app-complete-sample/nodejs/src/composeExtension/ComposeExtensionHandlers.ts diff --git a/nodejs/app-complete-sample/src/config/custom-environment-variables.json b/samples/app-complete-sample/nodejs/src/config/custom-environment-variables.json similarity index 100% rename from nodejs/app-complete-sample/src/config/custom-environment-variables.json rename to samples/app-complete-sample/nodejs/src/config/custom-environment-variables.json diff --git a/nodejs/app-complete-sample/src/config/default.json b/samples/app-complete-sample/nodejs/src/config/default.json similarity index 100% rename from nodejs/app-complete-sample/src/config/default.json rename to samples/app-complete-sample/nodejs/src/config/default.json diff --git a/nodejs/app-complete-sample/src/config/production.json b/samples/app-complete-sample/nodejs/src/config/production.json similarity index 100% rename from nodejs/app-complete-sample/src/config/production.json rename to samples/app-complete-sample/nodejs/src/config/production.json diff --git a/nodejs/app-complete-sample/src/dialogs/README.md b/samples/app-complete-sample/nodejs/src/dialogs/README.md similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/README.md rename to samples/app-complete-sample/nodejs/src/dialogs/README.md diff --git a/nodejs/app-complete-sample/src/dialogs/RootDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/RootDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/RootDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/RootDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/auth/ResetUserStateDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/auth/ResetUserStateDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/auth/ResetUserStateDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/auth/ResetUserStateDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/auth/VSTSAPICallDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/auth/VSTSAPICallDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/auth/VSTSAPICallDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/auth/VSTSAPICallDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/auth/VSTSAuthValidateUserDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/auth/VSTSAuthValidateUserDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/auth/VSTSAuthValidateUserDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/auth/VSTSAuthValidateUserDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/auth/VSTSLogInDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/auth/VSTSLogInDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/auth/VSTSLogInDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/auth/VSTSLogInDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/AdaptiveCardDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/AdaptiveCardDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/AdaptiveCardDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/AdaptiveCardDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/GetLastDialogUsedDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/GetLastDialogUsedDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/GetLastDialogUsedDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/GetLastDialogUsedDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/HelloDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/HelloDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/HelloDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/HelloDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/HelpDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/HelpDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/HelpDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/HelpDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/HeroCardDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/HeroCardDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/HeroCardDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/HeroCardDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/MessageBackReceiverDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/MessageBackReceiverDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/MessageBackReceiverDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/MessageBackReceiverDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/MultiDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/MultiDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/MultiDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/MultiDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/O365ConnectorCardActionsDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/O365ConnectorCardDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/O365ConnectorCardDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/O365ConnectorCardDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/O365ConnectorCardDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/PopupSignInDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/PopupSignInDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/PopupSignInDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/PopupSignInDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/ThumbnailCardDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/ThumbnailCardDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/ThumbnailCardDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/ThumbnailCardDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/basic/TimezoneDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/basic/TimezoneDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/basic/TimezoneDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/basic/TimezoneDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/BeginDialogFlowDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/BeginDialogFlowDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/BeginDialogFlowDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/BeginDialogFlowDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/ConstructorArgsDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/ConstructorArgsDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/ConstructorArgsDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/ConstructorArgsDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/ListNamesDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/ListNamesDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/ListNamesDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/ListNamesDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/LuisRecognizerNatLanguageDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/LuisRecognizerNatLanguageDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/LuisRecognizerNatLanguageDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/LuisRecognizerNatLanguageDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/PromptDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/PromptDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/PromptDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/PromptDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizFullDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizFullDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizFullDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizFullDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizQ1Dialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizQ1Dialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizQ1Dialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizQ1Dialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizQ2Dialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizQ2Dialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizQ2Dialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizQ2Dialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizQ3Dialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizQ3Dialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/moderate/QuizQ3Dialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/moderate/QuizQ3Dialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/AtMentionDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/AtMentionDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/AtMentionDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/AtMentionDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/ChannelDataDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/ChannelDataDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/ChannelDataDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/ChannelDataDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/DeeplinkDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/DeeplinkDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/DeeplinkDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/DeeplinkDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/FetchRosterDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/FetchRosterDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/FetchRosterDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/FetchRosterDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/FetchTeamInfoDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/FetchTeamInfoDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/FetchTeamInfoDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/FetchTeamInfoDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/NotifyDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/NotifyDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/NotifyDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/NotifyDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/ProactiveMsgTo1to1Dialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/ProactiveMsgToChannelDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/ProactiveMsgToChannelDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/ProactiveMsgToChannelDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/ProactiveMsgToChannelDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateCardMsgDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateCardMsgDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateCardMsgDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateCardMsgDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateCardMsgSetupDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateTextMsgDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateTextMsgDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateTextMsgDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateTextMsgDialog.ts diff --git a/nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.ts b/samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.ts rename to samples/app-complete-sample/nodejs/src/dialogs/examples/teams/UpdateTextMsgSetupDialog.ts diff --git a/nodejs/app-complete-sample/src/locale/en/index.json b/samples/app-complete-sample/nodejs/src/locale/en/index.json similarity index 100% rename from nodejs/app-complete-sample/src/locale/en/index.json rename to samples/app-complete-sample/nodejs/src/locale/en/index.json diff --git a/nodejs/app-complete-sample/src/locale/it-IT/index.json b/samples/app-complete-sample/nodejs/src/locale/it-IT/index.json similarity index 100% rename from nodejs/app-complete-sample/src/locale/it-IT/index.json rename to samples/app-complete-sample/nodejs/src/locale/it-IT/index.json diff --git a/nodejs/app-complete-sample/src/locale/it/index.json b/samples/app-complete-sample/nodejs/src/locale/it/index.json similarity index 100% rename from nodejs/app-complete-sample/src/locale/it/index.json rename to samples/app-complete-sample/nodejs/src/locale/it/index.json diff --git a/nodejs/app-complete-sample/src/middleware/AdaptiveCardSubmitActionHandler.ts b/samples/app-complete-sample/nodejs/src/middleware/AdaptiveCardSubmitActionHandler.ts similarity index 100% rename from nodejs/app-complete-sample/src/middleware/AdaptiveCardSubmitActionHandler.ts rename to samples/app-complete-sample/nodejs/src/middleware/AdaptiveCardSubmitActionHandler.ts diff --git a/nodejs/app-complete-sample/src/middleware/LoadBotChannelData.ts b/samples/app-complete-sample/nodejs/src/middleware/LoadBotChannelData.ts similarity index 100% rename from nodejs/app-complete-sample/src/middleware/LoadBotChannelData.ts rename to samples/app-complete-sample/nodejs/src/middleware/LoadBotChannelData.ts diff --git a/nodejs/app-complete-sample/src/middleware/RestrictIncomingMessagesToTenants.ts b/samples/app-complete-sample/nodejs/src/middleware/RestrictIncomingMessagesToTenants.ts similarity index 100% rename from nodejs/app-complete-sample/src/middleware/RestrictIncomingMessagesToTenants.ts rename to samples/app-complete-sample/nodejs/src/middleware/RestrictIncomingMessagesToTenants.ts diff --git a/nodejs/app-complete-sample/src/middleware/SetAADObjectId.ts b/samples/app-complete-sample/nodejs/src/middleware/SetAADObjectId.ts similarity index 100% rename from nodejs/app-complete-sample/src/middleware/SetAADObjectId.ts rename to samples/app-complete-sample/nodejs/src/middleware/SetAADObjectId.ts diff --git a/nodejs/app-complete-sample/src/middleware/SetLocaleFromTeamsSetting.ts b/samples/app-complete-sample/nodejs/src/middleware/SetLocaleFromTeamsSetting.ts similarity index 100% rename from nodejs/app-complete-sample/src/middleware/SetLocaleFromTeamsSetting.ts rename to samples/app-complete-sample/nodejs/src/middleware/SetLocaleFromTeamsSetting.ts diff --git a/nodejs/app-complete-sample/src/middleware/SimulateResetBotChat.ts b/samples/app-complete-sample/nodejs/src/middleware/SimulateResetBotChat.ts similarity index 100% rename from nodejs/app-complete-sample/src/middleware/SimulateResetBotChat.ts rename to samples/app-complete-sample/nodejs/src/middleware/SimulateResetBotChat.ts diff --git a/nodejs/app-complete-sample/src/middleware/StripBotAtMentions.ts b/samples/app-complete-sample/nodejs/src/middleware/StripBotAtMentions.ts similarity index 100% rename from nodejs/app-complete-sample/src/middleware/StripBotAtMentions.ts rename to samples/app-complete-sample/nodejs/src/middleware/StripBotAtMentions.ts diff --git a/nodejs/app-complete-sample/src/pages/AllCommandsTab.ts b/samples/app-complete-sample/nodejs/src/pages/AllCommandsTab.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/AllCommandsTab.ts rename to samples/app-complete-sample/nodejs/src/pages/AllCommandsTab.ts diff --git a/nodejs/app-complete-sample/src/pages/ComposeExtensionSettingsPopUp.ts b/samples/app-complete-sample/nodejs/src/pages/ComposeExtensionSettingsPopUp.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/ComposeExtensionSettingsPopUp.ts rename to samples/app-complete-sample/nodejs/src/pages/ComposeExtensionSettingsPopUp.ts diff --git a/nodejs/app-complete-sample/src/pages/DefaultTab.ts b/samples/app-complete-sample/nodejs/src/pages/DefaultTab.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/DefaultTab.ts rename to samples/app-complete-sample/nodejs/src/pages/DefaultTab.ts diff --git a/nodejs/app-complete-sample/src/pages/LoadingTab.ts b/samples/app-complete-sample/nodejs/src/pages/LoadingTab.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/LoadingTab.ts rename to samples/app-complete-sample/nodejs/src/pages/LoadingTab.ts diff --git a/nodejs/app-complete-sample/src/pages/ManifestCreatorEnd.ts b/samples/app-complete-sample/nodejs/src/pages/ManifestCreatorEnd.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/ManifestCreatorEnd.ts rename to samples/app-complete-sample/nodejs/src/pages/ManifestCreatorEnd.ts diff --git a/nodejs/app-complete-sample/src/pages/ManifestCreatorStart.ts b/samples/app-complete-sample/nodejs/src/pages/ManifestCreatorStart.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/ManifestCreatorStart.ts rename to samples/app-complete-sample/nodejs/src/pages/ManifestCreatorStart.ts diff --git a/nodejs/app-complete-sample/src/pages/VSTSAuthFlowEndPopUp.ts b/samples/app-complete-sample/nodejs/src/pages/VSTSAuthFlowEndPopUp.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/VSTSAuthFlowEndPopUp.ts rename to samples/app-complete-sample/nodejs/src/pages/VSTSAuthFlowEndPopUp.ts diff --git a/nodejs/app-complete-sample/src/pages/VSTSAuthFlowStartPopUp.ts b/samples/app-complete-sample/nodejs/src/pages/VSTSAuthFlowStartPopUp.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/VSTSAuthFlowStartPopUp.ts rename to samples/app-complete-sample/nodejs/src/pages/VSTSAuthFlowStartPopUp.ts diff --git a/nodejs/app-complete-sample/src/pages/VSTSAuthTab.ts b/samples/app-complete-sample/nodejs/src/pages/VSTSAuthTab.ts similarity index 100% rename from nodejs/app-complete-sample/src/pages/VSTSAuthTab.ts rename to samples/app-complete-sample/nodejs/src/pages/VSTSAuthTab.ts diff --git a/nodejs/app-complete-sample/src/storage/BotChannelStorage.ts b/samples/app-complete-sample/nodejs/src/storage/BotChannelStorage.ts similarity index 100% rename from nodejs/app-complete-sample/src/storage/BotChannelStorage.ts rename to samples/app-complete-sample/nodejs/src/storage/BotChannelStorage.ts diff --git a/nodejs/app-complete-sample/src/storage/MongoDbAADObjectIdStorage.ts b/samples/app-complete-sample/nodejs/src/storage/MongoDbAADObjectIdStorage.ts similarity index 100% rename from nodejs/app-complete-sample/src/storage/MongoDbAADObjectIdStorage.ts rename to samples/app-complete-sample/nodejs/src/storage/MongoDbAADObjectIdStorage.ts diff --git a/nodejs/app-complete-sample/src/storage/MongoDbBotChannelStorage.ts b/samples/app-complete-sample/nodejs/src/storage/MongoDbBotChannelStorage.ts similarity index 100% rename from nodejs/app-complete-sample/src/storage/MongoDbBotChannelStorage.ts rename to samples/app-complete-sample/nodejs/src/storage/MongoDbBotChannelStorage.ts diff --git a/nodejs/app-complete-sample/src/storage/MongoDbBotStorage.ts b/samples/app-complete-sample/nodejs/src/storage/MongoDbBotStorage.ts similarity index 100% rename from nodejs/app-complete-sample/src/storage/MongoDbBotStorage.ts rename to samples/app-complete-sample/nodejs/src/storage/MongoDbBotStorage.ts diff --git a/nodejs/app-complete-sample/src/storage/MongoDbTempTokensStorage.ts b/samples/app-complete-sample/nodejs/src/storage/MongoDbTempTokensStorage.ts similarity index 100% rename from nodejs/app-complete-sample/src/storage/MongoDbTempTokensStorage.ts rename to samples/app-complete-sample/nodejs/src/storage/MongoDbTempTokensStorage.ts diff --git a/nodejs/app-complete-sample/src/utils/BaseDialog.ts b/samples/app-complete-sample/nodejs/src/utils/BaseDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/BaseDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/BaseDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/BaseTriggerActionDialog.ts b/samples/app-complete-sample/nodejs/src/utils/BaseTriggerActionDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/BaseTriggerActionDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/BaseTriggerActionDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/ChannelData.ts b/samples/app-complete-sample/nodejs/src/utils/ChannelData.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/ChannelData.ts rename to samples/app-complete-sample/nodejs/src/utils/ChannelData.ts diff --git a/nodejs/app-complete-sample/src/utils/DialogIds.ts b/samples/app-complete-sample/nodejs/src/utils/DialogIds.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/DialogIds.ts rename to samples/app-complete-sample/nodejs/src/utils/DialogIds.ts diff --git a/nodejs/app-complete-sample/src/utils/DialogMatches.ts b/samples/app-complete-sample/nodejs/src/utils/DialogMatches.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/DialogMatches.ts rename to samples/app-complete-sample/nodejs/src/utils/DialogMatches.ts diff --git a/nodejs/app-complete-sample/src/utils/DialogUtils.ts b/samples/app-complete-sample/nodejs/src/utils/DialogUtils.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/DialogUtils.ts rename to samples/app-complete-sample/nodejs/src/utils/DialogUtils.ts diff --git a/nodejs/app-complete-sample/src/utils/MultiTriggerActionDialog.ts b/samples/app-complete-sample/nodejs/src/utils/MultiTriggerActionDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/MultiTriggerActionDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/MultiTriggerActionDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/OpenIdMetadata.ts b/samples/app-complete-sample/nodejs/src/utils/OpenIdMetadata.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/OpenIdMetadata.ts rename to samples/app-complete-sample/nodejs/src/utils/OpenIdMetadata.ts diff --git a/nodejs/app-complete-sample/src/utils/TriggerActionDialog.ts b/samples/app-complete-sample/nodejs/src/utils/TriggerActionDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/TriggerActionDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/TriggerActionDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/deprecated/BaseDialog.ts b/samples/app-complete-sample/nodejs/src/utils/deprecated/BaseDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/deprecated/BaseDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/deprecated/BaseDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/deprecated/GlobalTriggerDialog.ts b/samples/app-complete-sample/nodejs/src/utils/deprecated/GlobalTriggerDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/deprecated/GlobalTriggerDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/deprecated/GlobalTriggerDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/deprecated/MultiWaterfallDialog.ts b/samples/app-complete-sample/nodejs/src/utils/deprecated/MultiWaterfallDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/deprecated/MultiWaterfallDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/deprecated/MultiWaterfallDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/deprecated/OnBeginDialog.ts b/samples/app-complete-sample/nodejs/src/utils/deprecated/OnBeginDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/deprecated/OnBeginDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/deprecated/OnBeginDialog.ts diff --git a/nodejs/app-complete-sample/src/utils/deprecated/WaterfallDialog.ts b/samples/app-complete-sample/nodejs/src/utils/deprecated/WaterfallDialog.ts similarity index 100% rename from nodejs/app-complete-sample/src/utils/deprecated/WaterfallDialog.ts rename to samples/app-complete-sample/nodejs/src/utils/deprecated/WaterfallDialog.ts diff --git a/nodejs/app-complete-sample/src/views/manifest-creator/manifestCreatorStart.hbs b/samples/app-complete-sample/nodejs/src/views/manifest-creator/manifestCreatorStart.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/manifest-creator/manifestCreatorStart.hbs rename to samples/app-complete-sample/nodejs/src/views/manifest-creator/manifestCreatorStart.hbs diff --git a/nodejs/app-complete-sample/src/views/tab-auth/silent-end.hbs b/samples/app-complete-sample/nodejs/src/views/tab-auth/silent-end.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/tab-auth/silent-end.hbs rename to samples/app-complete-sample/nodejs/src/views/tab-auth/silent-end.hbs diff --git a/nodejs/app-complete-sample/src/views/tab-auth/silent-start.hbs b/samples/app-complete-sample/nodejs/src/views/tab-auth/silent-start.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/tab-auth/silent-start.hbs rename to samples/app-complete-sample/nodejs/src/views/tab-auth/silent-start.hbs diff --git a/nodejs/app-complete-sample/src/views/tab-auth/silent.hbs b/samples/app-complete-sample/nodejs/src/views/tab-auth/silent.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/tab-auth/silent.hbs rename to samples/app-complete-sample/nodejs/src/views/tab-auth/silent.hbs diff --git a/nodejs/app-complete-sample/src/views/tab-auth/simple-end.hbs b/samples/app-complete-sample/nodejs/src/views/tab-auth/simple-end.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/tab-auth/simple-end.hbs rename to samples/app-complete-sample/nodejs/src/views/tab-auth/simple-end.hbs diff --git a/nodejs/app-complete-sample/src/views/tab-auth/simple-start-v2.hbs b/samples/app-complete-sample/nodejs/src/views/tab-auth/simple-start-v2.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/tab-auth/simple-start-v2.hbs rename to samples/app-complete-sample/nodejs/src/views/tab-auth/simple-start-v2.hbs diff --git a/nodejs/app-complete-sample/src/views/tab-auth/simple-start.hbs b/samples/app-complete-sample/nodejs/src/views/tab-auth/simple-start.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/tab-auth/simple-start.hbs rename to samples/app-complete-sample/nodejs/src/views/tab-auth/simple-start.hbs diff --git a/nodejs/app-complete-sample/src/views/tab-auth/simple.hbs b/samples/app-complete-sample/nodejs/src/views/tab-auth/simple.hbs similarity index 100% rename from nodejs/app-complete-sample/src/views/tab-auth/simple.hbs rename to samples/app-complete-sample/nodejs/src/views/tab-auth/simple.hbs diff --git a/nodejs/app-complete-sample/test/README.md b/samples/app-complete-sample/nodejs/test/README.md similarity index 100% rename from nodejs/app-complete-sample/test/README.md rename to samples/app-complete-sample/nodejs/test/README.md diff --git a/nodejs/app-complete-sample/test/test.ts b/samples/app-complete-sample/nodejs/test/test.ts similarity index 100% rename from nodejs/app-complete-sample/test/test.ts rename to samples/app-complete-sample/nodejs/test/test.ts diff --git a/nodejs/app-complete-sample/tsconfig.json b/samples/app-complete-sample/nodejs/tsconfig.json similarity index 100% rename from nodejs/app-complete-sample/tsconfig.json rename to samples/app-complete-sample/nodejs/tsconfig.json diff --git a/nodejs/app-complete-sample/tsconfig.prod.json b/samples/app-complete-sample/nodejs/tsconfig.prod.json similarity index 100% rename from nodejs/app-complete-sample/tsconfig.prod.json rename to samples/app-complete-sample/nodejs/tsconfig.prod.json diff --git a/nodejs/app-complete-sample/tslint.json b/samples/app-complete-sample/nodejs/tslint.json similarity index 100% rename from nodejs/app-complete-sample/tslint.json rename to samples/app-complete-sample/nodejs/tslint.json diff --git a/nodejs/app-complete-sample/watch.json b/samples/app-complete-sample/nodejs/watch.json similarity index 100% rename from nodejs/app-complete-sample/watch.json rename to samples/app-complete-sample/nodejs/watch.json diff --git a/nodejs/app-complete-sample/web.config b/samples/app-complete-sample/nodejs/web.config similarity index 100% rename from nodejs/app-complete-sample/web.config rename to samples/app-complete-sample/nodejs/web.config diff --git a/csharp/app-hello-world/.gitignore b/samples/app-hello-world/csharp/.gitignore similarity index 100% rename from csharp/app-hello-world/.gitignore rename to samples/app-hello-world/csharp/.gitignore diff --git a/csharp/app-hello-world/.vscode/database.json b/samples/app-hello-world/csharp/.vscode/database.json similarity index 100% rename from csharp/app-hello-world/.vscode/database.json rename to samples/app-hello-world/csharp/.vscode/database.json diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/AdapterWithErrorHandler.cs b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AdapterWithErrorHandler.cs similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/AdapterWithErrorHandler.cs rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AdapterWithErrorHandler.cs diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Bots/MessageExtension.cs b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Bots/MessageExtension.cs similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Bots/MessageExtension.cs rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Bots/MessageExtension.cs diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/BotController.cs b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/BotController.cs similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/BotController.cs rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/BotController.cs diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/HomeController.cs b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/HomeController.cs similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/HomeController.cs rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Controllers/HomeController.cs diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso20x20.png b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso20x20.png similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso20x20.png rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso20x20.png diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso96x96.png b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso96x96.png similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso96x96.png rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/contoso96x96.png diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/manifest.json b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/manifest.json similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/manifest.json rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/manifest.json diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Program.cs b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Program.cs similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Program.cs rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Program.cs diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Startup.cs b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Startup.cs similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Startup.cs rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Startup.cs diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Configure.cshtml b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Configure.cshtml similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Configure.cshtml rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Configure.cshtml diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/First.cshtml b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/First.cshtml similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/First.cshtml rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/First.cshtml diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Index.cshtml b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Index.cshtml similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Index.cshtml rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Index.cshtml diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Second.cshtml b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Second.cshtml similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Second.cshtml rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Home/Second.cshtml diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Shared/_Layout.cshtml b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Shared/_Layout.cshtml similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/Shared/_Layout.cshtml rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/Shared/_Layout.cshtml diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/_ViewStart.cshtml b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/_ViewStart.cshtml similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/Views/_ViewStart.cshtml rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Views/_ViewStart.cshtml diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.Development.json b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.Development.json similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.Development.json rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.Development.json diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.json b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.json similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.json rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/appsettings.json diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/favicon.ico b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/favicon.ico similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/favicon.ico rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/favicon.ico diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/packages.config b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/packages.config similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/packages.config rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/packages.config diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/Site.css b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/Site.css similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/Site.css rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/Site.css diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/msteams-16.css b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/msteams-16.css similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/msteams-16.css rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Content/msteams-16.css diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Scripts/teamsapp.js b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Scripts/teamsapp.js similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Scripts/teamsapp.js rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/wwwroot/Scripts/teamsapp.js diff --git a/csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.sln b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.sln similarity index 100% rename from csharp/app-hello-world/Microsoft.Teams.Samples.HelloWorld.sln rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.sln diff --git a/csharp/app-hello-world/README.md b/samples/app-hello-world/csharp/README.md similarity index 100% rename from csharp/app-hello-world/README.md rename to samples/app-hello-world/csharp/README.md diff --git a/nodejs/app-hello-world/.babelrc.json b/samples/app-hello-world/nodejs/.babelrc.json similarity index 100% rename from nodejs/app-hello-world/.babelrc.json rename to samples/app-hello-world/nodejs/.babelrc.json diff --git a/nodejs/app-hello-world/.deployment b/samples/app-hello-world/nodejs/.deployment similarity index 100% rename from nodejs/app-hello-world/.deployment rename to samples/app-hello-world/nodejs/.deployment diff --git a/nodejs/app-hello-world/.gitignore b/samples/app-hello-world/nodejs/.gitignore similarity index 100% rename from nodejs/app-hello-world/.gitignore rename to samples/app-hello-world/nodejs/.gitignore diff --git a/nodejs/app-hello-world/.prettierrc b/samples/app-hello-world/nodejs/.prettierrc similarity index 100% rename from nodejs/app-hello-world/.prettierrc rename to samples/app-hello-world/nodejs/.prettierrc diff --git a/nodejs/app-hello-world/README.md b/samples/app-hello-world/nodejs/README.md similarity index 100% rename from nodejs/app-hello-world/README.md rename to samples/app-hello-world/nodejs/README.md diff --git a/nodejs/app-hello-world/config/custom-environment-variables.json b/samples/app-hello-world/nodejs/config/custom-environment-variables.json similarity index 100% rename from nodejs/app-hello-world/config/custom-environment-variables.json rename to samples/app-hello-world/nodejs/config/custom-environment-variables.json diff --git a/nodejs/app-hello-world/config/default.json b/samples/app-hello-world/nodejs/config/default.json similarity index 100% rename from nodejs/app-hello-world/config/default.json rename to samples/app-hello-world/nodejs/config/default.json diff --git a/nodejs/app-hello-world/deploy.cmd b/samples/app-hello-world/nodejs/deploy.cmd similarity index 100% rename from nodejs/app-hello-world/deploy.cmd rename to samples/app-hello-world/nodejs/deploy.cmd diff --git a/nodejs/app-hello-world/deploy.sh b/samples/app-hello-world/nodejs/deploy.sh similarity index 100% rename from nodejs/app-hello-world/deploy.sh rename to samples/app-hello-world/nodejs/deploy.sh diff --git a/nodejs/app-hello-world/gulpfile.js b/samples/app-hello-world/nodejs/gulpfile.js similarity index 100% rename from nodejs/app-hello-world/gulpfile.js rename to samples/app-hello-world/nodejs/gulpfile.js diff --git a/nodejs/app-hello-world/package-lock.json b/samples/app-hello-world/nodejs/package-lock.json similarity index 100% rename from nodejs/app-hello-world/package-lock.json rename to samples/app-hello-world/nodejs/package-lock.json diff --git a/nodejs/app-hello-world/package.json b/samples/app-hello-world/nodejs/package.json similarity index 100% rename from nodejs/app-hello-world/package.json rename to samples/app-hello-world/nodejs/package.json diff --git a/nodejs/app-hello-world/src/app.js b/samples/app-hello-world/nodejs/src/app.js similarity index 100% rename from nodejs/app-hello-world/src/app.js rename to samples/app-hello-world/nodejs/src/app.js diff --git a/nodejs/app-hello-world/src/bot.js b/samples/app-hello-world/nodejs/src/bot.js similarity index 100% rename from nodejs/app-hello-world/src/bot.js rename to samples/app-hello-world/nodejs/src/bot.js diff --git a/nodejs/app-hello-world/src/manifest.json b/samples/app-hello-world/nodejs/src/manifest.json similarity index 100% rename from nodejs/app-hello-world/src/manifest.json rename to samples/app-hello-world/nodejs/src/manifest.json diff --git a/nodejs/app-hello-world/src/message-extension.js b/samples/app-hello-world/nodejs/src/message-extension.js similarity index 100% rename from nodejs/app-hello-world/src/message-extension.js rename to samples/app-hello-world/nodejs/src/message-extension.js diff --git a/nodejs/app-hello-world/src/static/images/contoso20x20.png b/samples/app-hello-world/nodejs/src/static/images/contoso20x20.png similarity index 100% rename from nodejs/app-hello-world/src/static/images/contoso20x20.png rename to samples/app-hello-world/nodejs/src/static/images/contoso20x20.png diff --git a/nodejs/app-hello-world/src/static/images/contoso96x96.png b/samples/app-hello-world/nodejs/src/static/images/contoso96x96.png similarity index 100% rename from nodejs/app-hello-world/src/static/images/contoso96x96.png rename to samples/app-hello-world/nodejs/src/static/images/contoso96x96.png diff --git a/nodejs/app-hello-world/src/static/scripts/teamsapp.js b/samples/app-hello-world/nodejs/src/static/scripts/teamsapp.js similarity index 100% rename from nodejs/app-hello-world/src/static/scripts/teamsapp.js rename to samples/app-hello-world/nodejs/src/static/scripts/teamsapp.js diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Content/custom.css b/samples/app-hello-world/nodejs/src/static/styles/custom.css similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Content/custom.css rename to samples/app-hello-world/nodejs/src/static/styles/custom.css diff --git a/nodejs/app-hello-world/src/static/styles/msteams-16.css b/samples/app-hello-world/nodejs/src/static/styles/msteams-16.css similarity index 100% rename from nodejs/app-hello-world/src/static/styles/msteams-16.css rename to samples/app-hello-world/nodejs/src/static/styles/msteams-16.css diff --git a/nodejs/app-hello-world/src/tabs.js b/samples/app-hello-world/nodejs/src/tabs.js similarity index 100% rename from nodejs/app-hello-world/src/tabs.js rename to samples/app-hello-world/nodejs/src/tabs.js diff --git a/nodejs/app-hello-world/src/views/configure.html b/samples/app-hello-world/nodejs/src/views/configure.html similarity index 100% rename from nodejs/app-hello-world/src/views/configure.html rename to samples/app-hello-world/nodejs/src/views/configure.html diff --git a/nodejs/app-hello-world/src/views/first.html b/samples/app-hello-world/nodejs/src/views/first.html similarity index 100% rename from nodejs/app-hello-world/src/views/first.html rename to samples/app-hello-world/nodejs/src/views/first.html diff --git a/nodejs/app-hello-world/src/views/hello.html b/samples/app-hello-world/nodejs/src/views/hello.html similarity index 100% rename from nodejs/app-hello-world/src/views/hello.html rename to samples/app-hello-world/nodejs/src/views/hello.html diff --git a/nodejs/app-hello-world/src/views/second.html b/samples/app-hello-world/nodejs/src/views/second.html similarity index 100% rename from nodejs/app-hello-world/src/views/second.html rename to samples/app-hello-world/nodejs/src/views/second.html diff --git a/csharp/app-task-module/.gitattributes b/samples/app-task-module/csharp/.gitattributes similarity index 100% rename from csharp/app-task-module/.gitattributes rename to samples/app-task-module/csharp/.gitattributes diff --git a/csharp/app-task-module/.gitignore b/samples/app-task-module/csharp/.gitignore similarity index 100% rename from csharp/app-task-module/.gitignore rename to samples/app-task-module/csharp/.gitignore diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/App_Start/RouteConfig.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/App_Start/RouteConfig.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/App_Start/RouteConfig.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/App_Start/RouteConfig.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/App_Start/WebApiConfig.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/App_Start/WebApiConfig.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/App_Start/WebApiConfig.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/App_Start/WebApiConfig.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Content/Site.css b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Content/Site.css similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Content/Site.css rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Content/Site.css diff --git a/nodejs/app-hello-world/src/static/styles/custom.css b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Content/custom.css similarity index 100% rename from nodejs/app-hello-world/src/static/styles/custom.css rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Content/custom.css diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Content/msteams-16.css b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Content/msteams-16.css similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Content/msteams-16.css rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Content/msteams-16.css diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Controllers/HomeController.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Controllers/HomeController.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Controllers/HomeController.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Controllers/HomeController.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Controllers/MessagesController.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Controllers/MessagesController.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Controllers/MessagesController.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Controllers/MessagesController.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Dialogs/RootDialog.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Dialogs/RootDialog.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Dialogs/RootDialog.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Dialogs/RootDialog.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Global.asax b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Global.asax similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Global.asax rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Global.asax diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Global.asax.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Global.asax.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Global.asax.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Global.asax.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/AdaptiveCardHelper.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/AdaptiveCardHelper.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/AdaptiveCardHelper.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/AdaptiveCardHelper.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/ApplicationSettings.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/ApplicationSettings.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/ApplicationSettings.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/ApplicationSettings.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/DeeplinkHelper.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/DeeplinkHelper.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/DeeplinkHelper.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/DeeplinkHelper.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/UIConstants.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/UIConstants.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Helper/UIConstants.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Helper/UIConstants.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/TaskModuleCSharp.zip b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/TaskModuleCSharp.zip similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/TaskModuleCSharp.zip rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/TaskModuleCSharp.zip diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/color_icon.png b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/color_icon.png similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/color_icon.png rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/color_icon.png diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/manifest.json b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/manifest.json similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/manifest.json rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/manifest.json diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/outline_icon.png b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/outline_icon.png similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Manifest/outline_icon.png rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/outline_icon.png diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Microsoft.Teams.Samples.TaskModule.Web.csproj b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Microsoft.Teams.Samples.TaskModule.Web.csproj similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Microsoft.Teams.Samples.TaskModule.Web.csproj rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Microsoft.Teams.Samples.TaskModule.Web.csproj diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Models/CardActionValue.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Models/CardActionValue.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Models/CardActionValue.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Models/CardActionValue.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Models/TaskModel.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Models/TaskModel.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Models/TaskModel.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Models/TaskModel.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Properties/AssemblyInfo.cs b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Properties/AssemblyInfo.cs similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Properties/AssemblyInfo.cs rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Properties/AssemblyInfo.cs diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Resources/Cards/AdaptiveCard.json b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Resources/Cards/AdaptiveCard.json similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Resources/Cards/AdaptiveCard.json rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Resources/Cards/AdaptiveCard.json diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Scripts/teamsapp.js b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Scripts/teamsapp.js similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Scripts/teamsapp.js rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Scripts/teamsapp.js diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Configure.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Configure.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Configure.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Configure.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/CustomForm.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/CustomForm.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/CustomForm.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/CustomForm.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Index.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Index.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Index.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Index.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/PowerApp.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/PowerApp.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/PowerApp.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/PowerApp.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Tasks.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Tasks.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Tasks.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/Tasks.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/YouTube.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/YouTube.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/YouTube.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Home/YouTube.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_EmbedPage.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_EmbedPage.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_EmbedPage.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_EmbedPage.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_Layout.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_Layout.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_Layout.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Shared/_Layout.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Web.config b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Web.config similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/Web.config rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/Web.config diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/_ViewStart.cshtml b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/_ViewStart.cshtml similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Views/_ViewStart.cshtml rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Views/_ViewStart.cshtml diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Web.config b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Web.config similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/Web.config rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Web.config diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/favicon.ico b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/favicon.ico similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/favicon.ico rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/favicon.ico diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/packages.config b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/packages.config similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.Web/packages.config rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/packages.config diff --git a/csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.sln b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.sln similarity index 100% rename from csharp/app-task-module/Microsoft.Teams.Samples.TaskModule.sln rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.sln diff --git a/csharp/app-task-module/README.md b/samples/app-task-module/csharp/README.md similarity index 100% rename from csharp/app-task-module/README.md rename to samples/app-task-module/csharp/README.md diff --git a/nodejs/app-task-module/.deployment b/samples/app-task-module/nodejs/.deployment similarity index 100% rename from nodejs/app-task-module/.deployment rename to samples/app-task-module/nodejs/.deployment diff --git a/nodejs/app-task-module/.gitignore b/samples/app-task-module/nodejs/.gitignore similarity index 100% rename from nodejs/app-task-module/.gitignore rename to samples/app-task-module/nodejs/.gitignore diff --git a/nodejs/app-task-module/.vscode/launch.json b/samples/app-task-module/nodejs/.vscode/launch.json similarity index 100% rename from nodejs/app-task-module/.vscode/launch.json rename to samples/app-task-module/nodejs/.vscode/launch.json diff --git a/nodejs/app-task-module/.vscode/tasks.json b/samples/app-task-module/nodejs/.vscode/tasks.json similarity index 100% rename from nodejs/app-task-module/.vscode/tasks.json rename to samples/app-task-module/nodejs/.vscode/tasks.json diff --git a/nodejs/app-task-module/README.md b/samples/app-task-module/nodejs/README.md similarity index 100% rename from nodejs/app-task-module/README.md rename to samples/app-task-module/nodejs/README.md diff --git a/nodejs/app-task-module/TaskModule.zip b/samples/app-task-module/nodejs/TaskModule.zip similarity index 100% rename from nodejs/app-task-module/TaskModule.zip rename to samples/app-task-module/nodejs/TaskModule.zip diff --git a/nodejs/app-task-module/config/default.json b/samples/app-task-module/nodejs/config/default.json similarity index 100% rename from nodejs/app-task-module/config/default.json rename to samples/app-task-module/nodejs/config/default.json diff --git a/nodejs/app-task-module/deploy.cmd b/samples/app-task-module/nodejs/deploy.cmd similarity index 100% rename from nodejs/app-task-module/deploy.cmd rename to samples/app-task-module/nodejs/deploy.cmd diff --git a/nodejs/app-task-module/gulpfile.js b/samples/app-task-module/nodejs/gulpfile.js similarity index 100% rename from nodejs/app-task-module/gulpfile.js rename to samples/app-task-module/nodejs/gulpfile.js diff --git a/nodejs/app-task-module/package-lock.json b/samples/app-task-module/nodejs/package-lock.json similarity index 100% rename from nodejs/app-task-module/package-lock.json rename to samples/app-task-module/nodejs/package-lock.json diff --git a/nodejs/app-task-module/package.json b/samples/app-task-module/nodejs/package.json similarity index 100% rename from nodejs/app-task-module/package.json rename to samples/app-task-module/nodejs/package.json diff --git a/nodejs/app-task-module/public/images/color_icon.png b/samples/app-task-module/nodejs/public/images/color_icon.png similarity index 100% rename from nodejs/app-task-module/public/images/color_icon.png rename to samples/app-task-module/nodejs/public/images/color_icon.png diff --git a/nodejs/app-task-module/public/images/color_icon_transparent.png b/samples/app-task-module/nodejs/public/images/color_icon_transparent.png similarity index 100% rename from nodejs/app-task-module/public/images/color_icon_transparent.png rename to samples/app-task-module/nodejs/public/images/color_icon_transparent.png diff --git a/nodejs/app-task-module/public/images/contoso.png b/samples/app-task-module/nodejs/public/images/contoso.png similarity index 100% rename from nodejs/app-task-module/public/images/contoso.png rename to samples/app-task-module/nodejs/public/images/contoso.png diff --git a/nodejs/app-task-module/public/images/favicon.ico b/samples/app-task-module/nodejs/public/images/favicon.ico similarity index 100% rename from nodejs/app-task-module/public/images/favicon.ico rename to samples/app-task-module/nodejs/public/images/favicon.ico diff --git a/nodejs/app-task-module/public/images/outline_icon.png b/samples/app-task-module/nodejs/public/images/outline_icon.png similarity index 100% rename from nodejs/app-task-module/public/images/outline_icon.png rename to samples/app-task-module/nodejs/public/images/outline_icon.png diff --git a/nodejs/app-task-module/public/styles/custom.css b/samples/app-task-module/nodejs/public/styles/custom.css similarity index 100% rename from nodejs/app-task-module/public/styles/custom.css rename to samples/app-task-module/nodejs/public/styles/custom.css diff --git a/nodejs/app-task-module/public/styles/msteams-16.css b/samples/app-task-module/nodejs/public/styles/msteams-16.css similarity index 100% rename from nodejs/app-task-module/public/styles/msteams-16.css rename to samples/app-task-module/nodejs/public/styles/msteams-16.css diff --git a/nodejs/app-task-module/src/MessagingExtension.ts b/samples/app-task-module/nodejs/src/MessagingExtension.ts similarity index 100% rename from nodejs/app-task-module/src/MessagingExtension.ts rename to samples/app-task-module/nodejs/src/MessagingExtension.ts diff --git a/nodejs/app-task-module/src/TaskModuleTab.ts b/samples/app-task-module/nodejs/src/TaskModuleTab.ts similarity index 100% rename from nodejs/app-task-module/src/TaskModuleTab.ts rename to samples/app-task-module/nodejs/src/TaskModuleTab.ts diff --git a/nodejs/app-task-module/src/TeamsBot.ts b/samples/app-task-module/nodejs/src/TeamsBot.ts similarity index 100% rename from nodejs/app-task-module/src/TeamsBot.ts rename to samples/app-task-module/nodejs/src/TeamsBot.ts diff --git a/nodejs/app-task-module/src/app.ts b/samples/app-task-module/nodejs/src/app.ts similarity index 100% rename from nodejs/app-task-module/src/app.ts rename to samples/app-task-module/nodejs/src/app.ts diff --git a/nodejs/app-task-module/src/config/custom-environment-variables.json b/samples/app-task-module/nodejs/src/config/custom-environment-variables.json similarity index 100% rename from nodejs/app-task-module/src/config/custom-environment-variables.json rename to samples/app-task-module/nodejs/src/config/custom-environment-variables.json diff --git a/nodejs/app-task-module/src/config/default.json b/samples/app-task-module/nodejs/src/config/default.json similarity index 100% rename from nodejs/app-task-module/src/config/default.json rename to samples/app-task-module/nodejs/src/config/default.json diff --git a/nodejs/app-task-module/src/constants.ts b/samples/app-task-module/nodejs/src/constants.ts similarity index 100% rename from nodejs/app-task-module/src/constants.ts rename to samples/app-task-module/nodejs/src/constants.ts diff --git a/nodejs/app-task-module/src/dialogs/ACGenerator.ts b/samples/app-task-module/nodejs/src/dialogs/ACGenerator.ts similarity index 100% rename from nodejs/app-task-module/src/dialogs/ACGenerator.ts rename to samples/app-task-module/nodejs/src/dialogs/ACGenerator.ts diff --git a/nodejs/app-task-module/src/dialogs/BotFrameworkCard.ts b/samples/app-task-module/nodejs/src/dialogs/BotFrameworkCard.ts similarity index 100% rename from nodejs/app-task-module/src/dialogs/BotFrameworkCard.ts rename to samples/app-task-module/nodejs/src/dialogs/BotFrameworkCard.ts diff --git a/nodejs/app-task-module/src/dialogs/CardTemplates.ts b/samples/app-task-module/nodejs/src/dialogs/CardTemplates.ts similarity index 100% rename from nodejs/app-task-module/src/dialogs/CardTemplates.ts rename to samples/app-task-module/nodejs/src/dialogs/CardTemplates.ts diff --git a/nodejs/app-task-module/src/dialogs/RootDialog.ts b/samples/app-task-module/nodejs/src/dialogs/RootDialog.ts similarity index 100% rename from nodejs/app-task-module/src/dialogs/RootDialog.ts rename to samples/app-task-module/nodejs/src/dialogs/RootDialog.ts diff --git a/nodejs/app-task-module/src/manifest.json b/samples/app-task-module/nodejs/src/manifest.json similarity index 100% rename from nodejs/app-task-module/src/manifest.json rename to samples/app-task-module/nodejs/src/manifest.json diff --git a/nodejs/app-task-module/src/storage/BotExtendedStorage.ts b/samples/app-task-module/nodejs/src/storage/BotExtendedStorage.ts similarity index 100% rename from nodejs/app-task-module/src/storage/BotExtendedStorage.ts rename to samples/app-task-module/nodejs/src/storage/BotExtendedStorage.ts diff --git a/nodejs/app-task-module/src/storage/MongoDbBotStorage.ts b/samples/app-task-module/nodejs/src/storage/MongoDbBotStorage.ts similarity index 100% rename from nodejs/app-task-module/src/storage/MongoDbBotStorage.ts rename to samples/app-task-module/nodejs/src/storage/MongoDbBotStorage.ts diff --git a/nodejs/app-task-module/src/storage/NullBotStorage.ts b/samples/app-task-module/nodejs/src/storage/NullBotStorage.ts similarity index 100% rename from nodejs/app-task-module/src/storage/NullBotStorage.ts rename to samples/app-task-module/nodejs/src/storage/NullBotStorage.ts diff --git a/nodejs/app-task-module/src/storage/index.ts b/samples/app-task-module/nodejs/src/storage/index.ts similarity index 100% rename from nodejs/app-task-module/src/storage/index.ts rename to samples/app-task-module/nodejs/src/storage/index.ts diff --git a/nodejs/app-task-module/src/tabs.ts b/samples/app-task-module/nodejs/src/tabs.ts similarity index 100% rename from nodejs/app-task-module/src/tabs.ts rename to samples/app-task-module/nodejs/src/tabs.ts diff --git a/nodejs/app-task-module/src/utils/CardUtils.ts b/samples/app-task-module/nodejs/src/utils/CardUtils.ts similarity index 100% rename from nodejs/app-task-module/src/utils/CardUtils.ts rename to samples/app-task-module/nodejs/src/utils/CardUtils.ts diff --git a/nodejs/app-task-module/src/utils/DeepLinks.ts b/samples/app-task-module/nodejs/src/utils/DeepLinks.ts similarity index 100% rename from nodejs/app-task-module/src/utils/DeepLinks.ts rename to samples/app-task-module/nodejs/src/utils/DeepLinks.ts diff --git a/nodejs/app-task-module/src/utils/Logger.ts b/samples/app-task-module/nodejs/src/utils/Logger.ts similarity index 100% rename from nodejs/app-task-module/src/utils/Logger.ts rename to samples/app-task-module/nodejs/src/utils/Logger.ts diff --git a/nodejs/app-task-module/src/utils/MessageUtils.ts b/samples/app-task-module/nodejs/src/utils/MessageUtils.ts similarity index 100% rename from nodejs/app-task-module/src/utils/MessageUtils.ts rename to samples/app-task-module/nodejs/src/utils/MessageUtils.ts diff --git a/nodejs/app-task-module/src/utils/index.ts b/samples/app-task-module/nodejs/src/utils/index.ts similarity index 100% rename from nodejs/app-task-module/src/utils/index.ts rename to samples/app-task-module/nodejs/src/utils/index.ts diff --git a/nodejs/app-task-module/src/views/configure.pug b/samples/app-task-module/nodejs/src/views/configure.pug similarity index 100% rename from nodejs/app-task-module/src/views/configure.pug rename to samples/app-task-module/nodejs/src/views/configure.pug diff --git a/nodejs/app-task-module/src/views/customform.pug b/samples/app-task-module/nodejs/src/views/customform.pug similarity index 100% rename from nodejs/app-task-module/src/views/customform.pug rename to samples/app-task-module/nodejs/src/views/customform.pug diff --git a/nodejs/app-task-module/src/views/embed.pug b/samples/app-task-module/nodejs/src/views/embed.pug similarity index 100% rename from nodejs/app-task-module/src/views/embed.pug rename to samples/app-task-module/nodejs/src/views/embed.pug diff --git a/nodejs/app-task-module/src/views/first.pug b/samples/app-task-module/nodejs/src/views/first.pug similarity index 100% rename from nodejs/app-task-module/src/views/first.pug rename to samples/app-task-module/nodejs/src/views/first.pug diff --git a/nodejs/app-task-module/src/views/hello.pug b/samples/app-task-module/nodejs/src/views/hello.pug similarity index 100% rename from nodejs/app-task-module/src/views/hello.pug rename to samples/app-task-module/nodejs/src/views/hello.pug diff --git a/nodejs/app-task-module/src/views/layout.pug b/samples/app-task-module/nodejs/src/views/layout.pug similarity index 100% rename from nodejs/app-task-module/src/views/layout.pug rename to samples/app-task-module/nodejs/src/views/layout.pug diff --git a/nodejs/app-task-module/src/views/powerapp.pug b/samples/app-task-module/nodejs/src/views/powerapp.pug similarity index 100% rename from nodejs/app-task-module/src/views/powerapp.pug rename to samples/app-task-module/nodejs/src/views/powerapp.pug diff --git a/nodejs/app-task-module/src/views/second.pug b/samples/app-task-module/nodejs/src/views/second.pug similarity index 100% rename from nodejs/app-task-module/src/views/second.pug rename to samples/app-task-module/nodejs/src/views/second.pug diff --git a/nodejs/app-task-module/src/views/taskmodule.pug b/samples/app-task-module/nodejs/src/views/taskmodule.pug similarity index 100% rename from nodejs/app-task-module/src/views/taskmodule.pug rename to samples/app-task-module/nodejs/src/views/taskmodule.pug diff --git a/nodejs/app-task-module/src/views/youtube.pug b/samples/app-task-module/nodejs/src/views/youtube.pug similarity index 100% rename from nodejs/app-task-module/src/views/youtube.pug rename to samples/app-task-module/nodejs/src/views/youtube.pug diff --git a/nodejs/app-task-module/tsconfig.json b/samples/app-task-module/nodejs/tsconfig.json similarity index 100% rename from nodejs/app-task-module/tsconfig.json rename to samples/app-task-module/nodejs/tsconfig.json diff --git a/nodejs/app-task-module/tsconfig.prod.json b/samples/app-task-module/nodejs/tsconfig.prod.json similarity index 100% rename from nodejs/app-task-module/tsconfig.prod.json rename to samples/app-task-module/nodejs/tsconfig.prod.json diff --git a/nodejs/app-task-module/tslint.json b/samples/app-task-module/nodejs/tslint.json similarity index 100% rename from nodejs/app-task-module/tslint.json rename to samples/app-task-module/nodejs/tslint.json diff --git a/nodejs/app-task-module/web.config b/samples/app-task-module/nodejs/web.config similarity index 100% rename from nodejs/app-task-module/web.config rename to samples/app-task-module/nodejs/web.config diff --git a/csharp/bot-proactive-messaging/.gitignore b/samples/bot-proactive-messaging/csharp/.gitignore similarity index 100% rename from csharp/bot-proactive-messaging/.gitignore rename to samples/bot-proactive-messaging/csharp/.gitignore diff --git a/csharp/bot-proactive-messaging/README.md b/samples/bot-proactive-messaging/csharp/README.md similarity index 100% rename from csharp/bot-proactive-messaging/README.md rename to samples/bot-proactive-messaging/csharp/README.md diff --git a/csharp/bot-proactive-messaging/coordinate-logger/Bot/CoordinateLoggerActivityHandler.cs b/samples/bot-proactive-messaging/csharp/coordinate-logger/Bot/CoordinateLoggerActivityHandler.cs similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/Bot/CoordinateLoggerActivityHandler.cs rename to samples/bot-proactive-messaging/csharp/coordinate-logger/Bot/CoordinateLoggerActivityHandler.cs diff --git a/csharp/bot-proactive-messaging/coordinate-logger/Controllers/BotController.cs b/samples/bot-proactive-messaging/csharp/coordinate-logger/Controllers/BotController.cs similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/Controllers/BotController.cs rename to samples/bot-proactive-messaging/csharp/coordinate-logger/Controllers/BotController.cs diff --git a/csharp/bot-proactive-messaging/coordinate-logger/Program.cs b/samples/bot-proactive-messaging/csharp/coordinate-logger/Program.cs similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/Program.cs rename to samples/bot-proactive-messaging/csharp/coordinate-logger/Program.cs diff --git a/csharp/bot-proactive-messaging/coordinate-logger/Properties/launchSettings.json b/samples/bot-proactive-messaging/csharp/coordinate-logger/Properties/launchSettings.json similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/Properties/launchSettings.json rename to samples/bot-proactive-messaging/csharp/coordinate-logger/Properties/launchSettings.json diff --git a/csharp/bot-proactive-messaging/coordinate-logger/Services/ConnectorClientFactory.cs b/samples/bot-proactive-messaging/csharp/coordinate-logger/Services/ConnectorClientFactory.cs similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/Services/ConnectorClientFactory.cs rename to samples/bot-proactive-messaging/csharp/coordinate-logger/Services/ConnectorClientFactory.cs diff --git a/csharp/bot-proactive-messaging/coordinate-logger/Services/IConnectorClientFactory.cs b/samples/bot-proactive-messaging/csharp/coordinate-logger/Services/IConnectorClientFactory.cs similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/Services/IConnectorClientFactory.cs rename to samples/bot-proactive-messaging/csharp/coordinate-logger/Services/IConnectorClientFactory.cs diff --git a/csharp/bot-proactive-messaging/coordinate-logger/Startup.cs b/samples/bot-proactive-messaging/csharp/coordinate-logger/Startup.cs similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/Startup.cs rename to samples/bot-proactive-messaging/csharp/coordinate-logger/Startup.cs diff --git a/csharp/bot-proactive-messaging/coordinate-logger/appsettings.json b/samples/bot-proactive-messaging/csharp/coordinate-logger/appsettings.json similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/appsettings.json rename to samples/bot-proactive-messaging/csharp/coordinate-logger/appsettings.json diff --git a/csharp/bot-proactive-messaging/coordinate-logger/appsettings.local.json b/samples/bot-proactive-messaging/csharp/coordinate-logger/appsettings.local.json similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/appsettings.local.json rename to samples/bot-proactive-messaging/csharp/coordinate-logger/appsettings.local.json diff --git a/csharp/bot-proactive-messaging/coordinate-logger/msteams-app-coordinatelogger.csproj b/samples/bot-proactive-messaging/csharp/coordinate-logger/msteams-app-coordinatelogger.csproj similarity index 100% rename from csharp/bot-proactive-messaging/coordinate-logger/msteams-app-coordinatelogger.csproj rename to samples/bot-proactive-messaging/csharp/coordinate-logger/msteams-app-coordinatelogger.csproj diff --git a/csharp/bot-proactive-messaging/proactive-cmd/Program.cs b/samples/bot-proactive-messaging/csharp/proactive-cmd/Program.cs similarity index 100% rename from csharp/bot-proactive-messaging/proactive-cmd/Program.cs rename to samples/bot-proactive-messaging/csharp/proactive-cmd/Program.cs diff --git a/csharp/bot-proactive-messaging/proactive-cmd/msteams-app-proactivecmd.csproj b/samples/bot-proactive-messaging/csharp/proactive-cmd/msteams-app-proactivecmd.csproj similarity index 100% rename from csharp/bot-proactive-messaging/proactive-cmd/msteams-app-proactivecmd.csproj rename to samples/bot-proactive-messaging/csharp/proactive-cmd/msteams-app-proactivecmd.csproj diff --git a/csharp/bot-proactive-messaging/teamsAppManifest/color.png b/samples/bot-proactive-messaging/csharp/teamsAppManifest/color.png similarity index 100% rename from csharp/bot-proactive-messaging/teamsAppManifest/color.png rename to samples/bot-proactive-messaging/csharp/teamsAppManifest/color.png diff --git a/csharp/bot-proactive-messaging/teamsAppManifest/manifest.json b/samples/bot-proactive-messaging/csharp/teamsAppManifest/manifest.json similarity index 100% rename from csharp/bot-proactive-messaging/teamsAppManifest/manifest.json rename to samples/bot-proactive-messaging/csharp/teamsAppManifest/manifest.json diff --git a/csharp/bot-proactive-messaging/teamsAppManifest/outline.png b/samples/bot-proactive-messaging/csharp/teamsAppManifest/outline.png similarity index 100% rename from csharp/bot-proactive-messaging/teamsAppManifest/outline.png rename to samples/bot-proactive-messaging/csharp/teamsAppManifest/outline.png diff --git a/nodejs/connector-generic/.gitignore b/samples/connector-generic/nodejs/.gitignore similarity index 100% rename from nodejs/connector-generic/.gitignore rename to samples/connector-generic/nodejs/.gitignore diff --git a/nodejs/connector-generic/LICENSE b/samples/connector-generic/nodejs/LICENSE similarity index 100% rename from nodejs/connector-generic/LICENSE rename to samples/connector-generic/nodejs/LICENSE diff --git a/nodejs/connector-generic/README.md b/samples/connector-generic/nodejs/README.md similarity index 100% rename from nodejs/connector-generic/README.md rename to samples/connector-generic/nodejs/README.md diff --git a/nodejs/connector-generic/app manifest/color_icon.png b/samples/connector-generic/nodejs/app manifest/color_icon.png similarity index 100% rename from nodejs/connector-generic/app manifest/color_icon.png rename to samples/connector-generic/nodejs/app manifest/color_icon.png diff --git a/nodejs/connector-generic/app manifest/manifest.json b/samples/connector-generic/nodejs/app manifest/manifest.json similarity index 100% rename from nodejs/connector-generic/app manifest/manifest.json rename to samples/connector-generic/nodejs/app manifest/manifest.json diff --git a/nodejs/connector-generic/app manifest/outline_icon.png b/samples/connector-generic/nodejs/app manifest/outline_icon.png similarity index 100% rename from nodejs/connector-generic/app manifest/outline_icon.png rename to samples/connector-generic/nodejs/app manifest/outline_icon.png diff --git a/nodejs/connector-generic/package.json b/samples/connector-generic/nodejs/package.json similarity index 100% rename from nodejs/connector-generic/package.json rename to samples/connector-generic/nodejs/package.json diff --git a/nodejs/connector-generic/public/custom/assets/config.PNG b/samples/connector-generic/nodejs/public/custom/assets/config.PNG similarity index 100% rename from nodejs/connector-generic/public/custom/assets/config.PNG rename to samples/connector-generic/nodejs/public/custom/assets/config.PNG diff --git a/nodejs/connector-generic/public/custom/assets/login.PNG b/samples/connector-generic/nodejs/public/custom/assets/login.PNG similarity index 100% rename from nodejs/connector-generic/public/custom/assets/login.PNG rename to samples/connector-generic/nodejs/public/custom/assets/login.PNG diff --git a/nodejs/connector-generic/public/custom/css/msteams-app.css b/samples/connector-generic/nodejs/public/custom/css/msteams-app.css similarity index 100% rename from nodejs/connector-generic/public/custom/css/msteams-app.css rename to samples/connector-generic/nodejs/public/custom/css/msteams-app.css diff --git a/nodejs/connector-generic/public/custom/js/connectorTabConfig.js b/samples/connector-generic/nodejs/public/custom/js/connectorTabConfig.js similarity index 100% rename from nodejs/connector-generic/public/custom/js/connectorTabConfig.js rename to samples/connector-generic/nodejs/public/custom/js/connectorTabConfig.js diff --git a/nodejs/connector-generic/public/custom/js/theme.js b/samples/connector-generic/nodejs/public/custom/js/theme.js similarity index 100% rename from nodejs/connector-generic/public/custom/js/theme.js rename to samples/connector-generic/nodejs/public/custom/js/theme.js diff --git a/nodejs/connector-generic/server.js b/samples/connector-generic/nodejs/server.js similarity index 100% rename from nodejs/connector-generic/server.js rename to samples/connector-generic/nodejs/server.js diff --git a/nodejs/connector-generic/views/connectorconfig.jade b/samples/connector-generic/nodejs/views/connectorconfig.jade similarity index 100% rename from nodejs/connector-generic/views/connectorconfig.jade rename to samples/connector-generic/nodejs/views/connectorconfig.jade diff --git a/nodejs/connector-generic/web.config b/samples/connector-generic/nodejs/web.config similarity index 100% rename from nodejs/connector-generic/web.config rename to samples/connector-generic/nodejs/web.config diff --git a/nodejs/connector-github-notification/.gitignore b/samples/connector-github-notification/nodejs/.gitignore similarity index 100% rename from nodejs/connector-github-notification/.gitignore rename to samples/connector-github-notification/nodejs/.gitignore diff --git a/nodejs/connector-github-notification/README.md b/samples/connector-github-notification/nodejs/README.md similarity index 100% rename from nodejs/connector-github-notification/README.md rename to samples/connector-github-notification/nodejs/README.md diff --git a/nodejs/connector-github-notification/config/default.json b/samples/connector-github-notification/nodejs/config/default.json similarity index 100% rename from nodejs/connector-github-notification/config/default.json rename to samples/connector-github-notification/nodejs/config/default.json diff --git a/nodejs/connector-github-notification/manifest/manifest.json b/samples/connector-github-notification/nodejs/manifest/manifest.json similarity index 100% rename from nodejs/connector-github-notification/manifest/manifest.json rename to samples/connector-github-notification/nodejs/manifest/manifest.json diff --git a/nodejs/connector-github-notification/manifest/manifest.zip b/samples/connector-github-notification/nodejs/manifest/manifest.zip similarity index 100% rename from nodejs/connector-github-notification/manifest/manifest.zip rename to samples/connector-github-notification/nodejs/manifest/manifest.zip diff --git a/nodejs/connector-github-notification/models/config.js b/samples/connector-github-notification/nodejs/models/config.js similarity index 100% rename from nodejs/connector-github-notification/models/config.js rename to samples/connector-github-notification/nodejs/models/config.js diff --git a/nodejs/connector-github-notification/models/user.js b/samples/connector-github-notification/nodejs/models/user.js similarity index 100% rename from nodejs/connector-github-notification/models/user.js rename to samples/connector-github-notification/nodejs/models/user.js diff --git a/nodejs/connector-github-notification/package.json b/samples/connector-github-notification/nodejs/package.json similarity index 100% rename from nodejs/connector-github-notification/package.json rename to samples/connector-github-notification/nodejs/package.json diff --git a/nodejs/connector-github-notification/public/custom/js/app.js b/samples/connector-github-notification/nodejs/public/custom/js/app.js similarity index 100% rename from nodejs/connector-github-notification/public/custom/js/app.js rename to samples/connector-github-notification/nodejs/public/custom/js/app.js diff --git a/nodejs/connector-github-notification/public/custom/resources/github44.png b/samples/connector-github-notification/nodejs/public/custom/resources/github44.png similarity index 100% rename from nodejs/connector-github-notification/public/custom/resources/github44.png rename to samples/connector-github-notification/nodejs/public/custom/resources/github44.png diff --git a/nodejs/connector-github-notification/server.js b/samples/connector-github-notification/nodejs/server.js similarity index 100% rename from nodejs/connector-github-notification/server.js rename to samples/connector-github-notification/nodejs/server.js diff --git a/nodejs/connector-github-notification/utils/util.js b/samples/connector-github-notification/nodejs/utils/util.js similarity index 100% rename from nodejs/connector-github-notification/utils/util.js rename to samples/connector-github-notification/nodejs/utils/util.js diff --git a/nodejs/connector-github-notification/views/close.jade b/samples/connector-github-notification/nodejs/views/close.jade similarity index 100% rename from nodejs/connector-github-notification/views/close.jade rename to samples/connector-github-notification/nodejs/views/close.jade diff --git a/nodejs/connector-github-notification/views/config.jade b/samples/connector-github-notification/nodejs/views/config.jade similarity index 100% rename from nodejs/connector-github-notification/views/config.jade rename to samples/connector-github-notification/nodejs/views/config.jade diff --git a/nodejs/connector-github-notification/views/githubsignin.jade b/samples/connector-github-notification/nodejs/views/githubsignin.jade similarity index 100% rename from nodejs/connector-github-notification/views/githubsignin.jade rename to samples/connector-github-notification/nodejs/views/githubsignin.jade diff --git a/nodejs/connector-github-notification/views/signin.jade b/samples/connector-github-notification/nodejs/views/signin.jade similarity index 100% rename from nodejs/connector-github-notification/views/signin.jade rename to samples/connector-github-notification/nodejs/views/signin.jade diff --git a/nodejs/connector-github-notification/web.config b/samples/connector-github-notification/nodejs/web.config similarity index 100% rename from nodejs/connector-github-notification/web.config rename to samples/connector-github-notification/nodejs/web.config diff --git a/csharp/connector-todo-notification/.gitattributes b/samples/connector-todo-notification/csharp/.gitattributes similarity index 100% rename from csharp/connector-todo-notification/.gitattributes rename to samples/connector-todo-notification/csharp/.gitattributes diff --git a/csharp/connector-todo-notification/.gitignore b/samples/connector-todo-notification/csharp/.gitignore similarity index 100% rename from csharp/connector-todo-notification/.gitignore rename to samples/connector-todo-notification/csharp/.gitignore diff --git a/csharp/connector-todo-notification/README.md b/samples/connector-todo-notification/csharp/README.md similarity index 100% rename from csharp/connector-todo-notification/README.md rename to samples/connector-todo-notification/csharp/README.md diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector.sln b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector.sln similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector.sln rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector.sln diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/BundleConfig.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/BundleConfig.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/BundleConfig.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/BundleConfig.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/FilterConfig.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/FilterConfig.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/FilterConfig.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/FilterConfig.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/RouteConfig.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/RouteConfig.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/RouteConfig.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/RouteConfig.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/WebApiConfig.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/WebApiConfig.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/App_Start/WebApiConfig.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/App_Start/WebApiConfig.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/ApplicationInsights.config b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/ApplicationInsights.config similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/ApplicationInsights.config rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/ApplicationInsights.config diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Content/Site.css b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Content/Site.css similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Content/Site.css rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Content/Site.css diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Content/bootstrap.css b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Content/bootstrap.css similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Content/bootstrap.css rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Content/bootstrap.css diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Content/bootstrap.min.css b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Content/bootstrap.min.css similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Content/bootstrap.min.css rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Content/bootstrap.min.css diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Controllers/ConnectorController.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Controllers/ConnectorController.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Controllers/ConnectorController.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Controllers/ConnectorController.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Controllers/TaskController.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Controllers/TaskController.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Controllers/TaskController.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Controllers/TaskController.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Global.asax b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Global.asax similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Global.asax rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Global.asax diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Global.asax.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Global.asax.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Global.asax.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Global.asax.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Models/Request.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/Request.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Models/Request.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/Request.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Models/Subscription.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/Subscription.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Models/Subscription.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/Subscription.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Models/ToDoItem.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/ToDoItem.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Models/ToDoItem.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/ToDoItem.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Models/WebhookDetails.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/WebhookDetails.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Models/WebhookDetails.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Models/WebhookDetails.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Properties/AssemblyInfo.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Properties/AssemblyInfo.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Properties/AssemblyInfo.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Properties/AssemblyInfo.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Repository/SubscriptionRepository.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Repository/SubscriptionRepository.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Repository/SubscriptionRepository.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Repository/SubscriptionRepository.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Repository/TaskRepository.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Repository/TaskRepository.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Repository/TaskRepository.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Repository/TaskRepository.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/bootstrap.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/bootstrap.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/bootstrap.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/bootstrap.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/bootstrap.min.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/bootstrap.min.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/bootstrap.min.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/bootstrap.min.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.intellisense.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.intellisense.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.intellisense.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.intellisense.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.map b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.map similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.map rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/jquery-1.10.2.min.map diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/modernizr-2.6.2.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/modernizr-2.6.2.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/modernizr-2.6.2.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/modernizr-2.6.2.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/respond.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/respond.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/respond.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/respond.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/respond.min.js b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/respond.min.js similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Scripts/respond.min.js rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Scripts/respond.min.js diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/color_icon.png b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/color_icon.png similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/color_icon.png rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/color_icon.png diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/manifest-CShar.zip b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/manifest-CShar.zip similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/manifest-CShar.zip rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/manifest-CShar.zip diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/manifest.json b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/manifest.json similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/manifest.json rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/manifest.json diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/outline_icon.png b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/outline_icon.png similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsAppPackages/outline_icon.png rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsAppPackages/outline_icon.png diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsToDoAppConnector.csproj b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsToDoAppConnector.csproj similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/TeamsToDoAppConnector.csproj rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/TeamsToDoAppConnector.csproj diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Utils/AppSettings.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Utils/AppSettings.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Utils/AppSettings.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Utils/AppSettings.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Utils/TaskHelper.cs b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Utils/TaskHelper.cs similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Utils/TaskHelper.cs rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Utils/TaskHelper.cs diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Connector/Error.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Connector/Error.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Connector/Error.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Connector/Error.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Connector/Register.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Connector/Register.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Connector/Register.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Connector/Register.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Connector/Setup.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Connector/Setup.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Connector/Setup.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Connector/Setup.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Shared/Error.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Shared/Error.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Shared/Error.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Shared/Error.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Shared/_Layout.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Shared/_Layout.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Shared/_Layout.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Shared/_Layout.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Task/Create.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Task/Create.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Task/Create.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Task/Create.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Task/Detail.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Task/Detail.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Task/Detail.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Task/Detail.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Task/Index.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Task/Index.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Task/Index.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Task/Index.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Web.config b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Web.config similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/Web.config rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/Web.config diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Views/_ViewStart.cshtml b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/_ViewStart.cshtml similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Views/_ViewStart.cshtml rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Views/_ViewStart.cshtml diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Web.Debug.config b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Web.Debug.config similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Web.Debug.config rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Web.Debug.config diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Web.Release.config b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Web.Release.config similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Web.Release.config rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Web.Release.config diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/Web.config b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Web.config similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/Web.config rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/Web.config diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/favicon.ico b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/favicon.ico similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/favicon.ico rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/favicon.ico diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.eot b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.eot rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.eot diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.svg b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.svg rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.svg diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.ttf b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.ttf rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.ttf diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.woff b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.woff rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/fonts/glyphicons-halflings-regular.woff diff --git a/csharp/connector-todo-notification/TeamsToDoAppConnector/packages.config b/samples/connector-todo-notification/csharp/TeamsToDoAppConnector/packages.config similarity index 100% rename from csharp/connector-todo-notification/TeamsToDoAppConnector/packages.config rename to samples/connector-todo-notification/csharp/TeamsToDoAppConnector/packages.config diff --git a/csharp/msgext-link-unfurling-reddit/.gitattributes b/samples/msgext-link-unfurling-reddit/csharp/.gitattributes similarity index 100% rename from csharp/msgext-link-unfurling-reddit/.gitattributes rename to samples/msgext-link-unfurling-reddit/csharp/.gitattributes diff --git a/csharp/msgext-link-unfurling-reddit/.gitignore b/samples/msgext-link-unfurling-reddit/csharp/.gitignore similarity index 100% rename from csharp/msgext-link-unfurling-reddit/.gitignore rename to samples/msgext-link-unfurling-reddit/csharp/.gitignore diff --git a/csharp/msgext-link-unfurling-reddit/Build/Analyzer.ruleset b/samples/msgext-link-unfurling-reddit/csharp/Build/Analyzer.ruleset similarity index 100% rename from csharp/msgext-link-unfurling-reddit/Build/Analyzer.ruleset rename to samples/msgext-link-unfurling-reddit/csharp/Build/Analyzer.ruleset diff --git a/csharp/msgext-link-unfurling-reddit/Build/stylecop.json b/samples/msgext-link-unfurling-reddit/csharp/Build/stylecop.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/Build/stylecop.json rename to samples/msgext-link-unfurling-reddit/csharp/Build/stylecop.json diff --git a/csharp/msgext-link-unfurling-reddit/Manifest/color.png b/samples/msgext-link-unfurling-reddit/csharp/Manifest/color.png similarity index 100% rename from csharp/msgext-link-unfurling-reddit/Manifest/color.png rename to samples/msgext-link-unfurling-reddit/csharp/Manifest/color.png diff --git a/csharp/msgext-link-unfurling-reddit/Manifest/manifest.json b/samples/msgext-link-unfurling-reddit/csharp/Manifest/manifest.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/Manifest/manifest.json rename to samples/msgext-link-unfurling-reddit/csharp/Manifest/manifest.json diff --git a/csharp/msgext-link-unfurling-reddit/Manifest/outline.png b/samples/msgext-link-unfurling-reddit/csharp/Manifest/outline.png similarity index 100% rename from csharp/msgext-link-unfurling-reddit/Manifest/outline.png rename to samples/msgext-link-unfurling-reddit/csharp/Manifest/outline.png diff --git a/csharp/msgext-link-unfurling-reddit/README.md b/samples/msgext-link-unfurling-reddit/csharp/README.md similarity index 100% rename from csharp/msgext-link-unfurling-reddit/README.md rename to samples/msgext-link-unfurling-reddit/csharp/README.md diff --git a/csharp/msgext-link-unfurling-reddit/doc/images/AdaptiveCard.PNG b/samples/msgext-link-unfurling-reddit/csharp/doc/images/AdaptiveCard.PNG similarity index 100% rename from csharp/msgext-link-unfurling-reddit/doc/images/AdaptiveCard.PNG rename to samples/msgext-link-unfurling-reddit/csharp/doc/images/AdaptiveCard.PNG diff --git a/csharp/msgext-link-unfurling-reddit/doc/images/AuthorizationPrompt.PNG b/samples/msgext-link-unfurling-reddit/csharp/doc/images/AuthorizationPrompt.PNG similarity index 100% rename from csharp/msgext-link-unfurling-reddit/doc/images/AuthorizationPrompt.PNG rename to samples/msgext-link-unfurling-reddit/csharp/doc/images/AuthorizationPrompt.PNG diff --git a/csharp/msgext-link-unfurling-reddit/doc/images/ComposeLogin.PNG b/samples/msgext-link-unfurling-reddit/csharp/doc/images/ComposeLogin.PNG similarity index 100% rename from csharp/msgext-link-unfurling-reddit/doc/images/ComposeLogin.PNG rename to samples/msgext-link-unfurling-reddit/csharp/doc/images/ComposeLogin.PNG diff --git a/csharp/msgext-link-unfurling-reddit/doc/images/HeroCard.PNG b/samples/msgext-link-unfurling-reddit/csharp/doc/images/HeroCard.PNG similarity index 100% rename from csharp/msgext-link-unfurling-reddit/doc/images/HeroCard.PNG rename to samples/msgext-link-unfurling-reddit/csharp/doc/images/HeroCard.PNG diff --git a/csharp/msgext-link-unfurling-reddit/doc/images/Preview.gif b/samples/msgext-link-unfurling-reddit/csharp/doc/images/Preview.gif similarity index 100% rename from csharp/msgext-link-unfurling-reddit/doc/images/Preview.gif rename to samples/msgext-link-unfurling-reddit/csharp/doc/images/Preview.gif diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/Analyzer.ruleset b/samples/msgext-link-unfurling-reddit/csharp/dotnet/Analyzer.ruleset similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/Analyzer.ruleset rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/Analyzer.ruleset diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/BotLocalizationCultureProvider.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/BotLocalizationCultureProvider.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/BotLocalizationCultureProvider.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/BotLocalizationCultureProvider.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/Controllers/BotController.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/Controllers/BotController.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/Controllers/BotController.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/Controllers/BotController.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/Program.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/Program.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/Program.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/Program.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/Properties/launchSettings.json b/samples/msgext-link-unfurling-reddit/csharp/dotnet/Properties/launchSettings.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/Properties/launchSettings.json rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/Properties/launchSettings.json diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/README.md b/samples/msgext-link-unfurling-reddit/csharp/dotnet/README.md similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/README.md rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/README.md diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RLU.csproj b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RLU.csproj similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RLU.csproj rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RLU.csproj diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RLUTeamsActivityHandler.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RLUTeamsActivityHandler.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RLUTeamsActivityHandler.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RLUTeamsActivityHandler.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/IRedditAuthenticator.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/IRedditAuthenticator.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/IRedditAuthenticator.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/IRedditAuthenticator.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditAppAuthenticator.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditAppAuthenticator.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditAppAuthenticator.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditAppAuthenticator.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditHttpClient.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditHttpClient.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditHttpClient.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditHttpClient.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditLinkModel.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditLinkModel.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditLinkModel.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditLinkModel.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditOptions.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditOptions.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditOptions.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditOptions.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditRequestException.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditRequestException.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditRequestException.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditRequestException.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditUnauthorizedException.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditUnauthorizedException.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditApi/RedditUnauthorizedException.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditApi/RedditUnauthorizedException.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/RedditLinkUnfurl.Net.sln b/samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditLinkUnfurl.Net.sln similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/RedditLinkUnfurl.Net.sln rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/RedditLinkUnfurl.Net.sln diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/Resources/RLUTeamsActivityHandler.fr.resx b/samples/msgext-link-unfurling-reddit/csharp/dotnet/Resources/RLUTeamsActivityHandler.fr.resx similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/Resources/RLUTeamsActivityHandler.fr.resx rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/Resources/RLUTeamsActivityHandler.fr.resx diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/Startup.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet/Startup.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/Startup.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/Startup.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/appsettings.json b/samples/msgext-link-unfurling-reddit/csharp/dotnet/appsettings.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/appsettings.json rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/appsettings.json diff --git a/csharp/msgext-link-unfurling-reddit/dotnet/stylecop.json b/samples/msgext-link-unfurling-reddit/csharp/dotnet/stylecop.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet/stylecop.json rename to samples/msgext-link-unfurling-reddit/csharp/dotnet/stylecop.json diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/BotLocalizationCultureProvider.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/BotLocalizationCultureProvider.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/BotLocalizationCultureProvider.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/BotLocalizationCultureProvider.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/.gitignore b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/.gitignore similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/.gitignore rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/.gitignore diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/package.json b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/package.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/package.json rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/package.json diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/public/index.html b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/public/index.html similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/public/index.html rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/public/index.html diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/src/App.tsx b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/src/App.tsx similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/src/App.tsx rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/src/App.tsx diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/src/index.tsx b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/src/index.tsx similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/src/index.tsx rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/src/index.tsx diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/tsconfig.json b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/tsconfig.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/tsconfig.json rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/tsconfig.json diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/yarn.lock b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/yarn.lock similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/ClientApp/yarn.lock rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/ClientApp/yarn.lock diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Controllers/BotController.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Controllers/BotController.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Controllers/BotController.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Controllers/BotController.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Program.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Program.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Program.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Program.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Properties/launchSettings.json b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Properties/launchSettings.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Properties/launchSettings.json rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Properties/launchSettings.json diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/README.md b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/README.md similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/README.md rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/README.md diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RLU.csproj b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RLU.csproj similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RLU.csproj rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RLU.csproj diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RLUTeamsActivityHandler.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RLUTeamsActivityHandler.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RLUTeamsActivityHandler.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RLUTeamsActivityHandler.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditHttpClient.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditHttpClient.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditHttpClient.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditHttpClient.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditLinkModel.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditLinkModel.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditLinkModel.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditLinkModel.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditOptions.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditOptions.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditOptions.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditOptions.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditRequestException.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditRequestException.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditRequestException.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditRequestException.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditUnauthorizedException.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditUnauthorizedException.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditApi/RedditUnauthorizedException.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditApi/RedditUnauthorizedException.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditLinkUnfurl.Net.sln b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditLinkUnfurl.Net.sln similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/RedditLinkUnfurl.Net.sln rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/RedditLinkUnfurl.Net.sln diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Resources/RLUTeamsActivityHandler.fr.resx b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Resources/RLUTeamsActivityHandler.fr.resx similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Resources/RLUTeamsActivityHandler.fr.resx rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Resources/RLUTeamsActivityHandler.fr.resx diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Startup.cs b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Startup.cs similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/Startup.cs rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/Startup.cs diff --git a/csharp/msgext-link-unfurling-reddit/dotnet_user_auth/appsettings.json b/samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/appsettings.json similarity index 100% rename from csharp/msgext-link-unfurling-reddit/dotnet_user_auth/appsettings.json rename to samples/msgext-link-unfurling-reddit/csharp/dotnet_user_auth/appsettings.json diff --git a/csharp/mtgext-token-app/.gitignore b/samples/mtgext-token-app/csharp/.gitignore similarity index 100% rename from csharp/mtgext-token-app/.gitignore rename to samples/mtgext-token-app/csharp/.gitignore diff --git a/csharp/mtgext-token-app/AdapterWithErrorHandler.cs b/samples/mtgext-token-app/csharp/AdapterWithErrorHandler.cs similarity index 100% rename from csharp/mtgext-token-app/AdapterWithErrorHandler.cs rename to samples/mtgext-token-app/csharp/AdapterWithErrorHandler.cs diff --git a/csharp/mtgext-token-app/App/.babelrc b/samples/mtgext-token-app/csharp/App/.babelrc similarity index 100% rename from csharp/mtgext-token-app/App/.babelrc rename to samples/mtgext-token-app/csharp/App/.babelrc diff --git a/csharp/mtgext-token-app/App/package-lock.json b/samples/mtgext-token-app/csharp/App/package-lock.json similarity index 100% rename from csharp/mtgext-token-app/App/package-lock.json rename to samples/mtgext-token-app/csharp/App/package-lock.json diff --git a/csharp/mtgext-token-app/App/package.json b/samples/mtgext-token-app/csharp/App/package.json similarity index 100% rename from csharp/mtgext-token-app/App/package.json rename to samples/mtgext-token-app/csharp/App/package.json diff --git a/csharp/mtgext-token-app/App/public/MeetingtokenApp.png b/samples/mtgext-token-app/csharp/App/public/MeetingtokenApp.png similarity index 100% rename from csharp/mtgext-token-app/App/public/MeetingtokenApp.png rename to samples/mtgext-token-app/csharp/App/public/MeetingtokenApp.png diff --git a/csharp/mtgext-token-app/App/public/configure.html b/samples/mtgext-token-app/csharp/App/public/configure.html similarity index 100% rename from csharp/mtgext-token-app/App/public/configure.html rename to samples/mtgext-token-app/csharp/App/public/configure.html diff --git a/csharp/mtgext-token-app/App/public/contentBubble.html b/samples/mtgext-token-app/csharp/App/public/contentBubble.html similarity index 100% rename from csharp/mtgext-token-app/App/public/contentBubble.html rename to samples/mtgext-token-app/csharp/App/public/contentBubble.html diff --git a/csharp/mtgext-token-app/App/public/default.html b/samples/mtgext-token-app/csharp/App/public/default.html similarity index 100% rename from csharp/mtgext-token-app/App/public/default.html rename to samples/mtgext-token-app/csharp/App/public/default.html diff --git a/csharp/mtgext-token-app/App/public/favicon.ico b/samples/mtgext-token-app/csharp/App/public/favicon.ico similarity index 100% rename from csharp/mtgext-token-app/App/public/favicon.ico rename to samples/mtgext-token-app/csharp/App/public/favicon.ico diff --git a/csharp/mtgext-token-app/App/src/Components/DoneTokenButton.js b/samples/mtgext-token-app/csharp/App/src/Components/DoneTokenButton.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/DoneTokenButton.js rename to samples/mtgext-token-app/csharp/App/src/Components/DoneTokenButton.js diff --git a/csharp/mtgext-token-app/App/src/Components/ErrorMessageBar.js b/samples/mtgext-token-app/csharp/App/src/Components/ErrorMessageBar.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/ErrorMessageBar.js rename to samples/mtgext-token-app/csharp/App/src/Components/ErrorMessageBar.js diff --git a/csharp/mtgext-token-app/App/src/Components/GetTokenButton.js b/samples/mtgext-token-app/csharp/App/src/Components/GetTokenButton.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/GetTokenButton.js rename to samples/mtgext-token-app/csharp/App/src/Components/GetTokenButton.js diff --git a/csharp/mtgext-token-app/App/src/Components/SkipCurrentTokenButton.js b/samples/mtgext-token-app/csharp/App/src/Components/SkipCurrentTokenButton.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/SkipCurrentTokenButton.js rename to samples/mtgext-token-app/csharp/App/src/Components/SkipCurrentTokenButton.js diff --git a/csharp/mtgext-token-app/App/src/Components/StatusRefresher.js b/samples/mtgext-token-app/csharp/App/src/Components/StatusRefresher.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/StatusRefresher.js rename to samples/mtgext-token-app/csharp/App/src/Components/StatusRefresher.js diff --git a/csharp/mtgext-token-app/App/src/Components/TokenActionButtons.js b/samples/mtgext-token-app/csharp/App/src/Components/TokenActionButtons.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/TokenActionButtons.js rename to samples/mtgext-token-app/csharp/App/src/Components/TokenActionButtons.js diff --git a/csharp/mtgext-token-app/App/src/Components/TokenIndicator.js b/samples/mtgext-token-app/csharp/App/src/Components/TokenIndicator.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/TokenIndicator.js rename to samples/mtgext-token-app/csharp/App/src/Components/TokenIndicator.js diff --git a/csharp/mtgext-token-app/App/src/Components/UserList.js b/samples/mtgext-token-app/csharp/App/src/Components/UserList.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Components/UserList.js rename to samples/mtgext-token-app/csharp/App/src/Components/UserList.js diff --git a/csharp/mtgext-token-app/App/src/Constants/MeetingRoles.js b/samples/mtgext-token-app/csharp/App/src/Constants/MeetingRoles.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Constants/MeetingRoles.js rename to samples/mtgext-token-app/csharp/App/src/Constants/MeetingRoles.js diff --git a/csharp/mtgext-token-app/App/src/Constants/MeetingTokenStatus.js b/samples/mtgext-token-app/csharp/App/src/Constants/MeetingTokenStatus.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Constants/MeetingTokenStatus.js rename to samples/mtgext-token-app/csharp/App/src/Constants/MeetingTokenStatus.js diff --git a/csharp/mtgext-token-app/App/src/Constants/ServiceConstants.js b/samples/mtgext-token-app/csharp/App/src/Constants/ServiceConstants.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Constants/ServiceConstants.js rename to samples/mtgext-token-app/csharp/App/src/Constants/ServiceConstants.js diff --git a/csharp/mtgext-token-app/App/src/Constants/index.js b/samples/mtgext-token-app/csharp/App/src/Constants/index.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Constants/index.js rename to samples/mtgext-token-app/csharp/App/src/Constants/index.js diff --git a/csharp/mtgext-token-app/App/src/Containers/MeetingTokenApp.js b/samples/mtgext-token-app/csharp/App/src/Containers/MeetingTokenApp.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Containers/MeetingTokenApp.js rename to samples/mtgext-token-app/csharp/App/src/Containers/MeetingTokenApp.js diff --git a/csharp/mtgext-token-app/App/src/Containers/SurfaceSelector.js b/samples/mtgext-token-app/csharp/App/src/Containers/SurfaceSelector.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Containers/SurfaceSelector.js rename to samples/mtgext-token-app/csharp/App/src/Containers/SurfaceSelector.js diff --git a/csharp/mtgext-token-app/App/src/Context/MeetingServiceProvider.js b/samples/mtgext-token-app/csharp/App/src/Context/MeetingServiceProvider.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Context/MeetingServiceProvider.js rename to samples/mtgext-token-app/csharp/App/src/Context/MeetingServiceProvider.js diff --git a/csharp/mtgext-token-app/App/src/Context/TeamsContextProvider.js b/samples/mtgext-token-app/csharp/App/src/Context/TeamsContextProvider.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Context/TeamsContextProvider.js rename to samples/mtgext-token-app/csharp/App/src/Context/TeamsContextProvider.js diff --git a/csharp/mtgext-token-app/App/src/Pages/PreMeeting.js b/samples/mtgext-token-app/csharp/App/src/Pages/PreMeeting.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Pages/PreMeeting.js rename to samples/mtgext-token-app/csharp/App/src/Pages/PreMeeting.js diff --git a/csharp/mtgext-token-app/App/src/Pages/SidePanel.js b/samples/mtgext-token-app/csharp/App/src/Pages/SidePanel.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Pages/SidePanel.js rename to samples/mtgext-token-app/csharp/App/src/Pages/SidePanel.js diff --git a/csharp/mtgext-token-app/App/src/Service/Auth.js b/samples/mtgext-token-app/csharp/App/src/Service/Auth.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Service/Auth.js rename to samples/mtgext-token-app/csharp/App/src/Service/Auth.js diff --git a/csharp/mtgext-token-app/App/src/Service/Context.js b/samples/mtgext-token-app/csharp/App/src/Service/Context.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Service/Context.js rename to samples/mtgext-token-app/csharp/App/src/Service/Context.js diff --git a/csharp/mtgext-token-app/App/src/Service/MeetingTokenService.js b/samples/mtgext-token-app/csharp/App/src/Service/MeetingTokenService.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Service/MeetingTokenService.js rename to samples/mtgext-token-app/csharp/App/src/Service/MeetingTokenService.js diff --git a/csharp/mtgext-token-app/App/src/Service/StatusRefresh.js b/samples/mtgext-token-app/csharp/App/src/Service/StatusRefresh.js similarity index 100% rename from csharp/mtgext-token-app/App/src/Service/StatusRefresh.js rename to samples/mtgext-token-app/csharp/App/src/Service/StatusRefresh.js diff --git a/csharp/mtgext-token-app/App/src/index.html b/samples/mtgext-token-app/csharp/App/src/index.html similarity index 100% rename from csharp/mtgext-token-app/App/src/index.html rename to samples/mtgext-token-app/csharp/App/src/index.html diff --git a/csharp/mtgext-token-app/App/src/index.js b/samples/mtgext-token-app/csharp/App/src/index.js similarity index 100% rename from csharp/mtgext-token-app/App/src/index.js rename to samples/mtgext-token-app/csharp/App/src/index.js diff --git a/csharp/mtgext-token-app/App/src/style.css b/samples/mtgext-token-app/csharp/App/src/style.css similarity index 100% rename from csharp/mtgext-token-app/App/src/style.css rename to samples/mtgext-token-app/csharp/App/src/style.css diff --git a/csharp/mtgext-token-app/App/webpack.config.js b/samples/mtgext-token-app/csharp/App/webpack.config.js similarity index 100% rename from csharp/mtgext-token-app/App/webpack.config.js rename to samples/mtgext-token-app/csharp/App/webpack.config.js diff --git a/csharp/mtgext-token-app/Bots/TokenBot.cs b/samples/mtgext-token-app/csharp/Bots/TokenBot.cs similarity index 100% rename from csharp/mtgext-token-app/Bots/TokenBot.cs rename to samples/mtgext-token-app/csharp/Bots/TokenBot.cs diff --git a/csharp/mtgext-token-app/Constants/Claims.cs b/samples/mtgext-token-app/csharp/Constants/Claims.cs similarity index 100% rename from csharp/mtgext-token-app/Constants/Claims.cs rename to samples/mtgext-token-app/csharp/Constants/Claims.cs diff --git a/csharp/mtgext-token-app/Constants/UserRoles.cs b/samples/mtgext-token-app/csharp/Constants/UserRoles.cs similarity index 100% rename from csharp/mtgext-token-app/Constants/UserRoles.cs rename to samples/mtgext-token-app/csharp/Constants/UserRoles.cs diff --git a/csharp/mtgext-token-app/Controllers/BotController.cs b/samples/mtgext-token-app/csharp/Controllers/BotController.cs similarity index 100% rename from csharp/mtgext-token-app/Controllers/BotController.cs rename to samples/mtgext-token-app/csharp/Controllers/BotController.cs diff --git a/csharp/mtgext-token-app/Controllers/TokenController.cs b/samples/mtgext-token-app/csharp/Controllers/TokenController.cs similarity index 100% rename from csharp/mtgext-token-app/Controllers/TokenController.cs rename to samples/mtgext-token-app/csharp/Controllers/TokenController.cs diff --git a/csharp/mtgext-token-app/Extensions/EnumerableExtensions.cs b/samples/mtgext-token-app/csharp/Extensions/EnumerableExtensions.cs similarity index 100% rename from csharp/mtgext-token-app/Extensions/EnumerableExtensions.cs rename to samples/mtgext-token-app/csharp/Extensions/EnumerableExtensions.cs diff --git a/csharp/mtgext-token-app/Extensions/HttpContextExtensions.cs b/samples/mtgext-token-app/csharp/Extensions/HttpContextExtensions.cs similarity index 100% rename from csharp/mtgext-token-app/Extensions/HttpContextExtensions.cs rename to samples/mtgext-token-app/csharp/Extensions/HttpContextExtensions.cs diff --git a/csharp/mtgext-token-app/Extensions/StringExtensions.cs b/samples/mtgext-token-app/csharp/Extensions/StringExtensions.cs similarity index 100% rename from csharp/mtgext-token-app/Extensions/StringExtensions.cs rename to samples/mtgext-token-app/csharp/Extensions/StringExtensions.cs diff --git a/csharp/mtgext-token-app/Models/Conversation.cs b/samples/mtgext-token-app/csharp/Models/Conversation.cs similarity index 100% rename from csharp/mtgext-token-app/Models/Conversation.cs rename to samples/mtgext-token-app/csharp/Models/Conversation.cs diff --git a/csharp/mtgext-token-app/Models/MeetingMetadata.cs b/samples/mtgext-token-app/csharp/Models/MeetingMetadata.cs similarity index 100% rename from csharp/mtgext-token-app/Models/MeetingMetadata.cs rename to samples/mtgext-token-app/csharp/Models/MeetingMetadata.cs diff --git a/csharp/mtgext-token-app/Models/MeetingSummary.cs b/samples/mtgext-token-app/csharp/Models/MeetingSummary.cs similarity index 100% rename from csharp/mtgext-token-app/Models/MeetingSummary.cs rename to samples/mtgext-token-app/csharp/Models/MeetingSummary.cs diff --git a/csharp/mtgext-token-app/Models/TokenStatus.cs b/samples/mtgext-token-app/csharp/Models/TokenStatus.cs similarity index 100% rename from csharp/mtgext-token-app/Models/TokenStatus.cs rename to samples/mtgext-token-app/csharp/Models/TokenStatus.cs diff --git a/csharp/mtgext-token-app/Models/UserInfo.cs b/samples/mtgext-token-app/csharp/Models/UserInfo.cs similarity index 100% rename from csharp/mtgext-token-app/Models/UserInfo.cs rename to samples/mtgext-token-app/csharp/Models/UserInfo.cs diff --git a/csharp/mtgext-token-app/Models/UserRole.cs b/samples/mtgext-token-app/csharp/Models/UserRole.cs similarity index 100% rename from csharp/mtgext-token-app/Models/UserRole.cs rename to samples/mtgext-token-app/csharp/Models/UserRole.cs diff --git a/csharp/mtgext-token-app/Models/UserToken.cs b/samples/mtgext-token-app/csharp/Models/UserToken.cs similarity index 100% rename from csharp/mtgext-token-app/Models/UserToken.cs rename to samples/mtgext-token-app/csharp/Models/UserToken.cs diff --git a/csharp/mtgext-token-app/Program.cs b/samples/mtgext-token-app/csharp/Program.cs similarity index 100% rename from csharp/mtgext-token-app/Program.cs rename to samples/mtgext-token-app/csharp/Program.cs diff --git a/csharp/mtgext-token-app/README.md b/samples/mtgext-token-app/csharp/README.md similarity index 100% rename from csharp/mtgext-token-app/README.md rename to samples/mtgext-token-app/csharp/README.md diff --git a/csharp/mtgext-token-app/Repository/IMeetingTokenRepository.cs b/samples/mtgext-token-app/csharp/Repository/IMeetingTokenRepository.cs similarity index 100% rename from csharp/mtgext-token-app/Repository/IMeetingTokenRepository.cs rename to samples/mtgext-token-app/csharp/Repository/IMeetingTokenRepository.cs diff --git a/csharp/mtgext-token-app/Repository/ITenantInfoRepository.cs b/samples/mtgext-token-app/csharp/Repository/ITenantInfoRepository.cs similarity index 100% rename from csharp/mtgext-token-app/Repository/ITenantInfoRepository.cs rename to samples/mtgext-token-app/csharp/Repository/ITenantInfoRepository.cs diff --git a/csharp/mtgext-token-app/Repository/InMemoryMeetingTokenRepository.cs b/samples/mtgext-token-app/csharp/Repository/InMemoryMeetingTokenRepository.cs similarity index 100% rename from csharp/mtgext-token-app/Repository/InMemoryMeetingTokenRepository.cs rename to samples/mtgext-token-app/csharp/Repository/InMemoryMeetingTokenRepository.cs diff --git a/csharp/mtgext-token-app/Repository/InMemoryTenantInfoRepository.cs b/samples/mtgext-token-app/csharp/Repository/InMemoryTenantInfoRepository.cs similarity index 100% rename from csharp/mtgext-token-app/Repository/InMemoryTenantInfoRepository.cs rename to samples/mtgext-token-app/csharp/Repository/InMemoryTenantInfoRepository.cs diff --git a/csharp/mtgext-token-app/Resources/Manifest/icon-color.png b/samples/mtgext-token-app/csharp/Resources/Manifest/icon-color.png similarity index 100% rename from csharp/mtgext-token-app/Resources/Manifest/icon-color.png rename to samples/mtgext-token-app/csharp/Resources/Manifest/icon-color.png diff --git a/csharp/mtgext-token-app/Resources/Manifest/icon-outline.png b/samples/mtgext-token-app/csharp/Resources/Manifest/icon-outline.png similarity index 100% rename from csharp/mtgext-token-app/Resources/Manifest/icon-outline.png rename to samples/mtgext-token-app/csharp/Resources/Manifest/icon-outline.png diff --git a/csharp/mtgext-token-app/Resources/Manifest/manifest.json b/samples/mtgext-token-app/csharp/Resources/Manifest/manifest.json similarity index 100% rename from csharp/mtgext-token-app/Resources/Manifest/manifest.json rename to samples/mtgext-token-app/csharp/Resources/Manifest/manifest.json diff --git a/csharp/mtgext-token-app/Service/IMeetingService.cs b/samples/mtgext-token-app/csharp/Service/IMeetingService.cs similarity index 100% rename from csharp/mtgext-token-app/Service/IMeetingService.cs rename to samples/mtgext-token-app/csharp/Service/IMeetingService.cs diff --git a/csharp/mtgext-token-app/Service/MeetingService.cs b/samples/mtgext-token-app/csharp/Service/MeetingService.cs similarity index 100% rename from csharp/mtgext-token-app/Service/MeetingService.cs rename to samples/mtgext-token-app/csharp/Service/MeetingService.cs diff --git a/csharp/mtgext-token-app/Service/MeetingServiceOptions.cs b/samples/mtgext-token-app/csharp/Service/MeetingServiceOptions.cs similarity index 100% rename from csharp/mtgext-token-app/Service/MeetingServiceOptions.cs rename to samples/mtgext-token-app/csharp/Service/MeetingServiceOptions.cs diff --git a/csharp/mtgext-token-app/Service/NotificationRequest/ChannelData.cs b/samples/mtgext-token-app/csharp/Service/NotificationRequest/ChannelData.cs similarity index 100% rename from csharp/mtgext-token-app/Service/NotificationRequest/ChannelData.cs rename to samples/mtgext-token-app/csharp/Service/NotificationRequest/ChannelData.cs diff --git a/csharp/mtgext-token-app/Service/NotificationRequest/Notification.cs b/samples/mtgext-token-app/csharp/Service/NotificationRequest/Notification.cs similarity index 100% rename from csharp/mtgext-token-app/Service/NotificationRequest/Notification.cs rename to samples/mtgext-token-app/csharp/Service/NotificationRequest/Notification.cs diff --git a/csharp/mtgext-token-app/Service/NotificationRequest/PostNotificationServiceRequest.cs b/samples/mtgext-token-app/csharp/Service/NotificationRequest/PostNotificationServiceRequest.cs similarity index 100% rename from csharp/mtgext-token-app/Service/NotificationRequest/PostNotificationServiceRequest.cs rename to samples/mtgext-token-app/csharp/Service/NotificationRequest/PostNotificationServiceRequest.cs diff --git a/csharp/mtgext-token-app/Service/PostNotificationServiceResponse.cs b/samples/mtgext-token-app/csharp/Service/PostNotificationServiceResponse.cs similarity index 100% rename from csharp/mtgext-token-app/Service/PostNotificationServiceResponse.cs rename to samples/mtgext-token-app/csharp/Service/PostNotificationServiceResponse.cs diff --git a/csharp/mtgext-token-app/Service/UserMeetingRoleServiceResponse.cs b/samples/mtgext-token-app/csharp/Service/UserMeetingRoleServiceResponse.cs similarity index 100% rename from csharp/mtgext-token-app/Service/UserMeetingRoleServiceResponse.cs rename to samples/mtgext-token-app/csharp/Service/UserMeetingRoleServiceResponse.cs diff --git a/csharp/mtgext-token-app/Startup.cs b/samples/mtgext-token-app/csharp/Startup.cs similarity index 100% rename from csharp/mtgext-token-app/Startup.cs rename to samples/mtgext-token-app/csharp/Startup.cs diff --git a/csharp/mtgext-token-app/TokenApp.csproj b/samples/mtgext-token-app/csharp/TokenApp.csproj similarity index 100% rename from csharp/mtgext-token-app/TokenApp.csproj rename to samples/mtgext-token-app/csharp/TokenApp.csproj diff --git a/csharp/mtgext-token-app/TokenApp.sln b/samples/mtgext-token-app/csharp/TokenApp.sln similarity index 100% rename from csharp/mtgext-token-app/TokenApp.sln rename to samples/mtgext-token-app/csharp/TokenApp.sln diff --git a/csharp/mtgext-token-app/Wiki/Images/auth-bot-channels-registration-group.png b/samples/mtgext-token-app/csharp/Wiki/Images/auth-bot-channels-registration-group.png similarity index 100% rename from csharp/mtgext-token-app/Wiki/Images/auth-bot-channels-registration-group.png rename to samples/mtgext-token-app/csharp/Wiki/Images/auth-bot-channels-registration-group.png diff --git a/csharp/mtgext-token-app/Wiki/Images/auth-bot-channels-registration.png b/samples/mtgext-token-app/csharp/Wiki/Images/auth-bot-channels-registration.png similarity index 100% rename from csharp/mtgext-token-app/Wiki/Images/auth-bot-channels-registration.png rename to samples/mtgext-token-app/csharp/Wiki/Images/auth-bot-channels-registration.png diff --git a/csharp/mtgext-token-app/Wiki/auth-aad-sso.md b/samples/mtgext-token-app/csharp/Wiki/auth-aad-sso.md similarity index 100% rename from csharp/mtgext-token-app/Wiki/auth-aad-sso.md rename to samples/mtgext-token-app/csharp/Wiki/auth-aad-sso.md diff --git a/csharp/mtgext-token-app/Wiki/azure-bot-channels-registration.md b/samples/mtgext-token-app/csharp/Wiki/azure-bot-channels-registration.md similarity index 100% rename from csharp/mtgext-token-app/Wiki/azure-bot-channels-registration.md rename to samples/mtgext-token-app/csharp/Wiki/azure-bot-channels-registration.md diff --git a/csharp/mtgext-token-app/appsettings.Development.json b/samples/mtgext-token-app/csharp/appsettings.Development.json similarity index 100% rename from csharp/mtgext-token-app/appsettings.Development.json rename to samples/mtgext-token-app/csharp/appsettings.Development.json diff --git a/csharp/mtgext-token-app/appsettings.json b/samples/mtgext-token-app/csharp/appsettings.json similarity index 100% rename from csharp/mtgext-token-app/appsettings.json rename to samples/mtgext-token-app/csharp/appsettings.json diff --git a/csharp/mtgext-token-app/stylecop.json b/samples/mtgext-token-app/csharp/stylecop.json similarity index 100% rename from csharp/mtgext-token-app/stylecop.json rename to samples/mtgext-token-app/csharp/stylecop.json diff --git a/csharp/outgoing-webhook/.gitignore b/samples/outgoing-webhook/csharp/.gitignore similarity index 100% rename from csharp/outgoing-webhook/.gitignore rename to samples/outgoing-webhook/csharp/.gitignore diff --git a/csharp/outgoing-webhook/README.md b/samples/outgoing-webhook/csharp/README.md similarity index 100% rename from csharp/outgoing-webhook/README.md rename to samples/outgoing-webhook/csharp/README.md diff --git a/csharp/outgoing-webhook/WebhookSampleBot.sln b/samples/outgoing-webhook/csharp/WebhookSampleBot.sln similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot.sln rename to samples/outgoing-webhook/csharp/WebhookSampleBot.sln diff --git a/csharp/outgoing-webhook/WebhookSampleBot/App_Start/WebApiConfig.cs b/samples/outgoing-webhook/csharp/WebhookSampleBot/App_Start/WebApiConfig.cs similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/App_Start/WebApiConfig.cs rename to samples/outgoing-webhook/csharp/WebhookSampleBot/App_Start/WebApiConfig.cs diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Controllers/SampleController.cs b/samples/outgoing-webhook/csharp/WebhookSampleBot/Controllers/SampleController.cs similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Controllers/SampleController.cs rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Controllers/SampleController.cs diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Global.asax b/samples/outgoing-webhook/csharp/WebhookSampleBot/Global.asax similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Global.asax rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Global.asax diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Global.asax.cs b/samples/outgoing-webhook/csharp/WebhookSampleBot/Global.asax.cs similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Global.asax.cs rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Global.asax.cs diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Models/AuthProvider.cs b/samples/outgoing-webhook/csharp/WebhookSampleBot/Models/AuthProvider.cs similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Models/AuthProvider.cs rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Models/AuthProvider.cs diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Models/AuthResponse.cs b/samples/outgoing-webhook/csharp/WebhookSampleBot/Models/AuthResponse.cs similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Models/AuthResponse.cs rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Models/AuthResponse.cs diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Models/SampleResponseProvider.cs b/samples/outgoing-webhook/csharp/WebhookSampleBot/Models/SampleResponseProvider.cs similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Models/SampleResponseProvider.cs rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Models/SampleResponseProvider.cs diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Properties/AssemblyInfo.cs b/samples/outgoing-webhook/csharp/WebhookSampleBot/Properties/AssemblyInfo.cs similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Properties/AssemblyInfo.cs rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Properties/AssemblyInfo.cs diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Web.Debug.config b/samples/outgoing-webhook/csharp/WebhookSampleBot/Web.Debug.config similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Web.Debug.config rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Web.Debug.config diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Web.Release.config b/samples/outgoing-webhook/csharp/WebhookSampleBot/Web.Release.config similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Web.Release.config rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Web.Release.config diff --git a/csharp/outgoing-webhook/WebhookSampleBot/Web.config b/samples/outgoing-webhook/csharp/WebhookSampleBot/Web.config similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/Web.config rename to samples/outgoing-webhook/csharp/WebhookSampleBot/Web.config diff --git a/csharp/outgoing-webhook/WebhookSampleBot/WebhookSampleBot.csproj b/samples/outgoing-webhook/csharp/WebhookSampleBot/WebhookSampleBot.csproj similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/WebhookSampleBot.csproj rename to samples/outgoing-webhook/csharp/WebhookSampleBot/WebhookSampleBot.csproj diff --git a/csharp/outgoing-webhook/WebhookSampleBot/packages.config b/samples/outgoing-webhook/csharp/WebhookSampleBot/packages.config similarity index 100% rename from csharp/outgoing-webhook/WebhookSampleBot/packages.config rename to samples/outgoing-webhook/csharp/WebhookSampleBot/packages.config diff --git a/nodejs/outgoing-webhook/.gitignore b/samples/outgoing-webhook/nodejs/.gitignore similarity index 100% rename from nodejs/outgoing-webhook/.gitignore rename to samples/outgoing-webhook/nodejs/.gitignore diff --git a/nodejs/outgoing-webhook/README.md b/samples/outgoing-webhook/nodejs/README.md similarity index 100% rename from nodejs/outgoing-webhook/README.md rename to samples/outgoing-webhook/nodejs/README.md diff --git a/nodejs/outgoing-webhook/app.js b/samples/outgoing-webhook/nodejs/app.js similarity index 100% rename from nodejs/outgoing-webhook/app.js rename to samples/outgoing-webhook/nodejs/app.js diff --git a/csharp/tab-channel-group-mvc/AppManifest/Icon-color.png b/samples/tab-channel-group/mvc-csharp/AppManifest/Icon-color.png similarity index 100% rename from csharp/tab-channel-group-mvc/AppManifest/Icon-color.png rename to samples/tab-channel-group/mvc-csharp/AppManifest/Icon-color.png diff --git a/csharp/tab-channel-group-mvc/AppManifest/Icon-outline.png b/samples/tab-channel-group/mvc-csharp/AppManifest/Icon-outline.png similarity index 100% rename from csharp/tab-channel-group-mvc/AppManifest/Icon-outline.png rename to samples/tab-channel-group/mvc-csharp/AppManifest/Icon-outline.png diff --git a/csharp/tab-channel-group-mvc/AppManifest/manifest.json b/samples/tab-channel-group/mvc-csharp/AppManifest/manifest.json similarity index 100% rename from csharp/tab-channel-group-mvc/AppManifest/manifest.json rename to samples/tab-channel-group/mvc-csharp/AppManifest/manifest.json diff --git a/csharp/tab-channel-group-mvc/ChannelGroupTabMVC.csproj b/samples/tab-channel-group/mvc-csharp/ChannelGroupTabMVC.csproj similarity index 100% rename from csharp/tab-channel-group-mvc/ChannelGroupTabMVC.csproj rename to samples/tab-channel-group/mvc-csharp/ChannelGroupTabMVC.csproj diff --git a/csharp/tab-channel-group-mvc/ChannelGroupTabMVC.sln b/samples/tab-channel-group/mvc-csharp/ChannelGroupTabMVC.sln similarity index 100% rename from csharp/tab-channel-group-mvc/ChannelGroupTabMVC.sln rename to samples/tab-channel-group/mvc-csharp/ChannelGroupTabMVC.sln diff --git a/csharp/tab-channel-group-mvc/Controllers/GrayController.cs b/samples/tab-channel-group/mvc-csharp/Controllers/GrayController.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Controllers/GrayController.cs rename to samples/tab-channel-group/mvc-csharp/Controllers/GrayController.cs diff --git a/csharp/tab-channel-group-mvc/Controllers/HomeController.cs b/samples/tab-channel-group/mvc-csharp/Controllers/HomeController.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Controllers/HomeController.cs rename to samples/tab-channel-group/mvc-csharp/Controllers/HomeController.cs diff --git a/csharp/tab-channel-group-mvc/Controllers/PrivacyController.cs b/samples/tab-channel-group/mvc-csharp/Controllers/PrivacyController.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Controllers/PrivacyController.cs rename to samples/tab-channel-group/mvc-csharp/Controllers/PrivacyController.cs diff --git a/csharp/tab-channel-group-mvc/Controllers/RedController.cs b/samples/tab-channel-group/mvc-csharp/Controllers/RedController.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Controllers/RedController.cs rename to samples/tab-channel-group/mvc-csharp/Controllers/RedController.cs diff --git a/csharp/tab-channel-group-mvc/Controllers/TabController.cs b/samples/tab-channel-group/mvc-csharp/Controllers/TabController.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Controllers/TabController.cs rename to samples/tab-channel-group/mvc-csharp/Controllers/TabController.cs diff --git a/csharp/tab-channel-group-mvc/Controllers/TouController.cs b/samples/tab-channel-group/mvc-csharp/Controllers/TouController.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Controllers/TouController.cs rename to samples/tab-channel-group/mvc-csharp/Controllers/TouController.cs diff --git a/csharp/tab-channel-group-mvc/Models/ChannelGroup.cs b/samples/tab-channel-group/mvc-csharp/Models/ChannelGroup.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Models/ChannelGroup.cs rename to samples/tab-channel-group/mvc-csharp/Models/ChannelGroup.cs diff --git a/csharp/tab-channel-group-mvc/Program.cs b/samples/tab-channel-group/mvc-csharp/Program.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Program.cs rename to samples/tab-channel-group/mvc-csharp/Program.cs diff --git a/csharp/tab-channel-group-mvc/README.md b/samples/tab-channel-group/mvc-csharp/README.md similarity index 100% rename from csharp/tab-channel-group-mvc/README.md rename to samples/tab-channel-group/mvc-csharp/README.md diff --git a/csharp/tab-channel-group-mvc/Startup.cs b/samples/tab-channel-group/mvc-csharp/Startup.cs similarity index 100% rename from csharp/tab-channel-group-mvc/Startup.cs rename to samples/tab-channel-group/mvc-csharp/Startup.cs diff --git a/csharp/tab-channel-group-mvc/Views/Gray/Gray.cshtml b/samples/tab-channel-group/mvc-csharp/Views/Gray/Gray.cshtml similarity index 100% rename from csharp/tab-channel-group-mvc/Views/Gray/Gray.cshtml rename to samples/tab-channel-group/mvc-csharp/Views/Gray/Gray.cshtml diff --git a/csharp/tab-channel-group-mvc/Views/Home/Index.cshtml b/samples/tab-channel-group/mvc-csharp/Views/Home/Index.cshtml similarity index 100% rename from csharp/tab-channel-group-mvc/Views/Home/Index.cshtml rename to samples/tab-channel-group/mvc-csharp/Views/Home/Index.cshtml diff --git a/csharp/tab-channel-group-mvc/Views/Privacy/Privacy.cshtml b/samples/tab-channel-group/mvc-csharp/Views/Privacy/Privacy.cshtml similarity index 100% rename from csharp/tab-channel-group-mvc/Views/Privacy/Privacy.cshtml rename to samples/tab-channel-group/mvc-csharp/Views/Privacy/Privacy.cshtml diff --git a/csharp/tab-channel-group-mvc/Views/Red/Red.cshtml b/samples/tab-channel-group/mvc-csharp/Views/Red/Red.cshtml similarity index 100% rename from csharp/tab-channel-group-mvc/Views/Red/Red.cshtml rename to samples/tab-channel-group/mvc-csharp/Views/Red/Red.cshtml diff --git a/csharp/tab-channel-group-mvc/Views/Shared/_Layout.cshtml b/samples/tab-channel-group/mvc-csharp/Views/Shared/_Layout.cshtml similarity index 100% rename from csharp/tab-channel-group-mvc/Views/Shared/_Layout.cshtml rename to samples/tab-channel-group/mvc-csharp/Views/Shared/_Layout.cshtml diff --git a/csharp/tab-channel-group-mvc/Views/Tab/Tab.cshtml b/samples/tab-channel-group/mvc-csharp/Views/Tab/Tab.cshtml similarity index 100% rename from csharp/tab-channel-group-mvc/Views/Tab/Tab.cshtml rename to samples/tab-channel-group/mvc-csharp/Views/Tab/Tab.cshtml diff --git a/csharp/tab-channel-group-mvc/Views/Tou/Tou.cshtml b/samples/tab-channel-group/mvc-csharp/Views/Tou/Tou.cshtml similarity index 100% rename from csharp/tab-channel-group-mvc/Views/Tou/Tou.cshtml rename to samples/tab-channel-group/mvc-csharp/Views/Tou/Tou.cshtml diff --git a/csharp/tab-channel-group-mvc/appsettings.Development.json b/samples/tab-channel-group/mvc-csharp/appsettings.Development.json similarity index 100% rename from csharp/tab-channel-group-mvc/appsettings.Development.json rename to samples/tab-channel-group/mvc-csharp/appsettings.Development.json diff --git a/csharp/tab-channel-group-mvc/appsettings.json b/samples/tab-channel-group/mvc-csharp/appsettings.json similarity index 100% rename from csharp/tab-channel-group-mvc/appsettings.json rename to samples/tab-channel-group/mvc-csharp/appsettings.json diff --git a/csharp/tab-channel-group-mvc/wwwroot/CSS/Site.css b/samples/tab-channel-group/mvc-csharp/wwwroot/CSS/Site.css similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/CSS/Site.css rename to samples/tab-channel-group/mvc-csharp/wwwroot/CSS/Site.css diff --git a/csharp/tab-channel-group-mvc/wwwroot/Images/IconGray.png b/samples/tab-channel-group/mvc-csharp/wwwroot/Images/IconGray.png similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/Images/IconGray.png rename to samples/tab-channel-group/mvc-csharp/wwwroot/Images/IconGray.png diff --git a/csharp/tab-channel-group-mvc/wwwroot/Images/IconRed.png b/samples/tab-channel-group/mvc-csharp/wwwroot/Images/IconRed.png similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/Images/IconRed.png rename to samples/tab-channel-group/mvc-csharp/wwwroot/Images/IconRed.png diff --git a/csharp/tab-channel-group-mvc/wwwroot/Images/TeamsIcon.png b/samples/tab-channel-group/mvc-csharp/wwwroot/Images/TeamsIcon.png similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/Images/TeamsIcon.png rename to samples/tab-channel-group/mvc-csharp/wwwroot/Images/TeamsIcon.png diff --git a/csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.css b/samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.css similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.css rename to samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.css diff --git a/csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.css.map b/samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.css.map similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.css.map rename to samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.css.map diff --git a/csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.min.css b/samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.min.css similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.min.css rename to samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.min.css diff --git a/csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.min.css.map b/samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.min.css.map similarity index 100% rename from csharp/tab-channel-group-mvc/wwwroot/Lib/bootstrap.min.css.map rename to samples/tab-channel-group/mvc-csharp/wwwroot/Lib/bootstrap.min.css.map diff --git a/csharp/tab-channel-group-razor/AppManifest/icon-color.png b/samples/tab-channel-group/razor-csharp/AppManifest/icon-color.png similarity index 100% rename from csharp/tab-channel-group-razor/AppManifest/icon-color.png rename to samples/tab-channel-group/razor-csharp/AppManifest/icon-color.png diff --git a/csharp/tab-channel-group-razor/AppManifest/icon-outline.png b/samples/tab-channel-group/razor-csharp/AppManifest/icon-outline.png similarity index 100% rename from csharp/tab-channel-group-razor/AppManifest/icon-outline.png rename to samples/tab-channel-group/razor-csharp/AppManifest/icon-outline.png diff --git a/csharp/tab-channel-group-razor/AppManifest/manifest.json b/samples/tab-channel-group/razor-csharp/AppManifest/manifest.json similarity index 100% rename from csharp/tab-channel-group-razor/AppManifest/manifest.json rename to samples/tab-channel-group/razor-csharp/AppManifest/manifest.json diff --git a/csharp/tab-channel-group-razor/Pages/Shared/_Layout.cshtml b/samples/tab-channel-group/razor-csharp/Pages/Shared/_Layout.cshtml similarity index 100% rename from csharp/tab-channel-group-razor/Pages/Shared/_Layout.cshtml rename to samples/tab-channel-group/razor-csharp/Pages/Shared/_Layout.cshtml diff --git a/csharp/tab-channel-group-razor/Pages/gray.cshtml b/samples/tab-channel-group/razor-csharp/Pages/gray.cshtml similarity index 100% rename from csharp/tab-channel-group-razor/Pages/gray.cshtml rename to samples/tab-channel-group/razor-csharp/Pages/gray.cshtml diff --git a/csharp/tab-channel-group-razor/Pages/index.cshtml b/samples/tab-channel-group/razor-csharp/Pages/index.cshtml similarity index 100% rename from csharp/tab-channel-group-razor/Pages/index.cshtml rename to samples/tab-channel-group/razor-csharp/Pages/index.cshtml diff --git a/csharp/tab-channel-group-razor/Pages/privacy.cshtml b/samples/tab-channel-group/razor-csharp/Pages/privacy.cshtml similarity index 100% rename from csharp/tab-channel-group-razor/Pages/privacy.cshtml rename to samples/tab-channel-group/razor-csharp/Pages/privacy.cshtml diff --git a/csharp/tab-channel-group-razor/Pages/red.cshtml b/samples/tab-channel-group/razor-csharp/Pages/red.cshtml similarity index 100% rename from csharp/tab-channel-group-razor/Pages/red.cshtml rename to samples/tab-channel-group/razor-csharp/Pages/red.cshtml diff --git a/csharp/tab-channel-group-razor/Pages/tab.cshtml b/samples/tab-channel-group/razor-csharp/Pages/tab.cshtml similarity index 100% rename from csharp/tab-channel-group-razor/Pages/tab.cshtml rename to samples/tab-channel-group/razor-csharp/Pages/tab.cshtml diff --git a/csharp/tab-channel-group-razor/Pages/tou.cshtml b/samples/tab-channel-group/razor-csharp/Pages/tou.cshtml similarity index 100% rename from csharp/tab-channel-group-razor/Pages/tou.cshtml rename to samples/tab-channel-group/razor-csharp/Pages/tou.cshtml diff --git a/csharp/tab-channel-group-razor/Program.cs b/samples/tab-channel-group/razor-csharp/Program.cs similarity index 100% rename from csharp/tab-channel-group-razor/Program.cs rename to samples/tab-channel-group/razor-csharp/Program.cs diff --git a/csharp/tab-channel-group-razor/README.md b/samples/tab-channel-group/razor-csharp/README.md similarity index 100% rename from csharp/tab-channel-group-razor/README.md rename to samples/tab-channel-group/razor-csharp/README.md diff --git a/csharp/tab-channel-group-razor/Startup.cs b/samples/tab-channel-group/razor-csharp/Startup.cs similarity index 100% rename from csharp/tab-channel-group-razor/Startup.cs rename to samples/tab-channel-group/razor-csharp/Startup.cs diff --git a/csharp/tab-channel-group-razor/appsettings.Development.json b/samples/tab-channel-group/razor-csharp/appsettings.Development.json similarity index 100% rename from csharp/tab-channel-group-razor/appsettings.Development.json rename to samples/tab-channel-group/razor-csharp/appsettings.Development.json diff --git a/csharp/tab-channel-group-razor/appsettings.json b/samples/tab-channel-group/razor-csharp/appsettings.json similarity index 100% rename from csharp/tab-channel-group-razor/appsettings.json rename to samples/tab-channel-group/razor-csharp/appsettings.json diff --git a/csharp/tab-channel-group-razor/channelGroupTab.csproj b/samples/tab-channel-group/razor-csharp/channelGroupTab.csproj similarity index 100% rename from csharp/tab-channel-group-razor/channelGroupTab.csproj rename to samples/tab-channel-group/razor-csharp/channelGroupTab.csproj diff --git a/csharp/tab-channel-group-razor/channelGroupTab.sln b/samples/tab-channel-group/razor-csharp/channelGroupTab.sln similarity index 100% rename from csharp/tab-channel-group-razor/channelGroupTab.sln rename to samples/tab-channel-group/razor-csharp/channelGroupTab.sln diff --git a/csharp/tab-channel-group-razor/tab.cs b/samples/tab-channel-group/razor-csharp/tab.cs similarity index 100% rename from csharp/tab-channel-group-razor/tab.cs rename to samples/tab-channel-group/razor-csharp/tab.cs diff --git a/csharp/tab-channel-group-razor/wwwroot/CSS/site.css b/samples/tab-channel-group/razor-csharp/wwwroot/CSS/site.css similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/CSS/site.css rename to samples/tab-channel-group/razor-csharp/wwwroot/CSS/site.css diff --git a/csharp/tab-channel-group-razor/wwwroot/Images/iconGray.png b/samples/tab-channel-group/razor-csharp/wwwroot/Images/iconGray.png similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/Images/iconGray.png rename to samples/tab-channel-group/razor-csharp/wwwroot/Images/iconGray.png diff --git a/csharp/tab-channel-group-razor/wwwroot/Images/iconRed.png b/samples/tab-channel-group/razor-csharp/wwwroot/Images/iconRed.png similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/Images/iconRed.png rename to samples/tab-channel-group/razor-csharp/wwwroot/Images/iconRed.png diff --git a/csharp/tab-channel-group-razor/wwwroot/Images/teamsIcon.png b/samples/tab-channel-group/razor-csharp/wwwroot/Images/teamsIcon.png similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/Images/teamsIcon.png rename to samples/tab-channel-group/razor-csharp/wwwroot/Images/teamsIcon.png diff --git a/csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.css b/samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.css similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.css rename to samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.css diff --git a/csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.css.map b/samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.css.map similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.css.map rename to samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.css.map diff --git a/csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.min.css b/samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.min.css similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.min.css rename to samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.min.css diff --git a/csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.min.css.map b/samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.min.css.map similarity index 100% rename from csharp/tab-channel-group-razor/wwwroot/LIB/bootstrap.min.css.map rename to samples/tab-channel-group/razor-csharp/wwwroot/LIB/bootstrap.min.css.map diff --git a/csharp/tab-personal-mvc/AppManifest/icon-color.png b/samples/tab-personal/mvc-csharp/AppManifest/icon-color.png similarity index 100% rename from csharp/tab-personal-mvc/AppManifest/icon-color.png rename to samples/tab-personal/mvc-csharp/AppManifest/icon-color.png diff --git a/csharp/tab-personal-mvc/AppManifest/icon-outline.png b/samples/tab-personal/mvc-csharp/AppManifest/icon-outline.png similarity index 100% rename from csharp/tab-personal-mvc/AppManifest/icon-outline.png rename to samples/tab-personal/mvc-csharp/AppManifest/icon-outline.png diff --git a/csharp/tab-personal-mvc/AppManifest/manifest.json b/samples/tab-personal/mvc-csharp/AppManifest/manifest.json similarity index 100% rename from csharp/tab-personal-mvc/AppManifest/manifest.json rename to samples/tab-personal/mvc-csharp/AppManifest/manifest.json diff --git a/csharp/tab-personal-mvc/Controllers/HomeController.cs b/samples/tab-personal/mvc-csharp/Controllers/HomeController.cs similarity index 100% rename from csharp/tab-personal-mvc/Controllers/HomeController.cs rename to samples/tab-personal/mvc-csharp/Controllers/HomeController.cs diff --git a/csharp/tab-personal-mvc/Controllers/PersonalTabController.cs b/samples/tab-personal/mvc-csharp/Controllers/PersonalTabController.cs similarity index 100% rename from csharp/tab-personal-mvc/Controllers/PersonalTabController.cs rename to samples/tab-personal/mvc-csharp/Controllers/PersonalTabController.cs diff --git a/csharp/tab-personal-mvc/Controllers/PrivacyController.cs b/samples/tab-personal/mvc-csharp/Controllers/PrivacyController.cs similarity index 100% rename from csharp/tab-personal-mvc/Controllers/PrivacyController.cs rename to samples/tab-personal/mvc-csharp/Controllers/PrivacyController.cs diff --git a/csharp/tab-personal-mvc/Controllers/TouController.cs b/samples/tab-personal/mvc-csharp/Controllers/TouController.cs similarity index 100% rename from csharp/tab-personal-mvc/Controllers/TouController.cs rename to samples/tab-personal/mvc-csharp/Controllers/TouController.cs diff --git a/csharp/tab-personal-mvc/Models/PersonalTab.cs b/samples/tab-personal/mvc-csharp/Models/PersonalTab.cs similarity index 100% rename from csharp/tab-personal-mvc/Models/PersonalTab.cs rename to samples/tab-personal/mvc-csharp/Models/PersonalTab.cs diff --git a/csharp/tab-personal-mvc/PersonalTabMVC.csproj b/samples/tab-personal/mvc-csharp/PersonalTabMVC.csproj similarity index 100% rename from csharp/tab-personal-mvc/PersonalTabMVC.csproj rename to samples/tab-personal/mvc-csharp/PersonalTabMVC.csproj diff --git a/csharp/tab-personal-mvc/PersonalTabMVC.sln b/samples/tab-personal/mvc-csharp/PersonalTabMVC.sln similarity index 100% rename from csharp/tab-personal-mvc/PersonalTabMVC.sln rename to samples/tab-personal/mvc-csharp/PersonalTabMVC.sln diff --git a/csharp/tab-personal-mvc/Program.cs b/samples/tab-personal/mvc-csharp/Program.cs similarity index 100% rename from csharp/tab-personal-mvc/Program.cs rename to samples/tab-personal/mvc-csharp/Program.cs diff --git a/csharp/tab-personal-mvc/README.md b/samples/tab-personal/mvc-csharp/README.md similarity index 100% rename from csharp/tab-personal-mvc/README.md rename to samples/tab-personal/mvc-csharp/README.md diff --git a/csharp/tab-personal-mvc/Startup.cs b/samples/tab-personal/mvc-csharp/Startup.cs similarity index 100% rename from csharp/tab-personal-mvc/Startup.cs rename to samples/tab-personal/mvc-csharp/Startup.cs diff --git a/csharp/tab-personal-mvc/Views/Home/Index.cshtml b/samples/tab-personal/mvc-csharp/Views/Home/Index.cshtml similarity index 100% rename from csharp/tab-personal-mvc/Views/Home/Index.cshtml rename to samples/tab-personal/mvc-csharp/Views/Home/Index.cshtml diff --git a/csharp/tab-personal-mvc/Views/PersonalTab/personalTab.cshtml b/samples/tab-personal/mvc-csharp/Views/PersonalTab/personalTab.cshtml similarity index 100% rename from csharp/tab-personal-mvc/Views/PersonalTab/personalTab.cshtml rename to samples/tab-personal/mvc-csharp/Views/PersonalTab/personalTab.cshtml diff --git a/csharp/tab-personal-mvc/Views/Privacy/privacy.cshtml b/samples/tab-personal/mvc-csharp/Views/Privacy/privacy.cshtml similarity index 100% rename from csharp/tab-personal-mvc/Views/Privacy/privacy.cshtml rename to samples/tab-personal/mvc-csharp/Views/Privacy/privacy.cshtml diff --git a/csharp/tab-personal-mvc/Views/Shared/_Layout.cshtml b/samples/tab-personal/mvc-csharp/Views/Shared/_Layout.cshtml similarity index 100% rename from csharp/tab-personal-mvc/Views/Shared/_Layout.cshtml rename to samples/tab-personal/mvc-csharp/Views/Shared/_Layout.cshtml diff --git a/csharp/tab-personal-mvc/Views/Tou/tou.cshtml b/samples/tab-personal/mvc-csharp/Views/Tou/tou.cshtml similarity index 100% rename from csharp/tab-personal-mvc/Views/Tou/tou.cshtml rename to samples/tab-personal/mvc-csharp/Views/Tou/tou.cshtml diff --git a/csharp/tab-personal-mvc/appsettings.Development.json b/samples/tab-personal/mvc-csharp/appsettings.Development.json similarity index 100% rename from csharp/tab-personal-mvc/appsettings.Development.json rename to samples/tab-personal/mvc-csharp/appsettings.Development.json diff --git a/csharp/tab-personal-mvc/appsettings.json b/samples/tab-personal/mvc-csharp/appsettings.json similarity index 100% rename from csharp/tab-personal-mvc/appsettings.json rename to samples/tab-personal/mvc-csharp/appsettings.json diff --git a/csharp/tab-personal-mvc/wwwroot/CSS/site.css b/samples/tab-personal/mvc-csharp/wwwroot/CSS/site.css similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/CSS/site.css rename to samples/tab-personal/mvc-csharp/wwwroot/CSS/site.css diff --git a/csharp/tab-personal-mvc/wwwroot/Images/iconGray.png b/samples/tab-personal/mvc-csharp/wwwroot/Images/iconGray.png similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/Images/iconGray.png rename to samples/tab-personal/mvc-csharp/wwwroot/Images/iconGray.png diff --git a/csharp/tab-personal-mvc/wwwroot/Images/iconRed.png b/samples/tab-personal/mvc-csharp/wwwroot/Images/iconRed.png similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/Images/iconRed.png rename to samples/tab-personal/mvc-csharp/wwwroot/Images/iconRed.png diff --git a/csharp/tab-personal-mvc/wwwroot/Images/teamsIcon.png b/samples/tab-personal/mvc-csharp/wwwroot/Images/teamsIcon.png similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/Images/teamsIcon.png rename to samples/tab-personal/mvc-csharp/wwwroot/Images/teamsIcon.png diff --git a/csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.css b/samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.css similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.css rename to samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.css diff --git a/csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.css.map b/samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.css.map similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.css.map rename to samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.css.map diff --git a/csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.min.css b/samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.min.css similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.min.css rename to samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.min.css diff --git a/csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.min.css.map b/samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.min.css.map similarity index 100% rename from csharp/tab-personal-mvc/wwwroot/Lib/bootstrap.min.css.map rename to samples/tab-personal/mvc-csharp/wwwroot/Lib/bootstrap.min.css.map diff --git a/csharp/tab-personal-razor/AppManifest/icon-color.png b/samples/tab-personal/razor-csharp/AppManifest/icon-color.png similarity index 100% rename from csharp/tab-personal-razor/AppManifest/icon-color.png rename to samples/tab-personal/razor-csharp/AppManifest/icon-color.png diff --git a/csharp/tab-personal-razor/AppManifest/icon-outline.png b/samples/tab-personal/razor-csharp/AppManifest/icon-outline.png similarity index 100% rename from csharp/tab-personal-razor/AppManifest/icon-outline.png rename to samples/tab-personal/razor-csharp/AppManifest/icon-outline.png diff --git a/csharp/tab-personal-razor/AppManifest/manifest.json b/samples/tab-personal/razor-csharp/AppManifest/manifest.json similarity index 100% rename from csharp/tab-personal-razor/AppManifest/manifest.json rename to samples/tab-personal/razor-csharp/AppManifest/manifest.json diff --git a/csharp/tab-personal-razor/Pages/PersonalTab.cshtml b/samples/tab-personal/razor-csharp/Pages/PersonalTab.cshtml similarity index 100% rename from csharp/tab-personal-razor/Pages/PersonalTab.cshtml rename to samples/tab-personal/razor-csharp/Pages/PersonalTab.cshtml diff --git a/csharp/tab-personal-razor/Pages/Shared/_Layout.cshtml b/samples/tab-personal/razor-csharp/Pages/Shared/_Layout.cshtml similarity index 100% rename from csharp/tab-personal-razor/Pages/Shared/_Layout.cshtml rename to samples/tab-personal/razor-csharp/Pages/Shared/_Layout.cshtml diff --git a/csharp/tab-personal-razor/Pages/index.cshtml b/samples/tab-personal/razor-csharp/Pages/index.cshtml similarity index 100% rename from csharp/tab-personal-razor/Pages/index.cshtml rename to samples/tab-personal/razor-csharp/Pages/index.cshtml diff --git a/csharp/tab-personal-razor/Pages/privacy.cshtml b/samples/tab-personal/razor-csharp/Pages/privacy.cshtml similarity index 100% rename from csharp/tab-personal-razor/Pages/privacy.cshtml rename to samples/tab-personal/razor-csharp/Pages/privacy.cshtml diff --git a/csharp/tab-personal-razor/Pages/tou.cshtml b/samples/tab-personal/razor-csharp/Pages/tou.cshtml similarity index 100% rename from csharp/tab-personal-razor/Pages/tou.cshtml rename to samples/tab-personal/razor-csharp/Pages/tou.cshtml diff --git a/csharp/tab-personal-razor/PersonalTab.csproj b/samples/tab-personal/razor-csharp/PersonalTab.csproj similarity index 100% rename from csharp/tab-personal-razor/PersonalTab.csproj rename to samples/tab-personal/razor-csharp/PersonalTab.csproj diff --git a/csharp/tab-personal-razor/PersonalTab.sln b/samples/tab-personal/razor-csharp/PersonalTab.sln similarity index 100% rename from csharp/tab-personal-razor/PersonalTab.sln rename to samples/tab-personal/razor-csharp/PersonalTab.sln diff --git a/csharp/tab-personal-razor/Program.cs b/samples/tab-personal/razor-csharp/Program.cs similarity index 100% rename from csharp/tab-personal-razor/Program.cs rename to samples/tab-personal/razor-csharp/Program.cs diff --git a/csharp/tab-personal-razor/README.md b/samples/tab-personal/razor-csharp/README.md similarity index 100% rename from csharp/tab-personal-razor/README.md rename to samples/tab-personal/razor-csharp/README.md diff --git a/csharp/tab-personal-razor/Startup.cs b/samples/tab-personal/razor-csharp/Startup.cs similarity index 100% rename from csharp/tab-personal-razor/Startup.cs rename to samples/tab-personal/razor-csharp/Startup.cs diff --git a/csharp/tab-personal-razor/appsettings.Development.json b/samples/tab-personal/razor-csharp/appsettings.Development.json similarity index 100% rename from csharp/tab-personal-razor/appsettings.Development.json rename to samples/tab-personal/razor-csharp/appsettings.Development.json diff --git a/csharp/tab-personal-razor/appsettings.json b/samples/tab-personal/razor-csharp/appsettings.json similarity index 100% rename from csharp/tab-personal-razor/appsettings.json rename to samples/tab-personal/razor-csharp/appsettings.json diff --git a/csharp/tab-personal-razor/wwwroot/CSS/site.css b/samples/tab-personal/razor-csharp/wwwroot/CSS/site.css similarity index 100% rename from csharp/tab-personal-razor/wwwroot/CSS/site.css rename to samples/tab-personal/razor-csharp/wwwroot/CSS/site.css diff --git a/csharp/tab-personal-razor/wwwroot/Images/iconGray.png b/samples/tab-personal/razor-csharp/wwwroot/Images/iconGray.png similarity index 100% rename from csharp/tab-personal-razor/wwwroot/Images/iconGray.png rename to samples/tab-personal/razor-csharp/wwwroot/Images/iconGray.png diff --git a/csharp/tab-personal-razor/wwwroot/Images/iconRed.png b/samples/tab-personal/razor-csharp/wwwroot/Images/iconRed.png similarity index 100% rename from csharp/tab-personal-razor/wwwroot/Images/iconRed.png rename to samples/tab-personal/razor-csharp/wwwroot/Images/iconRed.png diff --git a/csharp/tab-personal-razor/wwwroot/Images/teamsIcon.png b/samples/tab-personal/razor-csharp/wwwroot/Images/teamsIcon.png similarity index 100% rename from csharp/tab-personal-razor/wwwroot/Images/teamsIcon.png rename to samples/tab-personal/razor-csharp/wwwroot/Images/teamsIcon.png diff --git a/csharp/tab-personal-razor/wwwroot/Lib/bootstrap.css b/samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.css similarity index 100% rename from csharp/tab-personal-razor/wwwroot/Lib/bootstrap.css rename to samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.css diff --git a/csharp/tab-personal-razor/wwwroot/Lib/bootstrap.css.map b/samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.css.map similarity index 100% rename from csharp/tab-personal-razor/wwwroot/Lib/bootstrap.css.map rename to samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.css.map diff --git a/csharp/tab-personal-razor/wwwroot/Lib/bootstrap.min.css b/samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.min.css similarity index 100% rename from csharp/tab-personal-razor/wwwroot/Lib/bootstrap.min.css rename to samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.min.css diff --git a/csharp/tab-personal-razor/wwwroot/Lib/bootstrap.min.css.map b/samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.min.css.map similarity index 100% rename from csharp/tab-personal-razor/wwwroot/Lib/bootstrap.min.css.map rename to samples/tab-personal/razor-csharp/wwwroot/Lib/bootstrap.min.css.map diff --git a/nodejs/tab-sso/.deployment b/samples/tab-sso/nodejs/.deployment similarity index 100% rename from nodejs/tab-sso/.deployment rename to samples/tab-sso/nodejs/.deployment diff --git a/nodejs/tab-sso/.gitignore b/samples/tab-sso/nodejs/.gitignore similarity index 100% rename from nodejs/tab-sso/.gitignore rename to samples/tab-sso/nodejs/.gitignore diff --git a/nodejs/tab-sso/CODE_OF_CONDUCT.md b/samples/tab-sso/nodejs/CODE_OF_CONDUCT.md similarity index 100% rename from nodejs/tab-sso/CODE_OF_CONDUCT.md rename to samples/tab-sso/nodejs/CODE_OF_CONDUCT.md diff --git a/nodejs/tab-sso/README.md b/samples/tab-sso/nodejs/README.md similarity index 100% rename from nodejs/tab-sso/README.md rename to samples/tab-sso/nodejs/README.md diff --git a/nodejs/tab-sso/SECURITY.md b/samples/tab-sso/nodejs/SECURITY.md similarity index 100% rename from nodejs/tab-sso/SECURITY.md rename to samples/tab-sso/nodejs/SECURITY.md diff --git a/nodejs/tab-sso/config/default.json b/samples/tab-sso/nodejs/config/default.json similarity index 100% rename from nodejs/tab-sso/config/default.json rename to samples/tab-sso/nodejs/config/default.json diff --git a/nodejs/tab-sso/config/sample.json b/samples/tab-sso/nodejs/config/sample.json similarity index 100% rename from nodejs/tab-sso/config/sample.json rename to samples/tab-sso/nodejs/config/sample.json diff --git a/nodejs/tab-sso/deploy.cmd b/samples/tab-sso/nodejs/deploy.cmd similarity index 100% rename from nodejs/tab-sso/deploy.cmd rename to samples/tab-sso/nodejs/deploy.cmd diff --git a/nodejs/tab-sso/deploy.sh b/samples/tab-sso/nodejs/deploy.sh similarity index 100% rename from nodejs/tab-sso/deploy.sh rename to samples/tab-sso/nodejs/deploy.sh diff --git a/nodejs/tab-sso/doc/images/AAD-SSO-Tab-1-NeedsConsent.png b/samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-1-NeedsConsent.png similarity index 100% rename from nodejs/tab-sso/doc/images/AAD-SSO-Tab-1-NeedsConsent.png rename to samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-1-NeedsConsent.png diff --git a/nodejs/tab-sso/doc/images/AAD-SSO-Tab-2-ConsentPopup.png b/samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-2-ConsentPopup.png similarity index 100% rename from nodejs/tab-sso/doc/images/AAD-SSO-Tab-2-ConsentPopup.png rename to samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-2-ConsentPopup.png diff --git a/nodejs/tab-sso/doc/images/AAD-SSO-Tab-3-ConsentDeclined.png b/samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-3-ConsentDeclined.png similarity index 100% rename from nodejs/tab-sso/doc/images/AAD-SSO-Tab-3-ConsentDeclined.png rename to samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-3-ConsentDeclined.png diff --git a/nodejs/tab-sso/doc/images/AAD-SSO-Tab-4-ConsentGranted.png b/samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-4-ConsentGranted.png similarity index 100% rename from nodejs/tab-sso/doc/images/AAD-SSO-Tab-4-ConsentGranted.png rename to samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-4-ConsentGranted.png diff --git a/nodejs/tab-sso/doc/images/AAD-SSO-Tab-5-ConsentPreviouslyGranted.png b/samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-5-ConsentPreviouslyGranted.png similarity index 100% rename from nodejs/tab-sso/doc/images/AAD-SSO-Tab-5-ConsentPreviouslyGranted.png rename to samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-5-ConsentPreviouslyGranted.png diff --git a/nodejs/tab-sso/doc/images/AAD-SSO-Tab-6-Mobile.png b/samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-6-Mobile.png similarity index 100% rename from nodejs/tab-sso/doc/images/AAD-SSO-Tab-6-Mobile.png rename to samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-6-Mobile.png diff --git a/nodejs/tab-sso/doc/images/AAD-SSO-Tab-7-DeletingConsentForTesting.png b/samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-7-DeletingConsentForTesting.png similarity index 100% rename from nodejs/tab-sso/doc/images/AAD-SSO-Tab-7-DeletingConsentForTesting.png rename to samples/tab-sso/nodejs/doc/images/AAD-SSO-Tab-7-DeletingConsentForTesting.png diff --git a/nodejs/tab-sso/gulpfile.js b/samples/tab-sso/nodejs/gulpfile.js similarity index 100% rename from nodejs/tab-sso/gulpfile.js rename to samples/tab-sso/nodejs/gulpfile.js diff --git a/nodejs/tab-sso/package-lock.json b/samples/tab-sso/nodejs/package-lock.json similarity index 100% rename from nodejs/tab-sso/package-lock.json rename to samples/tab-sso/nodejs/package-lock.json diff --git a/nodejs/tab-sso/package.json b/samples/tab-sso/nodejs/package.json similarity index 100% rename from nodejs/tab-sso/package.json rename to samples/tab-sso/nodejs/package.json diff --git a/nodejs/tab-sso/src/app.js b/samples/tab-sso/nodejs/src/app.js similarity index 100% rename from nodejs/tab-sso/src/app.js rename to samples/tab-sso/nodejs/src/app.js diff --git a/nodejs/tab-sso/src/manifest.json b/samples/tab-sso/nodejs/src/manifest.json similarity index 100% rename from nodejs/tab-sso/src/manifest.json rename to samples/tab-sso/nodejs/src/manifest.json diff --git a/nodejs/tab-sso/src/static/images/contoso20x20.png b/samples/tab-sso/nodejs/src/static/images/contoso20x20.png similarity index 100% rename from nodejs/tab-sso/src/static/images/contoso20x20.png rename to samples/tab-sso/nodejs/src/static/images/contoso20x20.png diff --git a/nodejs/tab-sso/src/static/images/contoso96x96.png b/samples/tab-sso/nodejs/src/static/images/contoso96x96.png similarity index 100% rename from nodejs/tab-sso/src/static/images/contoso96x96.png rename to samples/tab-sso/nodejs/src/static/images/contoso96x96.png diff --git a/nodejs/tab-sso/src/static/scripts/config.js b/samples/tab-sso/nodejs/src/static/scripts/config.js similarity index 100% rename from nodejs/tab-sso/src/static/scripts/config.js rename to samples/tab-sso/nodejs/src/static/scripts/config.js diff --git a/nodejs/tab-sso/src/static/scripts/initTeamsTab.js b/samples/tab-sso/nodejs/src/static/scripts/initTeamsTab.js similarity index 100% rename from nodejs/tab-sso/src/static/scripts/initTeamsTab.js rename to samples/tab-sso/nodejs/src/static/scripts/initTeamsTab.js diff --git a/nodejs/tab-sso/src/static/scripts/ssoDemo.js b/samples/tab-sso/nodejs/src/static/scripts/ssoDemo.js similarity index 100% rename from nodejs/tab-sso/src/static/scripts/ssoDemo.js rename to samples/tab-sso/nodejs/src/static/scripts/ssoDemo.js diff --git a/nodejs/tab-sso/src/static/styles/custom.css b/samples/tab-sso/nodejs/src/static/styles/custom.css similarity index 100% rename from nodejs/tab-sso/src/static/styles/custom.css rename to samples/tab-sso/nodejs/src/static/styles/custom.css diff --git a/nodejs/tab-sso/src/static/styles/msteams-16.css b/samples/tab-sso/nodejs/src/static/styles/msteams-16.css similarity index 100% rename from nodejs/tab-sso/src/static/styles/msteams-16.css rename to samples/tab-sso/nodejs/src/static/styles/msteams-16.css diff --git a/nodejs/tab-sso/src/tabs.js b/samples/tab-sso/nodejs/src/tabs.js similarity index 100% rename from nodejs/tab-sso/src/tabs.js rename to samples/tab-sso/nodejs/src/tabs.js diff --git a/nodejs/tab-sso/src/views/auth-end.pug b/samples/tab-sso/nodejs/src/views/auth-end.pug similarity index 100% rename from nodejs/tab-sso/src/views/auth-end.pug rename to samples/tab-sso/nodejs/src/views/auth-end.pug diff --git a/nodejs/tab-sso/src/views/auth-start.pug b/samples/tab-sso/nodejs/src/views/auth-start.pug similarity index 100% rename from nodejs/tab-sso/src/views/auth-start.pug rename to samples/tab-sso/nodejs/src/views/auth-start.pug diff --git a/nodejs/tab-sso/src/views/configure.pug b/samples/tab-sso/nodejs/src/views/configure.pug similarity index 100% rename from nodejs/tab-sso/src/views/configure.pug rename to samples/tab-sso/nodejs/src/views/configure.pug diff --git a/nodejs/tab-sso/src/views/hello.pug b/samples/tab-sso/nodejs/src/views/hello.pug similarity index 100% rename from nodejs/tab-sso/src/views/hello.pug rename to samples/tab-sso/nodejs/src/views/hello.pug diff --git a/nodejs/tab-sso/src/views/layout.pug b/samples/tab-sso/nodejs/src/views/layout.pug similarity index 100% rename from nodejs/tab-sso/src/views/layout.pug rename to samples/tab-sso/nodejs/src/views/layout.pug diff --git a/nodejs/tab-sso/src/views/ssoDemo.pug b/samples/tab-sso/nodejs/src/views/ssoDemo.pug similarity index 100% rename from nodejs/tab-sso/src/views/ssoDemo.pug rename to samples/tab-sso/nodejs/src/views/ssoDemo.pug