diff --git a/samples/python/python_django/13.core-bot/README-LUIS.md b/samples/python/wip/python_django/13.core-bot/README-LUIS.md
similarity index 100%
rename from samples/python/python_django/13.core-bot/README-LUIS.md
rename to samples/python/wip/python_django/13.core-bot/README-LUIS.md
diff --git a/samples/python/python_django/13.core-bot/README.md b/samples/python/wip/python_django/13.core-bot/README.md
similarity index 100%
rename from samples/python/python_django/13.core-bot/README.md
rename to samples/python/wip/python_django/13.core-bot/README.md
diff --git a/samples/python/python_django/13.core-bot/booking_details.py b/samples/python/wip/python_django/13.core-bot/booking_details.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/booking_details.py
rename to samples/python/wip/python_django/13.core-bot/booking_details.py
diff --git a/samples/python/python_django/13.core-bot/bots/__init__.py b/samples/python/wip/python_django/13.core-bot/bots/__init__.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/__init__.py
rename to samples/python/wip/python_django/13.core-bot/bots/__init__.py
diff --git a/samples/python/python_django/13.core-bot/bots/bots.py b/samples/python/wip/python_django/13.core-bot/bots/bots.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/bots.py
rename to samples/python/wip/python_django/13.core-bot/bots/bots.py
diff --git a/samples/python/python_django/13.core-bot/bots/dialog_and_welcome_bot.py b/samples/python/wip/python_django/13.core-bot/bots/dialog_and_welcome_bot.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/dialog_and_welcome_bot.py
rename to samples/python/wip/python_django/13.core-bot/bots/dialog_and_welcome_bot.py
diff --git a/samples/python/python_django/13.core-bot/bots/dialog_bot.py b/samples/python/wip/python_django/13.core-bot/bots/dialog_bot.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/dialog_bot.py
rename to samples/python/wip/python_django/13.core-bot/bots/dialog_bot.py
diff --git a/samples/python/python_django/13.core-bot/bots/resources/welcomeCard.json b/samples/python/wip/python_django/13.core-bot/bots/resources/welcomeCard.json
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/resources/welcomeCard.json
rename to samples/python/wip/python_django/13.core-bot/bots/resources/welcomeCard.json
diff --git a/samples/python/python_django/13.core-bot/bots/settings.py b/samples/python/wip/python_django/13.core-bot/bots/settings.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/settings.py
rename to samples/python/wip/python_django/13.core-bot/bots/settings.py
diff --git a/samples/python/python_django/13.core-bot/bots/urls.py b/samples/python/wip/python_django/13.core-bot/bots/urls.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/urls.py
rename to samples/python/wip/python_django/13.core-bot/bots/urls.py
diff --git a/samples/python/python_django/13.core-bot/bots/views.py b/samples/python/wip/python_django/13.core-bot/bots/views.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/views.py
rename to samples/python/wip/python_django/13.core-bot/bots/views.py
diff --git a/samples/python/python_django/13.core-bot/bots/wsgi.py b/samples/python/wip/python_django/13.core-bot/bots/wsgi.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/bots/wsgi.py
rename to samples/python/wip/python_django/13.core-bot/bots/wsgi.py
diff --git a/samples/python/python_django/13.core-bot/cognitiveModels/FlightBooking.json b/samples/python/wip/python_django/13.core-bot/cognitiveModels/FlightBooking.json
similarity index 100%
rename from samples/python/python_django/13.core-bot/cognitiveModels/FlightBooking.json
rename to samples/python/wip/python_django/13.core-bot/cognitiveModels/FlightBooking.json
diff --git a/samples/python/python_django/13.core-bot/config.py b/samples/python/wip/python_django/13.core-bot/config.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/config.py
rename to samples/python/wip/python_django/13.core-bot/config.py
diff --git a/samples/python/python_django/13.core-bot/db.sqlite3 b/samples/python/wip/python_django/13.core-bot/db.sqlite3
similarity index 100%
rename from samples/python/python_django/13.core-bot/db.sqlite3
rename to samples/python/wip/python_django/13.core-bot/db.sqlite3
diff --git a/samples/python/python_django/13.core-bot/dialogs/__init__.py b/samples/python/wip/python_django/13.core-bot/dialogs/__init__.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/dialogs/__init__.py
rename to samples/python/wip/python_django/13.core-bot/dialogs/__init__.py
diff --git a/samples/python/python_django/13.core-bot/dialogs/booking_dialog.py b/samples/python/wip/python_django/13.core-bot/dialogs/booking_dialog.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/dialogs/booking_dialog.py
rename to samples/python/wip/python_django/13.core-bot/dialogs/booking_dialog.py
diff --git a/samples/python/python_django/13.core-bot/dialogs/cancel_and_help_dialog.py b/samples/python/wip/python_django/13.core-bot/dialogs/cancel_and_help_dialog.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/dialogs/cancel_and_help_dialog.py
rename to samples/python/wip/python_django/13.core-bot/dialogs/cancel_and_help_dialog.py
diff --git a/samples/python/python_django/13.core-bot/dialogs/date_resolver_dialog.py b/samples/python/wip/python_django/13.core-bot/dialogs/date_resolver_dialog.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/dialogs/date_resolver_dialog.py
rename to samples/python/wip/python_django/13.core-bot/dialogs/date_resolver_dialog.py
diff --git a/samples/python/python_django/13.core-bot/dialogs/main_dialog.py b/samples/python/wip/python_django/13.core-bot/dialogs/main_dialog.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/dialogs/main_dialog.py
rename to samples/python/wip/python_django/13.core-bot/dialogs/main_dialog.py
diff --git a/samples/python/python_django/13.core-bot/helpers/__init__.py b/samples/python/wip/python_django/13.core-bot/helpers/__init__.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/helpers/__init__.py
rename to samples/python/wip/python_django/13.core-bot/helpers/__init__.py
diff --git a/samples/python/python_django/13.core-bot/helpers/activity_helper.py b/samples/python/wip/python_django/13.core-bot/helpers/activity_helper.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/helpers/activity_helper.py
rename to samples/python/wip/python_django/13.core-bot/helpers/activity_helper.py
diff --git a/samples/python/python_django/13.core-bot/helpers/dialog_helper.py b/samples/python/wip/python_django/13.core-bot/helpers/dialog_helper.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/helpers/dialog_helper.py
rename to samples/python/wip/python_django/13.core-bot/helpers/dialog_helper.py
diff --git a/samples/python/python_django/13.core-bot/helpers/luis_helper.py b/samples/python/wip/python_django/13.core-bot/helpers/luis_helper.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/helpers/luis_helper.py
rename to samples/python/wip/python_django/13.core-bot/helpers/luis_helper.py
diff --git a/samples/python/python_django/13.core-bot/manage.py b/samples/python/wip/python_django/13.core-bot/manage.py
similarity index 100%
rename from samples/python/python_django/13.core-bot/manage.py
rename to samples/python/wip/python_django/13.core-bot/manage.py
diff --git a/samples/python/python_django/13.core-bot/requirements.txt b/samples/python/wip/python_django/13.core-bot/requirements.txt
similarity index 100%
rename from samples/python/python_django/13.core-bot/requirements.txt
rename to samples/python/wip/python_django/13.core-bot/requirements.txt
diff --git a/samples/python/python_quart/02.echo-bot/README.md b/samples/python/wip/python_quart/02.echo-bot/README.md
similarity index 100%
rename from samples/python/python_quart/02.echo-bot/README.md
rename to samples/python/wip/python_quart/02.echo-bot/README.md
diff --git a/samples/python/python_quart/02.echo-bot/app.py b/samples/python/wip/python_quart/02.echo-bot/app.py
similarity index 100%
rename from samples/python/python_quart/02.echo-bot/app.py
rename to samples/python/wip/python_quart/02.echo-bot/app.py
diff --git a/samples/python/python_quart/02.echo-bot/bots/__init__.py b/samples/python/wip/python_quart/02.echo-bot/bots/__init__.py
similarity index 100%
rename from samples/python/python_quart/02.echo-bot/bots/__init__.py
rename to samples/python/wip/python_quart/02.echo-bot/bots/__init__.py
diff --git a/samples/python/python_quart/02.echo-bot/bots/echo_bot.py b/samples/python/wip/python_quart/02.echo-bot/bots/echo_bot.py
similarity index 100%
rename from samples/python/python_quart/02.echo-bot/bots/echo_bot.py
rename to samples/python/wip/python_quart/02.echo-bot/bots/echo_bot.py
diff --git a/samples/python/python_quart/02.echo-bot/config.py b/samples/python/wip/python_quart/02.echo-bot/config.py
similarity index 100%
rename from samples/python/python_quart/02.echo-bot/config.py
rename to samples/python/wip/python_quart/02.echo-bot/config.py
diff --git a/samples/python/python_quart/02.echo-bot/deploymentTemplates/template-with-new-rg.json b/samples/python/wip/python_quart/02.echo-bot/deploymentTemplates/template-with-new-rg.json
similarity index 97%
rename from samples/python/python_quart/02.echo-bot/deploymentTemplates/template-with-new-rg.json
rename to samples/python/wip/python_quart/02.echo-bot/deploymentTemplates/template-with-new-rg.json
index b68e51ec60..76ac1be517 100644
--- a/samples/python/python_quart/02.echo-bot/deploymentTemplates/template-with-new-rg.json
+++ b/samples/python/wip/python_quart/02.echo-bot/deploymentTemplates/template-with-new-rg.json
@@ -1,264 +1,264 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "groupLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the location of the Resource Group."
-            }
-        },
-        "groupName": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the name of the Resource Group."
-            }
-        },
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "metadata": {
-                "description": "The name of the App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "newAppServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan. Defaults to \"westus\"."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "appServicePlanName": "[parameters('newAppServicePlanName')]",
-        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
-    },
-    "resources": [
-        {
-            "name": "[parameters('groupName')]",
-            "type": "Microsoft.Resources/resourceGroups",
-            "apiVersion": "2018-05-01",
-            "location": "[parameters('groupLocation')]",
-            "properties": {
-            }
-        },
-        {
-            "type": "Microsoft.Resources/deployments",
-            "apiVersion": "2018-05-01",
-            "name": "storageDeployment",
-            "resourceGroup": "[parameters('groupName')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
-            ],
-            "properties": {
-                "mode": "Incremental",
-                "template": {
-                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-                    "contentVersion": "1.0.0.0",
-                    "parameters": {},
-                    "variables": {},
-                    "resources": [
-                        {
-                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-                            "type": "Microsoft.Web/serverfarms",
-                            "name": "[variables('appServicePlanName')]",
-                            "apiVersion": "2018-02-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "sku": "[parameters('newAppServicePlanSku')]",
-                            "kind": "linux",
-                            "properties": {
-                                "name": "[variables('appServicePlanName')]",
-                                "perSiteScaling": false,
-                                "reserved": true,
-                                "targetWorkerCount": 0,
-                                "targetWorkerSizeId": 0
-                            }
-                        },
-                        {
-                            "comments": "Create a Web App using a Linux App Service Plan",
-                            "type": "Microsoft.Web/sites",
-                            "apiVersion": "2015-08-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "kind": "app,linux",
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
-                            ],
-                            "name": "[variables('webAppName')]",
-                            "properties": {
-                                "name": "[variables('webAppName')]",
-                                "hostNameSslStates": [
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Standard"
-                                    },
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Repository"
-                                    }
-                                ],
-                                "serverFarmId": "[variables('appServicePlanName')]",
-                                "siteConfig": {
-                                    "appSettings": [
-                                        {
-                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                                            "value": "true"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppId",
-                                            "value": "[parameters('appId')]"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppPassword",
-                                            "value": "[parameters('appSecret')]"
-                                        }
-                                    ],
-                                    "cors": {
-                                        "allowedOrigins": [
-                                            "https://botservice.hosting.portal.azure.net",
-                                            "https://hosting.onecloud.azure-test.net/"
-                                        ]
-                                    }
-                                }
-                            }
-                        },
-                        {
-                          "type": "Microsoft.Web/sites/config",
-                          "apiVersion": "2016-08-01",
-                          "name": "[concat(variables('webAppName'), '/web')]",
-                          "location": "[variables('resourcesLocation')]",
-                          "dependsOn": [
-                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-                          ],
-                          "properties": {
-                              "numberOfWorkers": 1,
-                              "defaultDocuments": [
-                                  "Default.htm",
-                                  "Default.html",
-                                  "Default.asp",
-                                  "index.htm",
-                                  "index.html",
-                                  "iisstart.htm",
-                                  "default.aspx",
-                                  "index.php",
-                                  "hostingstart.html"
-                              ],
-                              "netFrameworkVersion": "v4.0",
-                              "phpVersion": "",
-                              "pythonVersion": "",
-                              "nodeVersion": "",
-                              "linuxFxVersion": "PYTHON|3.7",
-                              "requestTracingEnabled": false,
-                              "remoteDebuggingEnabled": false,
-                              "remoteDebuggingVersion": "VS2017",
-                              "httpLoggingEnabled": true,
-                              "logsDirectorySizeLimit": 35,
-                              "detailedErrorLoggingEnabled": false,
-                              "publishingUsername": "[variables('publishingUsername')]",
-                              "scmType": "None",
-                              "use32BitWorkerProcess": true,
-                              "webSocketsEnabled": false,
-                              "alwaysOn": false,
-                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                              "managedPipelineMode": "Integrated",
-                              "virtualApplications": [
-                                  {
-                                      "virtualPath": "/",
-                                      "physicalPath": "site\\wwwroot",
-                                      "preloadEnabled": false,
-                                      "virtualDirectories": null
-                                  }
-                              ],
-                              "winAuthAdminState": 0,
-                              "winAuthTenantState": 0,
-                              "customAppPoolIdentityAdminState": false,
-                              "customAppPoolIdentityTenantState": false,
-                              "loadBalancing": "LeastRequests",
-                              "routingRules": [],
-                              "experiments": {
-                                  "rampUpRules": []
-                              },
-                              "autoHealEnabled": false,
-                              "vnetName": "",
-                              "minTlsVersion": "1.2",
-                              "ftpsState": "AllAllowed",
-                              "reservedInstanceCount": 0
-                          }
-                        },
-                        {
-                            "apiVersion": "2017-12-01",
-                            "type": "Microsoft.BotService/botServices",
-                            "name": "[parameters('botId')]",
-                            "location": "global",
-                            "kind": "bot",
-                            "sku": {
-                                "name": "[parameters('botSku')]"
-                            },
-                            "properties": {
-                                "name": "[parameters('botId')]",
-                                "displayName": "[parameters('botId')]",
-                                "endpoint": "[variables('botEndpoint')]",
-                                "msaAppId": "[parameters('appId')]",
-                                "developerAppInsightsApplicationId": null,
-                                "developerAppInsightKey": null,
-                                "publishingCredentials": null,
-                                "storageResourceId": null
-                            },
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-                            ]
-                        }
-                    ],
-                    "outputs": {}
-                }
-            }
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "groupLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the location of the Resource Group."
+            }
+        },
+        "groupName": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the name of the Resource Group."
+            }
+        },
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "metadata": {
+                "description": "The name of the App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "newAppServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan. Defaults to \"westus\"."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "appServicePlanName": "[parameters('newAppServicePlanName')]",
+        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
+    },
+    "resources": [
+        {
+            "name": "[parameters('groupName')]",
+            "type": "Microsoft.Resources/resourceGroups",
+            "apiVersion": "2018-05-01",
+            "location": "[parameters('groupLocation')]",
+            "properties": {
+            }
+        },
+        {
+            "type": "Microsoft.Resources/deployments",
+            "apiVersion": "2018-05-01",
+            "name": "storageDeployment",
+            "resourceGroup": "[parameters('groupName')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
+            ],
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "parameters": {},
+                    "variables": {},
+                    "resources": [
+                        {
+                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+                            "type": "Microsoft.Web/serverfarms",
+                            "name": "[variables('appServicePlanName')]",
+                            "apiVersion": "2018-02-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "sku": "[parameters('newAppServicePlanSku')]",
+                            "kind": "linux",
+                            "properties": {
+                                "name": "[variables('appServicePlanName')]",
+                                "perSiteScaling": false,
+                                "reserved": true,
+                                "targetWorkerCount": 0,
+                                "targetWorkerSizeId": 0
+                            }
+                        },
+                        {
+                            "comments": "Create a Web App using a Linux App Service Plan",
+                            "type": "Microsoft.Web/sites",
+                            "apiVersion": "2015-08-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "kind": "app,linux",
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
+                            ],
+                            "name": "[variables('webAppName')]",
+                            "properties": {
+                                "name": "[variables('webAppName')]",
+                                "hostNameSslStates": [
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Standard"
+                                    },
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Repository"
+                                    }
+                                ],
+                                "serverFarmId": "[variables('appServicePlanName')]",
+                                "siteConfig": {
+                                    "appSettings": [
+                                        {
+                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                                            "value": "true"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppId",
+                                            "value": "[parameters('appId')]"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppPassword",
+                                            "value": "[parameters('appSecret')]"
+                                        }
+                                    ],
+                                    "cors": {
+                                        "allowedOrigins": [
+                                            "https://botservice.hosting.portal.azure.net",
+                                            "https://hosting.onecloud.azure-test.net/"
+                                        ]
+                                    }
+                                }
+                            }
+                        },
+                        {
+                          "type": "Microsoft.Web/sites/config",
+                          "apiVersion": "2016-08-01",
+                          "name": "[concat(variables('webAppName'), '/web')]",
+                          "location": "[variables('resourcesLocation')]",
+                          "dependsOn": [
+                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+                          ],
+                          "properties": {
+                              "numberOfWorkers": 1,
+                              "defaultDocuments": [
+                                  "Default.htm",
+                                  "Default.html",
+                                  "Default.asp",
+                                  "index.htm",
+                                  "index.html",
+                                  "iisstart.htm",
+                                  "default.aspx",
+                                  "index.php",
+                                  "hostingstart.html"
+                              ],
+                              "netFrameworkVersion": "v4.0",
+                              "phpVersion": "",
+                              "pythonVersion": "",
+                              "nodeVersion": "",
+                              "linuxFxVersion": "PYTHON|3.7",
+                              "requestTracingEnabled": false,
+                              "remoteDebuggingEnabled": false,
+                              "remoteDebuggingVersion": "VS2017",
+                              "httpLoggingEnabled": true,
+                              "logsDirectorySizeLimit": 35,
+                              "detailedErrorLoggingEnabled": false,
+                              "publishingUsername": "[variables('publishingUsername')]",
+                              "scmType": "None",
+                              "use32BitWorkerProcess": true,
+                              "webSocketsEnabled": false,
+                              "alwaysOn": false,
+                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                              "managedPipelineMode": "Integrated",
+                              "virtualApplications": [
+                                  {
+                                      "virtualPath": "/",
+                                      "physicalPath": "site\\wwwroot",
+                                      "preloadEnabled": false,
+                                      "virtualDirectories": null
+                                  }
+                              ],
+                              "winAuthAdminState": 0,
+                              "winAuthTenantState": 0,
+                              "customAppPoolIdentityAdminState": false,
+                              "customAppPoolIdentityTenantState": false,
+                              "loadBalancing": "LeastRequests",
+                              "routingRules": [],
+                              "experiments": {
+                                  "rampUpRules": []
+                              },
+                              "autoHealEnabled": false,
+                              "vnetName": "",
+                              "minTlsVersion": "1.2",
+                              "ftpsState": "AllAllowed",
+                              "reservedInstanceCount": 0
+                          }
+                        },
+                        {
+                            "apiVersion": "2017-12-01",
+                            "type": "Microsoft.BotService/botServices",
+                            "name": "[parameters('botId')]",
+                            "location": "global",
+                            "kind": "bot",
+                            "sku": {
+                                "name": "[parameters('botSku')]"
+                            },
+                            "properties": {
+                                "name": "[parameters('botId')]",
+                                "displayName": "[parameters('botId')]",
+                                "endpoint": "[variables('botEndpoint')]",
+                                "msaAppId": "[parameters('appId')]",
+                                "developerAppInsightsApplicationId": null,
+                                "developerAppInsightKey": null,
+                                "publishingCredentials": null,
+                                "storageResourceId": null
+                            },
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+                            ]
+                        }
+                    ],
+                    "outputs": {}
+                }
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_tornado/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json b/samples/python/wip/python_quart/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
similarity index 97%
rename from samples/python/python_tornado/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
rename to samples/python/wip/python_quart/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
index 66b044b527..074b789fc2 100644
--- a/samples/python/python_tornado/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
+++ b/samples/python/wip/python_quart/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
@@ -1,242 +1,242 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "defaultValue": "F0",
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The name of the new App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "appServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan."
-            }
-        },
-        "existingAppServicePlan": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
-        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
-        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
-        "resourcesLocation": "[parameters('appServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
-    },
-    "resources": [
-        {
-            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-            "type": "Microsoft.Web/serverfarms",
-            "apiVersion": "2016-09-01",
-            "name": "[variables('servicePlanName')]",
-            "location": "[variables('resourcesLocation')]",
-            "sku": "[parameters('newAppServicePlanSku')]",
-            "kind": "linux",
-            "properties": {
-                "name": "[variables('servicePlanName')]",
-                "perSiteScaling": false,
-                "reserved": true,
-                "targetWorkerCount": 0,
-                "targetWorkerSizeId": 0
-            }
-        },
-        {
-            "comments": "Create a Web App using a Linux App Service Plan",
-            "type": "Microsoft.Web/sites",
-            "apiVersion": "2016-08-01",
-            "name": "[variables('webAppName')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
-            ],
-            "kind": "app,linux",
-            "properties": {
-                "enabled": true,
-                "hostNameSslStates": [
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Standard"
-                    },
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Repository"
-                    }
-                ],
-                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
-                "reserved": true,
-                "scmSiteAlsoStopped": false,
-                "clientAffinityEnabled": false,
-                "clientCertEnabled": false,
-                "hostNamesDisabled": false,
-                "containerSize": 0,
-                "dailyMemoryTimeQuota": 0,
-                "httpsOnly": false,
-                "siteConfig": {
-                    "appSettings": [
-                        {
-                            "name": "MicrosoftAppId",
-                            "value": "[parameters('appId')]"
-                        },
-                        {
-                            "name": "MicrosoftAppPassword",
-                            "value": "[parameters('appSecret')]"
-                        },
-                        {
-                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                            "value": "true"
-                        }
-                    ],
-                    "cors": {
-                        "allowedOrigins": [
-                            "https://botservice.hosting.portal.azure.net",
-                            "https://hosting.onecloud.azure-test.net/"
-                        ]
-                    }
-                }
-            }
-        },
-        {
-            "type": "Microsoft.Web/sites/config",
-            "apiVersion": "2016-08-01",
-            "name": "[concat(variables('webAppName'), '/web')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-            ],
-            "properties": {
-                "numberOfWorkers": 1,
-                "defaultDocuments": [
-                    "Default.htm",
-                    "Default.html",
-                    "Default.asp",
-                    "index.htm",
-                    "index.html",
-                    "iisstart.htm",
-                    "default.aspx",
-                    "index.php",
-                    "hostingstart.html"
-                ],
-                "netFrameworkVersion": "v4.0",
-                "phpVersion": "",
-                "pythonVersion": "",
-                "nodeVersion": "",
-                "linuxFxVersion": "PYTHON|3.7",
-                "requestTracingEnabled": false,
-                "remoteDebuggingEnabled": false,
-                "remoteDebuggingVersion": "VS2017",
-                "httpLoggingEnabled": true,
-                "logsDirectorySizeLimit": 35,
-                "detailedErrorLoggingEnabled": false,
-                "publishingUsername": "[variables('publishingUsername')]",
-                "scmType": "None",
-                "use32BitWorkerProcess": true,
-                "webSocketsEnabled": false,
-                "alwaysOn": false,
-                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                "managedPipelineMode": "Integrated",
-                "virtualApplications": [
-                    {
-                        "virtualPath": "/",
-                        "physicalPath": "site\\wwwroot",
-                        "preloadEnabled": false,
-                        "virtualDirectories": null
-                    }
-                ],
-                "winAuthAdminState": 0,
-                "winAuthTenantState": 0,
-                "customAppPoolIdentityAdminState": false,
-                "customAppPoolIdentityTenantState": false,
-                "loadBalancing": "LeastRequests",
-                "routingRules": [],
-                "experiments": {
-                    "rampUpRules": []
-                },
-                "autoHealEnabled": false,
-                "vnetName": "",
-                "minTlsVersion": "1.2",
-                "ftpsState": "AllAllowed",
-                "reservedInstanceCount": 0
-            }
-        },
-        {
-            "apiVersion": "2017-12-01",
-            "type": "Microsoft.BotService/botServices",
-            "name": "[parameters('botId')]",
-            "location": "global",
-            "kind": "bot",
-            "sku": {
-                "name": "[parameters('botSku')]"
-            },
-            "properties": {
-                "name": "[parameters('botId')]",
-                "displayName": "[parameters('botId')]",
-                "endpoint": "[variables('botEndpoint')]",
-                "msaAppId": "[parameters('appId')]",
-                "developerAppInsightsApplicationId": null,
-                "developerAppInsightKey": null,
-                "publishingCredentials": null,
-                "storageResourceId": null
-            },
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-            ]
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "defaultValue": "F0",
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The name of the new App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "appServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan."
+            }
+        },
+        "existingAppServicePlan": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
+        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
+        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
+        "resourcesLocation": "[parameters('appServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
+    },
+    "resources": [
+        {
+            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+            "type": "Microsoft.Web/serverfarms",
+            "apiVersion": "2016-09-01",
+            "name": "[variables('servicePlanName')]",
+            "location": "[variables('resourcesLocation')]",
+            "sku": "[parameters('newAppServicePlanSku')]",
+            "kind": "linux",
+            "properties": {
+                "name": "[variables('servicePlanName')]",
+                "perSiteScaling": false,
+                "reserved": true,
+                "targetWorkerCount": 0,
+                "targetWorkerSizeId": 0
+            }
+        },
+        {
+            "comments": "Create a Web App using a Linux App Service Plan",
+            "type": "Microsoft.Web/sites",
+            "apiVersion": "2016-08-01",
+            "name": "[variables('webAppName')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
+            ],
+            "kind": "app,linux",
+            "properties": {
+                "enabled": true,
+                "hostNameSslStates": [
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Standard"
+                    },
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Repository"
+                    }
+                ],
+                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
+                "reserved": true,
+                "scmSiteAlsoStopped": false,
+                "clientAffinityEnabled": false,
+                "clientCertEnabled": false,
+                "hostNamesDisabled": false,
+                "containerSize": 0,
+                "dailyMemoryTimeQuota": 0,
+                "httpsOnly": false,
+                "siteConfig": {
+                    "appSettings": [
+                        {
+                            "name": "MicrosoftAppId",
+                            "value": "[parameters('appId')]"
+                        },
+                        {
+                            "name": "MicrosoftAppPassword",
+                            "value": "[parameters('appSecret')]"
+                        },
+                        {
+                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                            "value": "true"
+                        }
+                    ],
+                    "cors": {
+                        "allowedOrigins": [
+                            "https://botservice.hosting.portal.azure.net",
+                            "https://hosting.onecloud.azure-test.net/"
+                        ]
+                    }
+                }
+            }
+        },
+        {
+            "type": "Microsoft.Web/sites/config",
+            "apiVersion": "2016-08-01",
+            "name": "[concat(variables('webAppName'), '/web')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+            ],
+            "properties": {
+                "numberOfWorkers": 1,
+                "defaultDocuments": [
+                    "Default.htm",
+                    "Default.html",
+                    "Default.asp",
+                    "index.htm",
+                    "index.html",
+                    "iisstart.htm",
+                    "default.aspx",
+                    "index.php",
+                    "hostingstart.html"
+                ],
+                "netFrameworkVersion": "v4.0",
+                "phpVersion": "",
+                "pythonVersion": "",
+                "nodeVersion": "",
+                "linuxFxVersion": "PYTHON|3.7",
+                "requestTracingEnabled": false,
+                "remoteDebuggingEnabled": false,
+                "remoteDebuggingVersion": "VS2017",
+                "httpLoggingEnabled": true,
+                "logsDirectorySizeLimit": 35,
+                "detailedErrorLoggingEnabled": false,
+                "publishingUsername": "[variables('publishingUsername')]",
+                "scmType": "None",
+                "use32BitWorkerProcess": true,
+                "webSocketsEnabled": false,
+                "alwaysOn": false,
+                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                "managedPipelineMode": "Integrated",
+                "virtualApplications": [
+                    {
+                        "virtualPath": "/",
+                        "physicalPath": "site\\wwwroot",
+                        "preloadEnabled": false,
+                        "virtualDirectories": null
+                    }
+                ],
+                "winAuthAdminState": 0,
+                "winAuthTenantState": 0,
+                "customAppPoolIdentityAdminState": false,
+                "customAppPoolIdentityTenantState": false,
+                "loadBalancing": "LeastRequests",
+                "routingRules": [],
+                "experiments": {
+                    "rampUpRules": []
+                },
+                "autoHealEnabled": false,
+                "vnetName": "",
+                "minTlsVersion": "1.2",
+                "ftpsState": "AllAllowed",
+                "reservedInstanceCount": 0
+            }
+        },
+        {
+            "apiVersion": "2017-12-01",
+            "type": "Microsoft.BotService/botServices",
+            "name": "[parameters('botId')]",
+            "location": "global",
+            "kind": "bot",
+            "sku": {
+                "name": "[parameters('botSku')]"
+            },
+            "properties": {
+                "name": "[parameters('botId')]",
+                "displayName": "[parameters('botId')]",
+                "endpoint": "[variables('botEndpoint')]",
+                "msaAppId": "[parameters('appId')]",
+                "developerAppInsightsApplicationId": null,
+                "developerAppInsightKey": null,
+                "publishingCredentials": null,
+                "storageResourceId": null
+            },
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_quart/02.echo-bot/requirements.txt b/samples/python/wip/python_quart/02.echo-bot/requirements.txt
similarity index 100%
rename from samples/python/python_quart/02.echo-bot/requirements.txt
rename to samples/python/wip/python_quart/02.echo-bot/requirements.txt
diff --git a/samples/python/python_quart/13.core-bot/README-LUIS.md b/samples/python/wip/python_quart/13.core-bot/README-LUIS.md
similarity index 100%
rename from samples/python/python_quart/13.core-bot/README-LUIS.md
rename to samples/python/wip/python_quart/13.core-bot/README-LUIS.md
diff --git a/samples/python/python_tornado/13.core-bot/README.md b/samples/python/wip/python_quart/13.core-bot/README.md
similarity index 98%
rename from samples/python/python_tornado/13.core-bot/README.md
rename to samples/python/wip/python_quart/13.core-bot/README.md
index 03d86a0290..914169ac02 100644
--- a/samples/python/python_tornado/13.core-bot/README.md
+++ b/samples/python/wip/python_quart/13.core-bot/README.md
@@ -1,64 +1,64 @@
-# CoreBot
-
-Bot Framework v4 core bot sample.
-
-This bot has been created using [Bot Framework](https://dev.botframework.com), it shows how to:
-
-- Use [LUIS](https://www.luis.ai) to implement core AI capabilities
-- Implement a multi-turn conversation using Dialogs
-- Handle user interruptions for such things as `Help` or `Cancel`
-- Prompt for and validate requests for information from the user
-
-## Prerequisites
-
-This sample **requires** prerequisites in order to run.
-
-### Overview
-
-This bot uses [LUIS](https://www.luis.ai), an AI based cognitive service, to implement language understanding.
-
-### Install Python 3.7
-
-
-### Create a LUIS Application to enable language understanding
-
-LUIS language model setup, training, and application configuration steps can be found [here](https://docs.microsoft.com/azure/bot-service/bot-builder-howto-v4-luis?view=azure-bot-service-4.0&tabs=cs).
-
-If you wish to create a LUIS application via the CLI, these steps can be found in the [README-LUIS.md](README-LUIS.md).
-
-## Running the sample
-- Bring up a terminal, navigate to `botbuilder-samples\samples\python\13.core-bot` folder
-- Activate your desired virtual environment
-- Run `pip install -r requirements.txt` to install all dependencies
-- Update LuisAppId, LuisAPIKey and LuisAPIHostName in `config.py` with the information retrieved from the [LUIS portal](https://www.luis.ai)
-- Run your bot with `python app.py`
-
-
-## Testing the bot using Bot Framework Emulator
-
-[Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel.
-
-- Install the Bot Framework Emulator version 4.3.0 or greater from [here](https://github.com/Microsoft/BotFramework-Emulator/releases)
-
-### Connect to the bot using Bot Framework Emulator
-
-- Launch Bot Framework Emulator
-- Enter a Bot URL of `http://localhost:3978/api/messages`
-
-## Deploy the bot to Azure
-
-To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment) for a complete list of deployment instructions.
-
-# Further reading
-
-- [Bot Framework Documentation](https://docs.botframework.com)
-- [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
-- [Dialogs](https://docs.microsoft.com/azure/bot-service/bot-builder-concept-dialog?view=azure-bot-service-4.0)
-- [Gathering Input Using Prompts](https://docs.microsoft.com/azure/bot-service/bot-builder-prompts?view=azure-bot-service-4.0&tabs=csharp)
-- [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0)
-- [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
-- [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0)
-- [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest)
-- [Azure Portal](https://portal.azure.com)
-- [Language Understanding using LUIS](https://docs.microsoft.com/azure/cognitive-services/luis/)
+# CoreBot
+
+Bot Framework v4 core bot sample.
+
+This bot has been created using [Bot Framework](https://dev.botframework.com), it shows how to:
+
+- Use [LUIS](https://www.luis.ai) to implement core AI capabilities
+- Implement a multi-turn conversation using Dialogs
+- Handle user interruptions for such things as `Help` or `Cancel`
+- Prompt for and validate requests for information from the user
+
+## Prerequisites
+
+This sample **requires** prerequisites in order to run.
+
+### Overview
+
+This bot uses [LUIS](https://www.luis.ai), an AI based cognitive service, to implement language understanding.
+
+### Install Python 3.7
+
+
+### Create a LUIS Application to enable language understanding
+
+LUIS language model setup, training, and application configuration steps can be found [here](https://docs.microsoft.com/azure/bot-service/bot-builder-howto-v4-luis?view=azure-bot-service-4.0&tabs=cs).
+
+If you wish to create a LUIS application via the CLI, these steps can be found in the [README-LUIS.md](README-LUIS.md).
+
+## Running the sample
+- Bring up a terminal, navigate to `botbuilder-samples\samples\python\13.core-bot` folder
+- Activate your desired virtual environment
+- Run `pip install -r requirements.txt` to install all dependencies
+- Update LuisAppId, LuisAPIKey and LuisAPIHostName in `config.py` with the information retrieved from the [LUIS portal](https://www.luis.ai)
+- Run your bot with `python app.py`
+
+
+## Testing the bot using Bot Framework Emulator
+
+[Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel.
+
+- Install the Bot Framework Emulator version 4.3.0 or greater from [here](https://github.com/Microsoft/BotFramework-Emulator/releases)
+
+### Connect to the bot using Bot Framework Emulator
+
+- Launch Bot Framework Emulator
+- Enter a Bot URL of `http://localhost:3978/api/messages`
+
+## Deploy the bot to Azure
+
+To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment) for a complete list of deployment instructions.
+
+# Further reading
+
+- [Bot Framework Documentation](https://docs.botframework.com)
+- [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
+- [Dialogs](https://docs.microsoft.com/azure/bot-service/bot-builder-concept-dialog?view=azure-bot-service-4.0)
+- [Gathering Input Using Prompts](https://docs.microsoft.com/azure/bot-service/bot-builder-prompts?view=azure-bot-service-4.0&tabs=csharp)
+- [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0)
+- [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
+- [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0)
+- [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest)
+- [Azure Portal](https://portal.azure.com)
+- [Language Understanding using LUIS](https://docs.microsoft.com/azure/cognitive-services/luis/)
 - [Channels and Bot Connector Service](https://docs.microsoft.com/azure/bot-service/bot-concepts?view=azure-bot-service-4.0)
\ No newline at end of file
diff --git a/samples/python/python_quart/13.core-bot/adapter_with_error_handler.py b/samples/python/wip/python_quart/13.core-bot/adapter_with_error_handler.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/adapter_with_error_handler.py
rename to samples/python/wip/python_quart/13.core-bot/adapter_with_error_handler.py
diff --git a/samples/python/python_quart/13.core-bot/app.py b/samples/python/wip/python_quart/13.core-bot/app.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/app.py
rename to samples/python/wip/python_quart/13.core-bot/app.py
diff --git a/samples/python/python_quart/13.core-bot/booking_details.py b/samples/python/wip/python_quart/13.core-bot/booking_details.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/booking_details.py
rename to samples/python/wip/python_quart/13.core-bot/booking_details.py
diff --git a/samples/python/python_quart/13.core-bot/bots/__init__.py b/samples/python/wip/python_quart/13.core-bot/bots/__init__.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/bots/__init__.py
rename to samples/python/wip/python_quart/13.core-bot/bots/__init__.py
diff --git a/samples/python/python_quart/13.core-bot/bots/dialog_and_welcome_bot.py b/samples/python/wip/python_quart/13.core-bot/bots/dialog_and_welcome_bot.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/bots/dialog_and_welcome_bot.py
rename to samples/python/wip/python_quart/13.core-bot/bots/dialog_and_welcome_bot.py
diff --git a/samples/python/python_quart/13.core-bot/bots/dialog_bot.py b/samples/python/wip/python_quart/13.core-bot/bots/dialog_bot.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/bots/dialog_bot.py
rename to samples/python/wip/python_quart/13.core-bot/bots/dialog_bot.py
diff --git a/samples/python/python_quart/13.core-bot/cards/welcomeCard.json b/samples/python/wip/python_quart/13.core-bot/cards/welcomeCard.json
similarity index 100%
rename from samples/python/python_quart/13.core-bot/cards/welcomeCard.json
rename to samples/python/wip/python_quart/13.core-bot/cards/welcomeCard.json
diff --git a/samples/python/python_quart/13.core-bot/cognitiveModels/FlightBooking.json b/samples/python/wip/python_quart/13.core-bot/cognitiveModels/FlightBooking.json
similarity index 100%
rename from samples/python/python_quart/13.core-bot/cognitiveModels/FlightBooking.json
rename to samples/python/wip/python_quart/13.core-bot/cognitiveModels/FlightBooking.json
diff --git a/samples/python/python_quart/13.core-bot/config.py b/samples/python/wip/python_quart/13.core-bot/config.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/config.py
rename to samples/python/wip/python_quart/13.core-bot/config.py
diff --git a/samples/python/python_tornado/02.echo-bot/deploymentTemplates/template-with-new-rg.json b/samples/python/wip/python_quart/13.core-bot/deploymentTemplates/template-with-new-rg.json
similarity index 97%
rename from samples/python/python_tornado/02.echo-bot/deploymentTemplates/template-with-new-rg.json
rename to samples/python/wip/python_quart/13.core-bot/deploymentTemplates/template-with-new-rg.json
index b68e51ec60..76ac1be517 100644
--- a/samples/python/python_tornado/02.echo-bot/deploymentTemplates/template-with-new-rg.json
+++ b/samples/python/wip/python_quart/13.core-bot/deploymentTemplates/template-with-new-rg.json
@@ -1,264 +1,264 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "groupLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the location of the Resource Group."
-            }
-        },
-        "groupName": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the name of the Resource Group."
-            }
-        },
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "metadata": {
-                "description": "The name of the App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "newAppServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan. Defaults to \"westus\"."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "appServicePlanName": "[parameters('newAppServicePlanName')]",
-        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
-    },
-    "resources": [
-        {
-            "name": "[parameters('groupName')]",
-            "type": "Microsoft.Resources/resourceGroups",
-            "apiVersion": "2018-05-01",
-            "location": "[parameters('groupLocation')]",
-            "properties": {
-            }
-        },
-        {
-            "type": "Microsoft.Resources/deployments",
-            "apiVersion": "2018-05-01",
-            "name": "storageDeployment",
-            "resourceGroup": "[parameters('groupName')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
-            ],
-            "properties": {
-                "mode": "Incremental",
-                "template": {
-                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-                    "contentVersion": "1.0.0.0",
-                    "parameters": {},
-                    "variables": {},
-                    "resources": [
-                        {
-                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-                            "type": "Microsoft.Web/serverfarms",
-                            "name": "[variables('appServicePlanName')]",
-                            "apiVersion": "2018-02-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "sku": "[parameters('newAppServicePlanSku')]",
-                            "kind": "linux",
-                            "properties": {
-                                "name": "[variables('appServicePlanName')]",
-                                "perSiteScaling": false,
-                                "reserved": true,
-                                "targetWorkerCount": 0,
-                                "targetWorkerSizeId": 0
-                            }
-                        },
-                        {
-                            "comments": "Create a Web App using a Linux App Service Plan",
-                            "type": "Microsoft.Web/sites",
-                            "apiVersion": "2015-08-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "kind": "app,linux",
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
-                            ],
-                            "name": "[variables('webAppName')]",
-                            "properties": {
-                                "name": "[variables('webAppName')]",
-                                "hostNameSslStates": [
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Standard"
-                                    },
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Repository"
-                                    }
-                                ],
-                                "serverFarmId": "[variables('appServicePlanName')]",
-                                "siteConfig": {
-                                    "appSettings": [
-                                        {
-                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                                            "value": "true"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppId",
-                                            "value": "[parameters('appId')]"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppPassword",
-                                            "value": "[parameters('appSecret')]"
-                                        }
-                                    ],
-                                    "cors": {
-                                        "allowedOrigins": [
-                                            "https://botservice.hosting.portal.azure.net",
-                                            "https://hosting.onecloud.azure-test.net/"
-                                        ]
-                                    }
-                                }
-                            }
-                        },
-                        {
-                          "type": "Microsoft.Web/sites/config",
-                          "apiVersion": "2016-08-01",
-                          "name": "[concat(variables('webAppName'), '/web')]",
-                          "location": "[variables('resourcesLocation')]",
-                          "dependsOn": [
-                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-                          ],
-                          "properties": {
-                              "numberOfWorkers": 1,
-                              "defaultDocuments": [
-                                  "Default.htm",
-                                  "Default.html",
-                                  "Default.asp",
-                                  "index.htm",
-                                  "index.html",
-                                  "iisstart.htm",
-                                  "default.aspx",
-                                  "index.php",
-                                  "hostingstart.html"
-                              ],
-                              "netFrameworkVersion": "v4.0",
-                              "phpVersion": "",
-                              "pythonVersion": "",
-                              "nodeVersion": "",
-                              "linuxFxVersion": "PYTHON|3.7",
-                              "requestTracingEnabled": false,
-                              "remoteDebuggingEnabled": false,
-                              "remoteDebuggingVersion": "VS2017",
-                              "httpLoggingEnabled": true,
-                              "logsDirectorySizeLimit": 35,
-                              "detailedErrorLoggingEnabled": false,
-                              "publishingUsername": "[variables('publishingUsername')]",
-                              "scmType": "None",
-                              "use32BitWorkerProcess": true,
-                              "webSocketsEnabled": false,
-                              "alwaysOn": false,
-                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                              "managedPipelineMode": "Integrated",
-                              "virtualApplications": [
-                                  {
-                                      "virtualPath": "/",
-                                      "physicalPath": "site\\wwwroot",
-                                      "preloadEnabled": false,
-                                      "virtualDirectories": null
-                                  }
-                              ],
-                              "winAuthAdminState": 0,
-                              "winAuthTenantState": 0,
-                              "customAppPoolIdentityAdminState": false,
-                              "customAppPoolIdentityTenantState": false,
-                              "loadBalancing": "LeastRequests",
-                              "routingRules": [],
-                              "experiments": {
-                                  "rampUpRules": []
-                              },
-                              "autoHealEnabled": false,
-                              "vnetName": "",
-                              "minTlsVersion": "1.2",
-                              "ftpsState": "AllAllowed",
-                              "reservedInstanceCount": 0
-                          }
-                        },
-                        {
-                            "apiVersion": "2017-12-01",
-                            "type": "Microsoft.BotService/botServices",
-                            "name": "[parameters('botId')]",
-                            "location": "global",
-                            "kind": "bot",
-                            "sku": {
-                                "name": "[parameters('botSku')]"
-                            },
-                            "properties": {
-                                "name": "[parameters('botId')]",
-                                "displayName": "[parameters('botId')]",
-                                "endpoint": "[variables('botEndpoint')]",
-                                "msaAppId": "[parameters('appId')]",
-                                "developerAppInsightsApplicationId": null,
-                                "developerAppInsightKey": null,
-                                "publishingCredentials": null,
-                                "storageResourceId": null
-                            },
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-                            ]
-                        }
-                    ],
-                    "outputs": {}
-                }
-            }
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "groupLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the location of the Resource Group."
+            }
+        },
+        "groupName": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the name of the Resource Group."
+            }
+        },
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "metadata": {
+                "description": "The name of the App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "newAppServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan. Defaults to \"westus\"."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "appServicePlanName": "[parameters('newAppServicePlanName')]",
+        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
+    },
+    "resources": [
+        {
+            "name": "[parameters('groupName')]",
+            "type": "Microsoft.Resources/resourceGroups",
+            "apiVersion": "2018-05-01",
+            "location": "[parameters('groupLocation')]",
+            "properties": {
+            }
+        },
+        {
+            "type": "Microsoft.Resources/deployments",
+            "apiVersion": "2018-05-01",
+            "name": "storageDeployment",
+            "resourceGroup": "[parameters('groupName')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
+            ],
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "parameters": {},
+                    "variables": {},
+                    "resources": [
+                        {
+                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+                            "type": "Microsoft.Web/serverfarms",
+                            "name": "[variables('appServicePlanName')]",
+                            "apiVersion": "2018-02-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "sku": "[parameters('newAppServicePlanSku')]",
+                            "kind": "linux",
+                            "properties": {
+                                "name": "[variables('appServicePlanName')]",
+                                "perSiteScaling": false,
+                                "reserved": true,
+                                "targetWorkerCount": 0,
+                                "targetWorkerSizeId": 0
+                            }
+                        },
+                        {
+                            "comments": "Create a Web App using a Linux App Service Plan",
+                            "type": "Microsoft.Web/sites",
+                            "apiVersion": "2015-08-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "kind": "app,linux",
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
+                            ],
+                            "name": "[variables('webAppName')]",
+                            "properties": {
+                                "name": "[variables('webAppName')]",
+                                "hostNameSslStates": [
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Standard"
+                                    },
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Repository"
+                                    }
+                                ],
+                                "serverFarmId": "[variables('appServicePlanName')]",
+                                "siteConfig": {
+                                    "appSettings": [
+                                        {
+                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                                            "value": "true"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppId",
+                                            "value": "[parameters('appId')]"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppPassword",
+                                            "value": "[parameters('appSecret')]"
+                                        }
+                                    ],
+                                    "cors": {
+                                        "allowedOrigins": [
+                                            "https://botservice.hosting.portal.azure.net",
+                                            "https://hosting.onecloud.azure-test.net/"
+                                        ]
+                                    }
+                                }
+                            }
+                        },
+                        {
+                          "type": "Microsoft.Web/sites/config",
+                          "apiVersion": "2016-08-01",
+                          "name": "[concat(variables('webAppName'), '/web')]",
+                          "location": "[variables('resourcesLocation')]",
+                          "dependsOn": [
+                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+                          ],
+                          "properties": {
+                              "numberOfWorkers": 1,
+                              "defaultDocuments": [
+                                  "Default.htm",
+                                  "Default.html",
+                                  "Default.asp",
+                                  "index.htm",
+                                  "index.html",
+                                  "iisstart.htm",
+                                  "default.aspx",
+                                  "index.php",
+                                  "hostingstart.html"
+                              ],
+                              "netFrameworkVersion": "v4.0",
+                              "phpVersion": "",
+                              "pythonVersion": "",
+                              "nodeVersion": "",
+                              "linuxFxVersion": "PYTHON|3.7",
+                              "requestTracingEnabled": false,
+                              "remoteDebuggingEnabled": false,
+                              "remoteDebuggingVersion": "VS2017",
+                              "httpLoggingEnabled": true,
+                              "logsDirectorySizeLimit": 35,
+                              "detailedErrorLoggingEnabled": false,
+                              "publishingUsername": "[variables('publishingUsername')]",
+                              "scmType": "None",
+                              "use32BitWorkerProcess": true,
+                              "webSocketsEnabled": false,
+                              "alwaysOn": false,
+                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                              "managedPipelineMode": "Integrated",
+                              "virtualApplications": [
+                                  {
+                                      "virtualPath": "/",
+                                      "physicalPath": "site\\wwwroot",
+                                      "preloadEnabled": false,
+                                      "virtualDirectories": null
+                                  }
+                              ],
+                              "winAuthAdminState": 0,
+                              "winAuthTenantState": 0,
+                              "customAppPoolIdentityAdminState": false,
+                              "customAppPoolIdentityTenantState": false,
+                              "loadBalancing": "LeastRequests",
+                              "routingRules": [],
+                              "experiments": {
+                                  "rampUpRules": []
+                              },
+                              "autoHealEnabled": false,
+                              "vnetName": "",
+                              "minTlsVersion": "1.2",
+                              "ftpsState": "AllAllowed",
+                              "reservedInstanceCount": 0
+                          }
+                        },
+                        {
+                            "apiVersion": "2017-12-01",
+                            "type": "Microsoft.BotService/botServices",
+                            "name": "[parameters('botId')]",
+                            "location": "global",
+                            "kind": "bot",
+                            "sku": {
+                                "name": "[parameters('botSku')]"
+                            },
+                            "properties": {
+                                "name": "[parameters('botId')]",
+                                "displayName": "[parameters('botId')]",
+                                "endpoint": "[variables('botEndpoint')]",
+                                "msaAppId": "[parameters('appId')]",
+                                "developerAppInsightsApplicationId": null,
+                                "developerAppInsightKey": null,
+                                "publishingCredentials": null,
+                                "storageResourceId": null
+                            },
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+                            ]
+                        }
+                    ],
+                    "outputs": {}
+                }
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_quart/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json b/samples/python/wip/python_quart/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
similarity index 97%
rename from samples/python/python_quart/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
rename to samples/python/wip/python_quart/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
index 66b044b527..074b789fc2 100644
--- a/samples/python/python_quart/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
+++ b/samples/python/wip/python_quart/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
@@ -1,242 +1,242 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "defaultValue": "F0",
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The name of the new App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "appServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan."
-            }
-        },
-        "existingAppServicePlan": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
-        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
-        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
-        "resourcesLocation": "[parameters('appServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
-    },
-    "resources": [
-        {
-            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-            "type": "Microsoft.Web/serverfarms",
-            "apiVersion": "2016-09-01",
-            "name": "[variables('servicePlanName')]",
-            "location": "[variables('resourcesLocation')]",
-            "sku": "[parameters('newAppServicePlanSku')]",
-            "kind": "linux",
-            "properties": {
-                "name": "[variables('servicePlanName')]",
-                "perSiteScaling": false,
-                "reserved": true,
-                "targetWorkerCount": 0,
-                "targetWorkerSizeId": 0
-            }
-        },
-        {
-            "comments": "Create a Web App using a Linux App Service Plan",
-            "type": "Microsoft.Web/sites",
-            "apiVersion": "2016-08-01",
-            "name": "[variables('webAppName')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
-            ],
-            "kind": "app,linux",
-            "properties": {
-                "enabled": true,
-                "hostNameSslStates": [
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Standard"
-                    },
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Repository"
-                    }
-                ],
-                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
-                "reserved": true,
-                "scmSiteAlsoStopped": false,
-                "clientAffinityEnabled": false,
-                "clientCertEnabled": false,
-                "hostNamesDisabled": false,
-                "containerSize": 0,
-                "dailyMemoryTimeQuota": 0,
-                "httpsOnly": false,
-                "siteConfig": {
-                    "appSettings": [
-                        {
-                            "name": "MicrosoftAppId",
-                            "value": "[parameters('appId')]"
-                        },
-                        {
-                            "name": "MicrosoftAppPassword",
-                            "value": "[parameters('appSecret')]"
-                        },
-                        {
-                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                            "value": "true"
-                        }
-                    ],
-                    "cors": {
-                        "allowedOrigins": [
-                            "https://botservice.hosting.portal.azure.net",
-                            "https://hosting.onecloud.azure-test.net/"
-                        ]
-                    }
-                }
-            }
-        },
-        {
-            "type": "Microsoft.Web/sites/config",
-            "apiVersion": "2016-08-01",
-            "name": "[concat(variables('webAppName'), '/web')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-            ],
-            "properties": {
-                "numberOfWorkers": 1,
-                "defaultDocuments": [
-                    "Default.htm",
-                    "Default.html",
-                    "Default.asp",
-                    "index.htm",
-                    "index.html",
-                    "iisstart.htm",
-                    "default.aspx",
-                    "index.php",
-                    "hostingstart.html"
-                ],
-                "netFrameworkVersion": "v4.0",
-                "phpVersion": "",
-                "pythonVersion": "",
-                "nodeVersion": "",
-                "linuxFxVersion": "PYTHON|3.7",
-                "requestTracingEnabled": false,
-                "remoteDebuggingEnabled": false,
-                "remoteDebuggingVersion": "VS2017",
-                "httpLoggingEnabled": true,
-                "logsDirectorySizeLimit": 35,
-                "detailedErrorLoggingEnabled": false,
-                "publishingUsername": "[variables('publishingUsername')]",
-                "scmType": "None",
-                "use32BitWorkerProcess": true,
-                "webSocketsEnabled": false,
-                "alwaysOn": false,
-                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                "managedPipelineMode": "Integrated",
-                "virtualApplications": [
-                    {
-                        "virtualPath": "/",
-                        "physicalPath": "site\\wwwroot",
-                        "preloadEnabled": false,
-                        "virtualDirectories": null
-                    }
-                ],
-                "winAuthAdminState": 0,
-                "winAuthTenantState": 0,
-                "customAppPoolIdentityAdminState": false,
-                "customAppPoolIdentityTenantState": false,
-                "loadBalancing": "LeastRequests",
-                "routingRules": [],
-                "experiments": {
-                    "rampUpRules": []
-                },
-                "autoHealEnabled": false,
-                "vnetName": "",
-                "minTlsVersion": "1.2",
-                "ftpsState": "AllAllowed",
-                "reservedInstanceCount": 0
-            }
-        },
-        {
-            "apiVersion": "2017-12-01",
-            "type": "Microsoft.BotService/botServices",
-            "name": "[parameters('botId')]",
-            "location": "global",
-            "kind": "bot",
-            "sku": {
-                "name": "[parameters('botSku')]"
-            },
-            "properties": {
-                "name": "[parameters('botId')]",
-                "displayName": "[parameters('botId')]",
-                "endpoint": "[variables('botEndpoint')]",
-                "msaAppId": "[parameters('appId')]",
-                "developerAppInsightsApplicationId": null,
-                "developerAppInsightKey": null,
-                "publishingCredentials": null,
-                "storageResourceId": null
-            },
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-            ]
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "defaultValue": "F0",
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The name of the new App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "appServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan."
+            }
+        },
+        "existingAppServicePlan": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
+        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
+        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
+        "resourcesLocation": "[parameters('appServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
+    },
+    "resources": [
+        {
+            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+            "type": "Microsoft.Web/serverfarms",
+            "apiVersion": "2016-09-01",
+            "name": "[variables('servicePlanName')]",
+            "location": "[variables('resourcesLocation')]",
+            "sku": "[parameters('newAppServicePlanSku')]",
+            "kind": "linux",
+            "properties": {
+                "name": "[variables('servicePlanName')]",
+                "perSiteScaling": false,
+                "reserved": true,
+                "targetWorkerCount": 0,
+                "targetWorkerSizeId": 0
+            }
+        },
+        {
+            "comments": "Create a Web App using a Linux App Service Plan",
+            "type": "Microsoft.Web/sites",
+            "apiVersion": "2016-08-01",
+            "name": "[variables('webAppName')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
+            ],
+            "kind": "app,linux",
+            "properties": {
+                "enabled": true,
+                "hostNameSslStates": [
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Standard"
+                    },
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Repository"
+                    }
+                ],
+                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
+                "reserved": true,
+                "scmSiteAlsoStopped": false,
+                "clientAffinityEnabled": false,
+                "clientCertEnabled": false,
+                "hostNamesDisabled": false,
+                "containerSize": 0,
+                "dailyMemoryTimeQuota": 0,
+                "httpsOnly": false,
+                "siteConfig": {
+                    "appSettings": [
+                        {
+                            "name": "MicrosoftAppId",
+                            "value": "[parameters('appId')]"
+                        },
+                        {
+                            "name": "MicrosoftAppPassword",
+                            "value": "[parameters('appSecret')]"
+                        },
+                        {
+                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                            "value": "true"
+                        }
+                    ],
+                    "cors": {
+                        "allowedOrigins": [
+                            "https://botservice.hosting.portal.azure.net",
+                            "https://hosting.onecloud.azure-test.net/"
+                        ]
+                    }
+                }
+            }
+        },
+        {
+            "type": "Microsoft.Web/sites/config",
+            "apiVersion": "2016-08-01",
+            "name": "[concat(variables('webAppName'), '/web')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+            ],
+            "properties": {
+                "numberOfWorkers": 1,
+                "defaultDocuments": [
+                    "Default.htm",
+                    "Default.html",
+                    "Default.asp",
+                    "index.htm",
+                    "index.html",
+                    "iisstart.htm",
+                    "default.aspx",
+                    "index.php",
+                    "hostingstart.html"
+                ],
+                "netFrameworkVersion": "v4.0",
+                "phpVersion": "",
+                "pythonVersion": "",
+                "nodeVersion": "",
+                "linuxFxVersion": "PYTHON|3.7",
+                "requestTracingEnabled": false,
+                "remoteDebuggingEnabled": false,
+                "remoteDebuggingVersion": "VS2017",
+                "httpLoggingEnabled": true,
+                "logsDirectorySizeLimit": 35,
+                "detailedErrorLoggingEnabled": false,
+                "publishingUsername": "[variables('publishingUsername')]",
+                "scmType": "None",
+                "use32BitWorkerProcess": true,
+                "webSocketsEnabled": false,
+                "alwaysOn": false,
+                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                "managedPipelineMode": "Integrated",
+                "virtualApplications": [
+                    {
+                        "virtualPath": "/",
+                        "physicalPath": "site\\wwwroot",
+                        "preloadEnabled": false,
+                        "virtualDirectories": null
+                    }
+                ],
+                "winAuthAdminState": 0,
+                "winAuthTenantState": 0,
+                "customAppPoolIdentityAdminState": false,
+                "customAppPoolIdentityTenantState": false,
+                "loadBalancing": "LeastRequests",
+                "routingRules": [],
+                "experiments": {
+                    "rampUpRules": []
+                },
+                "autoHealEnabled": false,
+                "vnetName": "",
+                "minTlsVersion": "1.2",
+                "ftpsState": "AllAllowed",
+                "reservedInstanceCount": 0
+            }
+        },
+        {
+            "apiVersion": "2017-12-01",
+            "type": "Microsoft.BotService/botServices",
+            "name": "[parameters('botId')]",
+            "location": "global",
+            "kind": "bot",
+            "sku": {
+                "name": "[parameters('botSku')]"
+            },
+            "properties": {
+                "name": "[parameters('botId')]",
+                "displayName": "[parameters('botId')]",
+                "endpoint": "[variables('botEndpoint')]",
+                "msaAppId": "[parameters('appId')]",
+                "developerAppInsightsApplicationId": null,
+                "developerAppInsightKey": null,
+                "publishingCredentials": null,
+                "storageResourceId": null
+            },
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_quart/13.core-bot/dialogs/__init__.py b/samples/python/wip/python_quart/13.core-bot/dialogs/__init__.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/dialogs/__init__.py
rename to samples/python/wip/python_quart/13.core-bot/dialogs/__init__.py
diff --git a/samples/python/python_quart/13.core-bot/dialogs/booking_dialog.py b/samples/python/wip/python_quart/13.core-bot/dialogs/booking_dialog.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/dialogs/booking_dialog.py
rename to samples/python/wip/python_quart/13.core-bot/dialogs/booking_dialog.py
diff --git a/samples/python/python_quart/13.core-bot/dialogs/cancel_and_help_dialog.py b/samples/python/wip/python_quart/13.core-bot/dialogs/cancel_and_help_dialog.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/dialogs/cancel_and_help_dialog.py
rename to samples/python/wip/python_quart/13.core-bot/dialogs/cancel_and_help_dialog.py
diff --git a/samples/python/python_quart/13.core-bot/dialogs/date_resolver_dialog.py b/samples/python/wip/python_quart/13.core-bot/dialogs/date_resolver_dialog.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/dialogs/date_resolver_dialog.py
rename to samples/python/wip/python_quart/13.core-bot/dialogs/date_resolver_dialog.py
diff --git a/samples/python/python_quart/13.core-bot/dialogs/main_dialog.py b/samples/python/wip/python_quart/13.core-bot/dialogs/main_dialog.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/dialogs/main_dialog.py
rename to samples/python/wip/python_quart/13.core-bot/dialogs/main_dialog.py
diff --git a/samples/python/python_quart/13.core-bot/flight_booking_recognizer.py b/samples/python/wip/python_quart/13.core-bot/flight_booking_recognizer.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/flight_booking_recognizer.py
rename to samples/python/wip/python_quart/13.core-bot/flight_booking_recognizer.py
diff --git a/samples/python/python_quart/13.core-bot/helpers/__init__.py b/samples/python/wip/python_quart/13.core-bot/helpers/__init__.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/helpers/__init__.py
rename to samples/python/wip/python_quart/13.core-bot/helpers/__init__.py
diff --git a/samples/python/python_quart/13.core-bot/helpers/activity_helper.py b/samples/python/wip/python_quart/13.core-bot/helpers/activity_helper.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/helpers/activity_helper.py
rename to samples/python/wip/python_quart/13.core-bot/helpers/activity_helper.py
diff --git a/samples/python/python_quart/13.core-bot/helpers/dialog_helper.py b/samples/python/wip/python_quart/13.core-bot/helpers/dialog_helper.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/helpers/dialog_helper.py
rename to samples/python/wip/python_quart/13.core-bot/helpers/dialog_helper.py
diff --git a/samples/python/python_quart/13.core-bot/helpers/luis_helper.py b/samples/python/wip/python_quart/13.core-bot/helpers/luis_helper.py
similarity index 100%
rename from samples/python/python_quart/13.core-bot/helpers/luis_helper.py
rename to samples/python/wip/python_quart/13.core-bot/helpers/luis_helper.py
diff --git a/samples/python/python_quart/13.core-bot/requirements.txt b/samples/python/wip/python_quart/13.core-bot/requirements.txt
similarity index 94%
rename from samples/python/python_quart/13.core-bot/requirements.txt
rename to samples/python/wip/python_quart/13.core-bot/requirements.txt
index e381272c91..5a1fc8c816 100644
--- a/samples/python/python_quart/13.core-bot/requirements.txt
+++ b/samples/python/wip/python_quart/13.core-bot/requirements.txt
@@ -1,5 +1,5 @@
-quart>=0.10.0
-botbuilder-dialogs>=4.8.0
-botbuilder-ai>=4.8.0
-datatypes-date-time>=1.0.0.a2
-
+quart>=0.10.0
+botbuilder-dialogs>=4.8.0
+botbuilder-ai>=4.8.0
+datatypes-date-time>=1.0.0.a2
+
diff --git a/samples/python/python_tornado/02.echo-bot/README.md b/samples/python/wip/python_tornado/02.echo-bot/README.md
similarity index 100%
rename from samples/python/python_tornado/02.echo-bot/README.md
rename to samples/python/wip/python_tornado/02.echo-bot/README.md
diff --git a/samples/python/python_tornado/02.echo-bot/app.py b/samples/python/wip/python_tornado/02.echo-bot/app.py
similarity index 100%
rename from samples/python/python_tornado/02.echo-bot/app.py
rename to samples/python/wip/python_tornado/02.echo-bot/app.py
diff --git a/samples/python/python_tornado/02.echo-bot/bots/__init__.py b/samples/python/wip/python_tornado/02.echo-bot/bots/__init__.py
similarity index 100%
rename from samples/python/python_tornado/02.echo-bot/bots/__init__.py
rename to samples/python/wip/python_tornado/02.echo-bot/bots/__init__.py
diff --git a/samples/python/python_tornado/02.echo-bot/bots/echo_bot.py b/samples/python/wip/python_tornado/02.echo-bot/bots/echo_bot.py
similarity index 100%
rename from samples/python/python_tornado/02.echo-bot/bots/echo_bot.py
rename to samples/python/wip/python_tornado/02.echo-bot/bots/echo_bot.py
diff --git a/samples/python/python_tornado/13.core-bot/deploymentTemplates/template-with-new-rg.json b/samples/python/wip/python_tornado/02.echo-bot/deploymentTemplates/template-with-new-rg.json
similarity index 97%
rename from samples/python/python_tornado/13.core-bot/deploymentTemplates/template-with-new-rg.json
rename to samples/python/wip/python_tornado/02.echo-bot/deploymentTemplates/template-with-new-rg.json
index b68e51ec60..76ac1be517 100644
--- a/samples/python/python_tornado/13.core-bot/deploymentTemplates/template-with-new-rg.json
+++ b/samples/python/wip/python_tornado/02.echo-bot/deploymentTemplates/template-with-new-rg.json
@@ -1,264 +1,264 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "groupLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the location of the Resource Group."
-            }
-        },
-        "groupName": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the name of the Resource Group."
-            }
-        },
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "metadata": {
-                "description": "The name of the App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "newAppServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan. Defaults to \"westus\"."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "appServicePlanName": "[parameters('newAppServicePlanName')]",
-        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
-    },
-    "resources": [
-        {
-            "name": "[parameters('groupName')]",
-            "type": "Microsoft.Resources/resourceGroups",
-            "apiVersion": "2018-05-01",
-            "location": "[parameters('groupLocation')]",
-            "properties": {
-            }
-        },
-        {
-            "type": "Microsoft.Resources/deployments",
-            "apiVersion": "2018-05-01",
-            "name": "storageDeployment",
-            "resourceGroup": "[parameters('groupName')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
-            ],
-            "properties": {
-                "mode": "Incremental",
-                "template": {
-                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-                    "contentVersion": "1.0.0.0",
-                    "parameters": {},
-                    "variables": {},
-                    "resources": [
-                        {
-                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-                            "type": "Microsoft.Web/serverfarms",
-                            "name": "[variables('appServicePlanName')]",
-                            "apiVersion": "2018-02-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "sku": "[parameters('newAppServicePlanSku')]",
-                            "kind": "linux",
-                            "properties": {
-                                "name": "[variables('appServicePlanName')]",
-                                "perSiteScaling": false,
-                                "reserved": true,
-                                "targetWorkerCount": 0,
-                                "targetWorkerSizeId": 0
-                            }
-                        },
-                        {
-                            "comments": "Create a Web App using a Linux App Service Plan",
-                            "type": "Microsoft.Web/sites",
-                            "apiVersion": "2015-08-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "kind": "app,linux",
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
-                            ],
-                            "name": "[variables('webAppName')]",
-                            "properties": {
-                                "name": "[variables('webAppName')]",
-                                "hostNameSslStates": [
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Standard"
-                                    },
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Repository"
-                                    }
-                                ],
-                                "serverFarmId": "[variables('appServicePlanName')]",
-                                "siteConfig": {
-                                    "appSettings": [
-                                        {
-                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                                            "value": "true"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppId",
-                                            "value": "[parameters('appId')]"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppPassword",
-                                            "value": "[parameters('appSecret')]"
-                                        }
-                                    ],
-                                    "cors": {
-                                        "allowedOrigins": [
-                                            "https://botservice.hosting.portal.azure.net",
-                                            "https://hosting.onecloud.azure-test.net/"
-                                        ]
-                                    }
-                                }
-                            }
-                        },
-                        {
-                          "type": "Microsoft.Web/sites/config",
-                          "apiVersion": "2016-08-01",
-                          "name": "[concat(variables('webAppName'), '/web')]",
-                          "location": "[variables('resourcesLocation')]",
-                          "dependsOn": [
-                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-                          ],
-                          "properties": {
-                              "numberOfWorkers": 1,
-                              "defaultDocuments": [
-                                  "Default.htm",
-                                  "Default.html",
-                                  "Default.asp",
-                                  "index.htm",
-                                  "index.html",
-                                  "iisstart.htm",
-                                  "default.aspx",
-                                  "index.php",
-                                  "hostingstart.html"
-                              ],
-                              "netFrameworkVersion": "v4.0",
-                              "phpVersion": "",
-                              "pythonVersion": "",
-                              "nodeVersion": "",
-                              "linuxFxVersion": "PYTHON|3.7",
-                              "requestTracingEnabled": false,
-                              "remoteDebuggingEnabled": false,
-                              "remoteDebuggingVersion": "VS2017",
-                              "httpLoggingEnabled": true,
-                              "logsDirectorySizeLimit": 35,
-                              "detailedErrorLoggingEnabled": false,
-                              "publishingUsername": "[variables('publishingUsername')]",
-                              "scmType": "None",
-                              "use32BitWorkerProcess": true,
-                              "webSocketsEnabled": false,
-                              "alwaysOn": false,
-                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                              "managedPipelineMode": "Integrated",
-                              "virtualApplications": [
-                                  {
-                                      "virtualPath": "/",
-                                      "physicalPath": "site\\wwwroot",
-                                      "preloadEnabled": false,
-                                      "virtualDirectories": null
-                                  }
-                              ],
-                              "winAuthAdminState": 0,
-                              "winAuthTenantState": 0,
-                              "customAppPoolIdentityAdminState": false,
-                              "customAppPoolIdentityTenantState": false,
-                              "loadBalancing": "LeastRequests",
-                              "routingRules": [],
-                              "experiments": {
-                                  "rampUpRules": []
-                              },
-                              "autoHealEnabled": false,
-                              "vnetName": "",
-                              "minTlsVersion": "1.2",
-                              "ftpsState": "AllAllowed",
-                              "reservedInstanceCount": 0
-                          }
-                        },
-                        {
-                            "apiVersion": "2017-12-01",
-                            "type": "Microsoft.BotService/botServices",
-                            "name": "[parameters('botId')]",
-                            "location": "global",
-                            "kind": "bot",
-                            "sku": {
-                                "name": "[parameters('botSku')]"
-                            },
-                            "properties": {
-                                "name": "[parameters('botId')]",
-                                "displayName": "[parameters('botId')]",
-                                "endpoint": "[variables('botEndpoint')]",
-                                "msaAppId": "[parameters('appId')]",
-                                "developerAppInsightsApplicationId": null,
-                                "developerAppInsightKey": null,
-                                "publishingCredentials": null,
-                                "storageResourceId": null
-                            },
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-                            ]
-                        }
-                    ],
-                    "outputs": {}
-                }
-            }
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "groupLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the location of the Resource Group."
+            }
+        },
+        "groupName": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the name of the Resource Group."
+            }
+        },
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "metadata": {
+                "description": "The name of the App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "newAppServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan. Defaults to \"westus\"."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "appServicePlanName": "[parameters('newAppServicePlanName')]",
+        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
+    },
+    "resources": [
+        {
+            "name": "[parameters('groupName')]",
+            "type": "Microsoft.Resources/resourceGroups",
+            "apiVersion": "2018-05-01",
+            "location": "[parameters('groupLocation')]",
+            "properties": {
+            }
+        },
+        {
+            "type": "Microsoft.Resources/deployments",
+            "apiVersion": "2018-05-01",
+            "name": "storageDeployment",
+            "resourceGroup": "[parameters('groupName')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
+            ],
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "parameters": {},
+                    "variables": {},
+                    "resources": [
+                        {
+                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+                            "type": "Microsoft.Web/serverfarms",
+                            "name": "[variables('appServicePlanName')]",
+                            "apiVersion": "2018-02-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "sku": "[parameters('newAppServicePlanSku')]",
+                            "kind": "linux",
+                            "properties": {
+                                "name": "[variables('appServicePlanName')]",
+                                "perSiteScaling": false,
+                                "reserved": true,
+                                "targetWorkerCount": 0,
+                                "targetWorkerSizeId": 0
+                            }
+                        },
+                        {
+                            "comments": "Create a Web App using a Linux App Service Plan",
+                            "type": "Microsoft.Web/sites",
+                            "apiVersion": "2015-08-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "kind": "app,linux",
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
+                            ],
+                            "name": "[variables('webAppName')]",
+                            "properties": {
+                                "name": "[variables('webAppName')]",
+                                "hostNameSslStates": [
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Standard"
+                                    },
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Repository"
+                                    }
+                                ],
+                                "serverFarmId": "[variables('appServicePlanName')]",
+                                "siteConfig": {
+                                    "appSettings": [
+                                        {
+                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                                            "value": "true"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppId",
+                                            "value": "[parameters('appId')]"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppPassword",
+                                            "value": "[parameters('appSecret')]"
+                                        }
+                                    ],
+                                    "cors": {
+                                        "allowedOrigins": [
+                                            "https://botservice.hosting.portal.azure.net",
+                                            "https://hosting.onecloud.azure-test.net/"
+                                        ]
+                                    }
+                                }
+                            }
+                        },
+                        {
+                          "type": "Microsoft.Web/sites/config",
+                          "apiVersion": "2016-08-01",
+                          "name": "[concat(variables('webAppName'), '/web')]",
+                          "location": "[variables('resourcesLocation')]",
+                          "dependsOn": [
+                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+                          ],
+                          "properties": {
+                              "numberOfWorkers": 1,
+                              "defaultDocuments": [
+                                  "Default.htm",
+                                  "Default.html",
+                                  "Default.asp",
+                                  "index.htm",
+                                  "index.html",
+                                  "iisstart.htm",
+                                  "default.aspx",
+                                  "index.php",
+                                  "hostingstart.html"
+                              ],
+                              "netFrameworkVersion": "v4.0",
+                              "phpVersion": "",
+                              "pythonVersion": "",
+                              "nodeVersion": "",
+                              "linuxFxVersion": "PYTHON|3.7",
+                              "requestTracingEnabled": false,
+                              "remoteDebuggingEnabled": false,
+                              "remoteDebuggingVersion": "VS2017",
+                              "httpLoggingEnabled": true,
+                              "logsDirectorySizeLimit": 35,
+                              "detailedErrorLoggingEnabled": false,
+                              "publishingUsername": "[variables('publishingUsername')]",
+                              "scmType": "None",
+                              "use32BitWorkerProcess": true,
+                              "webSocketsEnabled": false,
+                              "alwaysOn": false,
+                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                              "managedPipelineMode": "Integrated",
+                              "virtualApplications": [
+                                  {
+                                      "virtualPath": "/",
+                                      "physicalPath": "site\\wwwroot",
+                                      "preloadEnabled": false,
+                                      "virtualDirectories": null
+                                  }
+                              ],
+                              "winAuthAdminState": 0,
+                              "winAuthTenantState": 0,
+                              "customAppPoolIdentityAdminState": false,
+                              "customAppPoolIdentityTenantState": false,
+                              "loadBalancing": "LeastRequests",
+                              "routingRules": [],
+                              "experiments": {
+                                  "rampUpRules": []
+                              },
+                              "autoHealEnabled": false,
+                              "vnetName": "",
+                              "minTlsVersion": "1.2",
+                              "ftpsState": "AllAllowed",
+                              "reservedInstanceCount": 0
+                          }
+                        },
+                        {
+                            "apiVersion": "2017-12-01",
+                            "type": "Microsoft.BotService/botServices",
+                            "name": "[parameters('botId')]",
+                            "location": "global",
+                            "kind": "bot",
+                            "sku": {
+                                "name": "[parameters('botSku')]"
+                            },
+                            "properties": {
+                                "name": "[parameters('botId')]",
+                                "displayName": "[parameters('botId')]",
+                                "endpoint": "[variables('botEndpoint')]",
+                                "msaAppId": "[parameters('appId')]",
+                                "developerAppInsightsApplicationId": null,
+                                "developerAppInsightKey": null,
+                                "publishingCredentials": null,
+                                "storageResourceId": null
+                            },
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+                            ]
+                        }
+                    ],
+                    "outputs": {}
+                }
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_quart/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json b/samples/python/wip/python_tornado/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
similarity index 97%
rename from samples/python/python_quart/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
rename to samples/python/wip/python_tornado/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
index 66b044b527..074b789fc2 100644
--- a/samples/python/python_quart/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
+++ b/samples/python/wip/python_tornado/02.echo-bot/deploymentTemplates/template-with-preexisting-rg.json
@@ -1,242 +1,242 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "defaultValue": "F0",
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The name of the new App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "appServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan."
-            }
-        },
-        "existingAppServicePlan": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
-        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
-        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
-        "resourcesLocation": "[parameters('appServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
-    },
-    "resources": [
-        {
-            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-            "type": "Microsoft.Web/serverfarms",
-            "apiVersion": "2016-09-01",
-            "name": "[variables('servicePlanName')]",
-            "location": "[variables('resourcesLocation')]",
-            "sku": "[parameters('newAppServicePlanSku')]",
-            "kind": "linux",
-            "properties": {
-                "name": "[variables('servicePlanName')]",
-                "perSiteScaling": false,
-                "reserved": true,
-                "targetWorkerCount": 0,
-                "targetWorkerSizeId": 0
-            }
-        },
-        {
-            "comments": "Create a Web App using a Linux App Service Plan",
-            "type": "Microsoft.Web/sites",
-            "apiVersion": "2016-08-01",
-            "name": "[variables('webAppName')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
-            ],
-            "kind": "app,linux",
-            "properties": {
-                "enabled": true,
-                "hostNameSslStates": [
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Standard"
-                    },
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Repository"
-                    }
-                ],
-                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
-                "reserved": true,
-                "scmSiteAlsoStopped": false,
-                "clientAffinityEnabled": false,
-                "clientCertEnabled": false,
-                "hostNamesDisabled": false,
-                "containerSize": 0,
-                "dailyMemoryTimeQuota": 0,
-                "httpsOnly": false,
-                "siteConfig": {
-                    "appSettings": [
-                        {
-                            "name": "MicrosoftAppId",
-                            "value": "[parameters('appId')]"
-                        },
-                        {
-                            "name": "MicrosoftAppPassword",
-                            "value": "[parameters('appSecret')]"
-                        },
-                        {
-                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                            "value": "true"
-                        }
-                    ],
-                    "cors": {
-                        "allowedOrigins": [
-                            "https://botservice.hosting.portal.azure.net",
-                            "https://hosting.onecloud.azure-test.net/"
-                        ]
-                    }
-                }
-            }
-        },
-        {
-            "type": "Microsoft.Web/sites/config",
-            "apiVersion": "2016-08-01",
-            "name": "[concat(variables('webAppName'), '/web')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-            ],
-            "properties": {
-                "numberOfWorkers": 1,
-                "defaultDocuments": [
-                    "Default.htm",
-                    "Default.html",
-                    "Default.asp",
-                    "index.htm",
-                    "index.html",
-                    "iisstart.htm",
-                    "default.aspx",
-                    "index.php",
-                    "hostingstart.html"
-                ],
-                "netFrameworkVersion": "v4.0",
-                "phpVersion": "",
-                "pythonVersion": "",
-                "nodeVersion": "",
-                "linuxFxVersion": "PYTHON|3.7",
-                "requestTracingEnabled": false,
-                "remoteDebuggingEnabled": false,
-                "remoteDebuggingVersion": "VS2017",
-                "httpLoggingEnabled": true,
-                "logsDirectorySizeLimit": 35,
-                "detailedErrorLoggingEnabled": false,
-                "publishingUsername": "[variables('publishingUsername')]",
-                "scmType": "None",
-                "use32BitWorkerProcess": true,
-                "webSocketsEnabled": false,
-                "alwaysOn": false,
-                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                "managedPipelineMode": "Integrated",
-                "virtualApplications": [
-                    {
-                        "virtualPath": "/",
-                        "physicalPath": "site\\wwwroot",
-                        "preloadEnabled": false,
-                        "virtualDirectories": null
-                    }
-                ],
-                "winAuthAdminState": 0,
-                "winAuthTenantState": 0,
-                "customAppPoolIdentityAdminState": false,
-                "customAppPoolIdentityTenantState": false,
-                "loadBalancing": "LeastRequests",
-                "routingRules": [],
-                "experiments": {
-                    "rampUpRules": []
-                },
-                "autoHealEnabled": false,
-                "vnetName": "",
-                "minTlsVersion": "1.2",
-                "ftpsState": "AllAllowed",
-                "reservedInstanceCount": 0
-            }
-        },
-        {
-            "apiVersion": "2017-12-01",
-            "type": "Microsoft.BotService/botServices",
-            "name": "[parameters('botId')]",
-            "location": "global",
-            "kind": "bot",
-            "sku": {
-                "name": "[parameters('botSku')]"
-            },
-            "properties": {
-                "name": "[parameters('botId')]",
-                "displayName": "[parameters('botId')]",
-                "endpoint": "[variables('botEndpoint')]",
-                "msaAppId": "[parameters('appId')]",
-                "developerAppInsightsApplicationId": null,
-                "developerAppInsightKey": null,
-                "publishingCredentials": null,
-                "storageResourceId": null
-            },
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-            ]
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "defaultValue": "F0",
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The name of the new App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "appServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan."
+            }
+        },
+        "existingAppServicePlan": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
+        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
+        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
+        "resourcesLocation": "[parameters('appServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
+    },
+    "resources": [
+        {
+            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+            "type": "Microsoft.Web/serverfarms",
+            "apiVersion": "2016-09-01",
+            "name": "[variables('servicePlanName')]",
+            "location": "[variables('resourcesLocation')]",
+            "sku": "[parameters('newAppServicePlanSku')]",
+            "kind": "linux",
+            "properties": {
+                "name": "[variables('servicePlanName')]",
+                "perSiteScaling": false,
+                "reserved": true,
+                "targetWorkerCount": 0,
+                "targetWorkerSizeId": 0
+            }
+        },
+        {
+            "comments": "Create a Web App using a Linux App Service Plan",
+            "type": "Microsoft.Web/sites",
+            "apiVersion": "2016-08-01",
+            "name": "[variables('webAppName')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
+            ],
+            "kind": "app,linux",
+            "properties": {
+                "enabled": true,
+                "hostNameSslStates": [
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Standard"
+                    },
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Repository"
+                    }
+                ],
+                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
+                "reserved": true,
+                "scmSiteAlsoStopped": false,
+                "clientAffinityEnabled": false,
+                "clientCertEnabled": false,
+                "hostNamesDisabled": false,
+                "containerSize": 0,
+                "dailyMemoryTimeQuota": 0,
+                "httpsOnly": false,
+                "siteConfig": {
+                    "appSettings": [
+                        {
+                            "name": "MicrosoftAppId",
+                            "value": "[parameters('appId')]"
+                        },
+                        {
+                            "name": "MicrosoftAppPassword",
+                            "value": "[parameters('appSecret')]"
+                        },
+                        {
+                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                            "value": "true"
+                        }
+                    ],
+                    "cors": {
+                        "allowedOrigins": [
+                            "https://botservice.hosting.portal.azure.net",
+                            "https://hosting.onecloud.azure-test.net/"
+                        ]
+                    }
+                }
+            }
+        },
+        {
+            "type": "Microsoft.Web/sites/config",
+            "apiVersion": "2016-08-01",
+            "name": "[concat(variables('webAppName'), '/web')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+            ],
+            "properties": {
+                "numberOfWorkers": 1,
+                "defaultDocuments": [
+                    "Default.htm",
+                    "Default.html",
+                    "Default.asp",
+                    "index.htm",
+                    "index.html",
+                    "iisstart.htm",
+                    "default.aspx",
+                    "index.php",
+                    "hostingstart.html"
+                ],
+                "netFrameworkVersion": "v4.0",
+                "phpVersion": "",
+                "pythonVersion": "",
+                "nodeVersion": "",
+                "linuxFxVersion": "PYTHON|3.7",
+                "requestTracingEnabled": false,
+                "remoteDebuggingEnabled": false,
+                "remoteDebuggingVersion": "VS2017",
+                "httpLoggingEnabled": true,
+                "logsDirectorySizeLimit": 35,
+                "detailedErrorLoggingEnabled": false,
+                "publishingUsername": "[variables('publishingUsername')]",
+                "scmType": "None",
+                "use32BitWorkerProcess": true,
+                "webSocketsEnabled": false,
+                "alwaysOn": false,
+                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                "managedPipelineMode": "Integrated",
+                "virtualApplications": [
+                    {
+                        "virtualPath": "/",
+                        "physicalPath": "site\\wwwroot",
+                        "preloadEnabled": false,
+                        "virtualDirectories": null
+                    }
+                ],
+                "winAuthAdminState": 0,
+                "winAuthTenantState": 0,
+                "customAppPoolIdentityAdminState": false,
+                "customAppPoolIdentityTenantState": false,
+                "loadBalancing": "LeastRequests",
+                "routingRules": [],
+                "experiments": {
+                    "rampUpRules": []
+                },
+                "autoHealEnabled": false,
+                "vnetName": "",
+                "minTlsVersion": "1.2",
+                "ftpsState": "AllAllowed",
+                "reservedInstanceCount": 0
+            }
+        },
+        {
+            "apiVersion": "2017-12-01",
+            "type": "Microsoft.BotService/botServices",
+            "name": "[parameters('botId')]",
+            "location": "global",
+            "kind": "bot",
+            "sku": {
+                "name": "[parameters('botSku')]"
+            },
+            "properties": {
+                "name": "[parameters('botId')]",
+                "displayName": "[parameters('botId')]",
+                "endpoint": "[variables('botEndpoint')]",
+                "msaAppId": "[parameters('appId')]",
+                "developerAppInsightsApplicationId": null,
+                "developerAppInsightKey": null,
+                "publishingCredentials": null,
+                "storageResourceId": null
+            },
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_tornado/02.echo-bot/requirements.txt b/samples/python/wip/python_tornado/02.echo-bot/requirements.txt
similarity index 100%
rename from samples/python/python_tornado/02.echo-bot/requirements.txt
rename to samples/python/wip/python_tornado/02.echo-bot/requirements.txt
diff --git a/samples/python/python_tornado/13.core-bot/README-LUIS.md b/samples/python/wip/python_tornado/13.core-bot/README-LUIS.md
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/README-LUIS.md
rename to samples/python/wip/python_tornado/13.core-bot/README-LUIS.md
diff --git a/samples/python/python_quart/13.core-bot/README.md b/samples/python/wip/python_tornado/13.core-bot/README.md
similarity index 98%
rename from samples/python/python_quart/13.core-bot/README.md
rename to samples/python/wip/python_tornado/13.core-bot/README.md
index 03d86a0290..914169ac02 100644
--- a/samples/python/python_quart/13.core-bot/README.md
+++ b/samples/python/wip/python_tornado/13.core-bot/README.md
@@ -1,64 +1,64 @@
-# CoreBot
-
-Bot Framework v4 core bot sample.
-
-This bot has been created using [Bot Framework](https://dev.botframework.com), it shows how to:
-
-- Use [LUIS](https://www.luis.ai) to implement core AI capabilities
-- Implement a multi-turn conversation using Dialogs
-- Handle user interruptions for such things as `Help` or `Cancel`
-- Prompt for and validate requests for information from the user
-
-## Prerequisites
-
-This sample **requires** prerequisites in order to run.
-
-### Overview
-
-This bot uses [LUIS](https://www.luis.ai), an AI based cognitive service, to implement language understanding.
-
-### Install Python 3.7
-
-
-### Create a LUIS Application to enable language understanding
-
-LUIS language model setup, training, and application configuration steps can be found [here](https://docs.microsoft.com/azure/bot-service/bot-builder-howto-v4-luis?view=azure-bot-service-4.0&tabs=cs).
-
-If you wish to create a LUIS application via the CLI, these steps can be found in the [README-LUIS.md](README-LUIS.md).
-
-## Running the sample
-- Bring up a terminal, navigate to `botbuilder-samples\samples\python\13.core-bot` folder
-- Activate your desired virtual environment
-- Run `pip install -r requirements.txt` to install all dependencies
-- Update LuisAppId, LuisAPIKey and LuisAPIHostName in `config.py` with the information retrieved from the [LUIS portal](https://www.luis.ai)
-- Run your bot with `python app.py`
-
-
-## Testing the bot using Bot Framework Emulator
-
-[Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel.
-
-- Install the Bot Framework Emulator version 4.3.0 or greater from [here](https://github.com/Microsoft/BotFramework-Emulator/releases)
-
-### Connect to the bot using Bot Framework Emulator
-
-- Launch Bot Framework Emulator
-- Enter a Bot URL of `http://localhost:3978/api/messages`
-
-## Deploy the bot to Azure
-
-To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment) for a complete list of deployment instructions.
-
-# Further reading
-
-- [Bot Framework Documentation](https://docs.botframework.com)
-- [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
-- [Dialogs](https://docs.microsoft.com/azure/bot-service/bot-builder-concept-dialog?view=azure-bot-service-4.0)
-- [Gathering Input Using Prompts](https://docs.microsoft.com/azure/bot-service/bot-builder-prompts?view=azure-bot-service-4.0&tabs=csharp)
-- [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0)
-- [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
-- [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0)
-- [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest)
-- [Azure Portal](https://portal.azure.com)
-- [Language Understanding using LUIS](https://docs.microsoft.com/azure/cognitive-services/luis/)
+# CoreBot
+
+Bot Framework v4 core bot sample.
+
+This bot has been created using [Bot Framework](https://dev.botframework.com), it shows how to:
+
+- Use [LUIS](https://www.luis.ai) to implement core AI capabilities
+- Implement a multi-turn conversation using Dialogs
+- Handle user interruptions for such things as `Help` or `Cancel`
+- Prompt for and validate requests for information from the user
+
+## Prerequisites
+
+This sample **requires** prerequisites in order to run.
+
+### Overview
+
+This bot uses [LUIS](https://www.luis.ai), an AI based cognitive service, to implement language understanding.
+
+### Install Python 3.7
+
+
+### Create a LUIS Application to enable language understanding
+
+LUIS language model setup, training, and application configuration steps can be found [here](https://docs.microsoft.com/azure/bot-service/bot-builder-howto-v4-luis?view=azure-bot-service-4.0&tabs=cs).
+
+If you wish to create a LUIS application via the CLI, these steps can be found in the [README-LUIS.md](README-LUIS.md).
+
+## Running the sample
+- Bring up a terminal, navigate to `botbuilder-samples\samples\python\13.core-bot` folder
+- Activate your desired virtual environment
+- Run `pip install -r requirements.txt` to install all dependencies
+- Update LuisAppId, LuisAPIKey and LuisAPIHostName in `config.py` with the information retrieved from the [LUIS portal](https://www.luis.ai)
+- Run your bot with `python app.py`
+
+
+## Testing the bot using Bot Framework Emulator
+
+[Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel.
+
+- Install the Bot Framework Emulator version 4.3.0 or greater from [here](https://github.com/Microsoft/BotFramework-Emulator/releases)
+
+### Connect to the bot using Bot Framework Emulator
+
+- Launch Bot Framework Emulator
+- Enter a Bot URL of `http://localhost:3978/api/messages`
+
+## Deploy the bot to Azure
+
+To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment) for a complete list of deployment instructions.
+
+# Further reading
+
+- [Bot Framework Documentation](https://docs.botframework.com)
+- [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
+- [Dialogs](https://docs.microsoft.com/azure/bot-service/bot-builder-concept-dialog?view=azure-bot-service-4.0)
+- [Gathering Input Using Prompts](https://docs.microsoft.com/azure/bot-service/bot-builder-prompts?view=azure-bot-service-4.0&tabs=csharp)
+- [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0)
+- [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
+- [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0)
+- [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest)
+- [Azure Portal](https://portal.azure.com)
+- [Language Understanding using LUIS](https://docs.microsoft.com/azure/cognitive-services/luis/)
 - [Channels and Bot Connector Service](https://docs.microsoft.com/azure/bot-service/bot-concepts?view=azure-bot-service-4.0)
\ No newline at end of file
diff --git a/samples/python/python_tornado/13.core-bot/adapter_with_error_handler.py b/samples/python/wip/python_tornado/13.core-bot/adapter_with_error_handler.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/adapter_with_error_handler.py
rename to samples/python/wip/python_tornado/13.core-bot/adapter_with_error_handler.py
diff --git a/samples/python/python_tornado/13.core-bot/app.py b/samples/python/wip/python_tornado/13.core-bot/app.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/app.py
rename to samples/python/wip/python_tornado/13.core-bot/app.py
diff --git a/samples/python/python_tornado/13.core-bot/booking_details.py b/samples/python/wip/python_tornado/13.core-bot/booking_details.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/booking_details.py
rename to samples/python/wip/python_tornado/13.core-bot/booking_details.py
diff --git a/samples/python/python_tornado/13.core-bot/bots/__init__.py b/samples/python/wip/python_tornado/13.core-bot/bots/__init__.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/bots/__init__.py
rename to samples/python/wip/python_tornado/13.core-bot/bots/__init__.py
diff --git a/samples/python/python_tornado/13.core-bot/bots/dialog_and_welcome_bot.py b/samples/python/wip/python_tornado/13.core-bot/bots/dialog_and_welcome_bot.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/bots/dialog_and_welcome_bot.py
rename to samples/python/wip/python_tornado/13.core-bot/bots/dialog_and_welcome_bot.py
diff --git a/samples/python/python_tornado/13.core-bot/bots/dialog_bot.py b/samples/python/wip/python_tornado/13.core-bot/bots/dialog_bot.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/bots/dialog_bot.py
rename to samples/python/wip/python_tornado/13.core-bot/bots/dialog_bot.py
diff --git a/samples/python/python_tornado/13.core-bot/cards/welcomeCard.json b/samples/python/wip/python_tornado/13.core-bot/cards/welcomeCard.json
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/cards/welcomeCard.json
rename to samples/python/wip/python_tornado/13.core-bot/cards/welcomeCard.json
diff --git a/samples/python/python_tornado/13.core-bot/cognitiveModels/FlightBooking.json b/samples/python/wip/python_tornado/13.core-bot/cognitiveModels/FlightBooking.json
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/cognitiveModels/FlightBooking.json
rename to samples/python/wip/python_tornado/13.core-bot/cognitiveModels/FlightBooking.json
diff --git a/samples/python/python_quart/13.core-bot/deploymentTemplates/template-with-new-rg.json b/samples/python/wip/python_tornado/13.core-bot/deploymentTemplates/template-with-new-rg.json
similarity index 97%
rename from samples/python/python_quart/13.core-bot/deploymentTemplates/template-with-new-rg.json
rename to samples/python/wip/python_tornado/13.core-bot/deploymentTemplates/template-with-new-rg.json
index b68e51ec60..76ac1be517 100644
--- a/samples/python/python_quart/13.core-bot/deploymentTemplates/template-with-new-rg.json
+++ b/samples/python/wip/python_tornado/13.core-bot/deploymentTemplates/template-with-new-rg.json
@@ -1,264 +1,264 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "groupLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the location of the Resource Group."
-            }
-        },
-        "groupName": {
-            "type": "string",
-            "metadata": {
-                "description": "Specifies the name of the Resource Group."
-            }
-        },
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "metadata": {
-                "description": "The name of the App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "newAppServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan. Defaults to \"westus\"."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "appServicePlanName": "[parameters('newAppServicePlanName')]",
-        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
-    },
-    "resources": [
-        {
-            "name": "[parameters('groupName')]",
-            "type": "Microsoft.Resources/resourceGroups",
-            "apiVersion": "2018-05-01",
-            "location": "[parameters('groupLocation')]",
-            "properties": {
-            }
-        },
-        {
-            "type": "Microsoft.Resources/deployments",
-            "apiVersion": "2018-05-01",
-            "name": "storageDeployment",
-            "resourceGroup": "[parameters('groupName')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
-            ],
-            "properties": {
-                "mode": "Incremental",
-                "template": {
-                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-                    "contentVersion": "1.0.0.0",
-                    "parameters": {},
-                    "variables": {},
-                    "resources": [
-                        {
-                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-                            "type": "Microsoft.Web/serverfarms",
-                            "name": "[variables('appServicePlanName')]",
-                            "apiVersion": "2018-02-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "sku": "[parameters('newAppServicePlanSku')]",
-                            "kind": "linux",
-                            "properties": {
-                                "name": "[variables('appServicePlanName')]",
-                                "perSiteScaling": false,
-                                "reserved": true,
-                                "targetWorkerCount": 0,
-                                "targetWorkerSizeId": 0
-                            }
-                        },
-                        {
-                            "comments": "Create a Web App using a Linux App Service Plan",
-                            "type": "Microsoft.Web/sites",
-                            "apiVersion": "2015-08-01",
-                            "location": "[variables('resourcesLocation')]",
-                            "kind": "app,linux",
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
-                            ],
-                            "name": "[variables('webAppName')]",
-                            "properties": {
-                                "name": "[variables('webAppName')]",
-                                "hostNameSslStates": [
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Standard"
-                                    },
-                                    {
-                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                                        "sslState": "Disabled",
-                                        "hostType": "Repository"
-                                    }
-                                ],
-                                "serverFarmId": "[variables('appServicePlanName')]",
-                                "siteConfig": {
-                                    "appSettings": [
-                                        {
-                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                                            "value": "true"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppId",
-                                            "value": "[parameters('appId')]"
-                                        },
-                                        {
-                                            "name": "MicrosoftAppPassword",
-                                            "value": "[parameters('appSecret')]"
-                                        }
-                                    ],
-                                    "cors": {
-                                        "allowedOrigins": [
-                                            "https://botservice.hosting.portal.azure.net",
-                                            "https://hosting.onecloud.azure-test.net/"
-                                        ]
-                                    }
-                                }
-                            }
-                        },
-                        {
-                          "type": "Microsoft.Web/sites/config",
-                          "apiVersion": "2016-08-01",
-                          "name": "[concat(variables('webAppName'), '/web')]",
-                          "location": "[variables('resourcesLocation')]",
-                          "dependsOn": [
-                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-                          ],
-                          "properties": {
-                              "numberOfWorkers": 1,
-                              "defaultDocuments": [
-                                  "Default.htm",
-                                  "Default.html",
-                                  "Default.asp",
-                                  "index.htm",
-                                  "index.html",
-                                  "iisstart.htm",
-                                  "default.aspx",
-                                  "index.php",
-                                  "hostingstart.html"
-                              ],
-                              "netFrameworkVersion": "v4.0",
-                              "phpVersion": "",
-                              "pythonVersion": "",
-                              "nodeVersion": "",
-                              "linuxFxVersion": "PYTHON|3.7",
-                              "requestTracingEnabled": false,
-                              "remoteDebuggingEnabled": false,
-                              "remoteDebuggingVersion": "VS2017",
-                              "httpLoggingEnabled": true,
-                              "logsDirectorySizeLimit": 35,
-                              "detailedErrorLoggingEnabled": false,
-                              "publishingUsername": "[variables('publishingUsername')]",
-                              "scmType": "None",
-                              "use32BitWorkerProcess": true,
-                              "webSocketsEnabled": false,
-                              "alwaysOn": false,
-                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                              "managedPipelineMode": "Integrated",
-                              "virtualApplications": [
-                                  {
-                                      "virtualPath": "/",
-                                      "physicalPath": "site\\wwwroot",
-                                      "preloadEnabled": false,
-                                      "virtualDirectories": null
-                                  }
-                              ],
-                              "winAuthAdminState": 0,
-                              "winAuthTenantState": 0,
-                              "customAppPoolIdentityAdminState": false,
-                              "customAppPoolIdentityTenantState": false,
-                              "loadBalancing": "LeastRequests",
-                              "routingRules": [],
-                              "experiments": {
-                                  "rampUpRules": []
-                              },
-                              "autoHealEnabled": false,
-                              "vnetName": "",
-                              "minTlsVersion": "1.2",
-                              "ftpsState": "AllAllowed",
-                              "reservedInstanceCount": 0
-                          }
-                        },
-                        {
-                            "apiVersion": "2017-12-01",
-                            "type": "Microsoft.BotService/botServices",
-                            "name": "[parameters('botId')]",
-                            "location": "global",
-                            "kind": "bot",
-                            "sku": {
-                                "name": "[parameters('botSku')]"
-                            },
-                            "properties": {
-                                "name": "[parameters('botId')]",
-                                "displayName": "[parameters('botId')]",
-                                "endpoint": "[variables('botEndpoint')]",
-                                "msaAppId": "[parameters('appId')]",
-                                "developerAppInsightsApplicationId": null,
-                                "developerAppInsightKey": null,
-                                "publishingCredentials": null,
-                                "storageResourceId": null
-                            },
-                            "dependsOn": [
-                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-                            ]
-                        }
-                    ],
-                    "outputs": {}
-                }
-            }
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "groupLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the location of the Resource Group."
+            }
+        },
+        "groupName": {
+            "type": "string",
+            "metadata": {
+                "description": "Specifies the name of the Resource Group."
+            }
+        },
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "metadata": {
+                "description": "The name of the App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "newAppServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan. Defaults to \"westus\"."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "appServicePlanName": "[parameters('newAppServicePlanName')]",
+        "resourcesLocation": "[parameters('newAppServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]"
+    },
+    "resources": [
+        {
+            "name": "[parameters('groupName')]",
+            "type": "Microsoft.Resources/resourceGroups",
+            "apiVersion": "2018-05-01",
+            "location": "[parameters('groupLocation')]",
+            "properties": {
+            }
+        },
+        {
+            "type": "Microsoft.Resources/deployments",
+            "apiVersion": "2018-05-01",
+            "name": "storageDeployment",
+            "resourceGroup": "[parameters('groupName')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Resources/resourceGroups/', parameters('groupName'))]"
+            ],
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "parameters": {},
+                    "variables": {},
+                    "resources": [
+                        {
+                            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+                            "type": "Microsoft.Web/serverfarms",
+                            "name": "[variables('appServicePlanName')]",
+                            "apiVersion": "2018-02-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "sku": "[parameters('newAppServicePlanSku')]",
+                            "kind": "linux",
+                            "properties": {
+                                "name": "[variables('appServicePlanName')]",
+                                "perSiteScaling": false,
+                                "reserved": true,
+                                "targetWorkerCount": 0,
+                                "targetWorkerSizeId": 0
+                            }
+                        },
+                        {
+                            "comments": "Create a Web App using a Linux App Service Plan",
+                            "type": "Microsoft.Web/sites",
+                            "apiVersion": "2015-08-01",
+                            "location": "[variables('resourcesLocation')]",
+                            "kind": "app,linux",
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
+                            ],
+                            "name": "[variables('webAppName')]",
+                            "properties": {
+                                "name": "[variables('webAppName')]",
+                                "hostNameSslStates": [
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Standard"
+                                    },
+                                    {
+                                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                                        "sslState": "Disabled",
+                                        "hostType": "Repository"
+                                    }
+                                ],
+                                "serverFarmId": "[variables('appServicePlanName')]",
+                                "siteConfig": {
+                                    "appSettings": [
+                                        {
+                                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                                            "value": "true"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppId",
+                                            "value": "[parameters('appId')]"
+                                        },
+                                        {
+                                            "name": "MicrosoftAppPassword",
+                                            "value": "[parameters('appSecret')]"
+                                        }
+                                    ],
+                                    "cors": {
+                                        "allowedOrigins": [
+                                            "https://botservice.hosting.portal.azure.net",
+                                            "https://hosting.onecloud.azure-test.net/"
+                                        ]
+                                    }
+                                }
+                            }
+                        },
+                        {
+                          "type": "Microsoft.Web/sites/config",
+                          "apiVersion": "2016-08-01",
+                          "name": "[concat(variables('webAppName'), '/web')]",
+                          "location": "[variables('resourcesLocation')]",
+                          "dependsOn": [
+                              "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+                          ],
+                          "properties": {
+                              "numberOfWorkers": 1,
+                              "defaultDocuments": [
+                                  "Default.htm",
+                                  "Default.html",
+                                  "Default.asp",
+                                  "index.htm",
+                                  "index.html",
+                                  "iisstart.htm",
+                                  "default.aspx",
+                                  "index.php",
+                                  "hostingstart.html"
+                              ],
+                              "netFrameworkVersion": "v4.0",
+                              "phpVersion": "",
+                              "pythonVersion": "",
+                              "nodeVersion": "",
+                              "linuxFxVersion": "PYTHON|3.7",
+                              "requestTracingEnabled": false,
+                              "remoteDebuggingEnabled": false,
+                              "remoteDebuggingVersion": "VS2017",
+                              "httpLoggingEnabled": true,
+                              "logsDirectorySizeLimit": 35,
+                              "detailedErrorLoggingEnabled": false,
+                              "publishingUsername": "[variables('publishingUsername')]",
+                              "scmType": "None",
+                              "use32BitWorkerProcess": true,
+                              "webSocketsEnabled": false,
+                              "alwaysOn": false,
+                              "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                              "managedPipelineMode": "Integrated",
+                              "virtualApplications": [
+                                  {
+                                      "virtualPath": "/",
+                                      "physicalPath": "site\\wwwroot",
+                                      "preloadEnabled": false,
+                                      "virtualDirectories": null
+                                  }
+                              ],
+                              "winAuthAdminState": 0,
+                              "winAuthTenantState": 0,
+                              "customAppPoolIdentityAdminState": false,
+                              "customAppPoolIdentityTenantState": false,
+                              "loadBalancing": "LeastRequests",
+                              "routingRules": [],
+                              "experiments": {
+                                  "rampUpRules": []
+                              },
+                              "autoHealEnabled": false,
+                              "vnetName": "",
+                              "minTlsVersion": "1.2",
+                              "ftpsState": "AllAllowed",
+                              "reservedInstanceCount": 0
+                          }
+                        },
+                        {
+                            "apiVersion": "2017-12-01",
+                            "type": "Microsoft.BotService/botServices",
+                            "name": "[parameters('botId')]",
+                            "location": "global",
+                            "kind": "bot",
+                            "sku": {
+                                "name": "[parameters('botSku')]"
+                            },
+                            "properties": {
+                                "name": "[parameters('botId')]",
+                                "displayName": "[parameters('botId')]",
+                                "endpoint": "[variables('botEndpoint')]",
+                                "msaAppId": "[parameters('appId')]",
+                                "developerAppInsightsApplicationId": null,
+                                "developerAppInsightKey": null,
+                                "publishingCredentials": null,
+                                "storageResourceId": null
+                            },
+                            "dependsOn": [
+                                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+                            ]
+                        }
+                    ],
+                    "outputs": {}
+                }
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_tornado/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json b/samples/python/wip/python_tornado/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
similarity index 97%
rename from samples/python/python_tornado/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
rename to samples/python/wip/python_tornado/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
index 66b044b527..074b789fc2 100644
--- a/samples/python/python_tornado/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
+++ b/samples/python/wip/python_tornado/13.core-bot/deploymentTemplates/template-with-preexisting-rg.json
@@ -1,242 +1,242 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "appId": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
-            }
-        },
-        "appSecret": {
-            "type": "string",
-            "metadata": {
-                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
-            }
-        },
-        "botId": {
-            "type": "string",
-            "metadata": {
-                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
-            }
-        },
-        "botSku": {
-            "defaultValue": "F0",
-            "type": "string",
-            "metadata": {
-                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
-            }
-        },
-        "newAppServicePlanName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The name of the new App Service Plan."
-            }
-        },
-        "newAppServicePlanSku": {
-            "type": "object",
-            "defaultValue": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            },
-            "metadata": {
-                "description": "The SKU of the App Service Plan. Defaults to Standard values."
-            }
-        },
-        "appServicePlanLocation": {
-            "type": "string",
-            "metadata": {
-                "description": "The location of the App Service Plan."
-            }
-        },
-        "existingAppServicePlan": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
-            }
-        },
-        "newWebAppName": {
-            "type": "string",
-            "defaultValue": "",
-            "metadata": {
-                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
-            }
-        }
-    },
-    "variables": {
-        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
-        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
-        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
-        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
-        "resourcesLocation": "[parameters('appServicePlanLocation')]",
-        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
-        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
-        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
-    },
-    "resources": [
-        {
-            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
-            "type": "Microsoft.Web/serverfarms",
-            "apiVersion": "2016-09-01",
-            "name": "[variables('servicePlanName')]",
-            "location": "[variables('resourcesLocation')]",
-            "sku": "[parameters('newAppServicePlanSku')]",
-            "kind": "linux",
-            "properties": {
-                "name": "[variables('servicePlanName')]",
-                "perSiteScaling": false,
-                "reserved": true,
-                "targetWorkerCount": 0,
-                "targetWorkerSizeId": 0
-            }
-        },
-        {
-            "comments": "Create a Web App using a Linux App Service Plan",
-            "type": "Microsoft.Web/sites",
-            "apiVersion": "2016-08-01",
-            "name": "[variables('webAppName')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
-            ],
-            "kind": "app,linux",
-            "properties": {
-                "enabled": true,
-                "hostNameSslStates": [
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Standard"
-                    },
-                    {
-                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
-                        "sslState": "Disabled",
-                        "hostType": "Repository"
-                    }
-                ],
-                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
-                "reserved": true,
-                "scmSiteAlsoStopped": false,
-                "clientAffinityEnabled": false,
-                "clientCertEnabled": false,
-                "hostNamesDisabled": false,
-                "containerSize": 0,
-                "dailyMemoryTimeQuota": 0,
-                "httpsOnly": false,
-                "siteConfig": {
-                    "appSettings": [
-                        {
-                            "name": "MicrosoftAppId",
-                            "value": "[parameters('appId')]"
-                        },
-                        {
-                            "name": "MicrosoftAppPassword",
-                            "value": "[parameters('appSecret')]"
-                        },
-                        {
-                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
-                            "value": "true"
-                        }
-                    ],
-                    "cors": {
-                        "allowedOrigins": [
-                            "https://botservice.hosting.portal.azure.net",
-                            "https://hosting.onecloud.azure-test.net/"
-                        ]
-                    }
-                }
-            }
-        },
-        {
-            "type": "Microsoft.Web/sites/config",
-            "apiVersion": "2016-08-01",
-            "name": "[concat(variables('webAppName'), '/web')]",
-            "location": "[variables('resourcesLocation')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
-            ],
-            "properties": {
-                "numberOfWorkers": 1,
-                "defaultDocuments": [
-                    "Default.htm",
-                    "Default.html",
-                    "Default.asp",
-                    "index.htm",
-                    "index.html",
-                    "iisstart.htm",
-                    "default.aspx",
-                    "index.php",
-                    "hostingstart.html"
-                ],
-                "netFrameworkVersion": "v4.0",
-                "phpVersion": "",
-                "pythonVersion": "",
-                "nodeVersion": "",
-                "linuxFxVersion": "PYTHON|3.7",
-                "requestTracingEnabled": false,
-                "remoteDebuggingEnabled": false,
-                "remoteDebuggingVersion": "VS2017",
-                "httpLoggingEnabled": true,
-                "logsDirectorySizeLimit": 35,
-                "detailedErrorLoggingEnabled": false,
-                "publishingUsername": "[variables('publishingUsername')]",
-                "scmType": "None",
-                "use32BitWorkerProcess": true,
-                "webSocketsEnabled": false,
-                "alwaysOn": false,
-                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
-                "managedPipelineMode": "Integrated",
-                "virtualApplications": [
-                    {
-                        "virtualPath": "/",
-                        "physicalPath": "site\\wwwroot",
-                        "preloadEnabled": false,
-                        "virtualDirectories": null
-                    }
-                ],
-                "winAuthAdminState": 0,
-                "winAuthTenantState": 0,
-                "customAppPoolIdentityAdminState": false,
-                "customAppPoolIdentityTenantState": false,
-                "loadBalancing": "LeastRequests",
-                "routingRules": [],
-                "experiments": {
-                    "rampUpRules": []
-                },
-                "autoHealEnabled": false,
-                "vnetName": "",
-                "minTlsVersion": "1.2",
-                "ftpsState": "AllAllowed",
-                "reservedInstanceCount": 0
-            }
-        },
-        {
-            "apiVersion": "2017-12-01",
-            "type": "Microsoft.BotService/botServices",
-            "name": "[parameters('botId')]",
-            "location": "global",
-            "kind": "bot",
-            "sku": {
-                "name": "[parameters('botSku')]"
-            },
-            "properties": {
-                "name": "[parameters('botId')]",
-                "displayName": "[parameters('botId')]",
-                "endpoint": "[variables('botEndpoint')]",
-                "msaAppId": "[parameters('appId')]",
-                "developerAppInsightsApplicationId": null,
-                "developerAppInsightKey": null,
-                "publishingCredentials": null,
-                "storageResourceId": null
-            },
-            "dependsOn": [
-                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
-            ]
-        }
-    ]
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "appId": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App ID, set as MicrosoftAppId in the Web App's Application Settings."
+            }
+        },
+        "appSecret": {
+            "type": "string",
+            "metadata": {
+                "description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings."
+            }
+        },
+        "botId": {
+            "type": "string",
+            "metadata": {
+                "description": "The globally unique and immutable bot ID. Also used to configure the displayName of the bot, which is mutable."
+            }
+        },
+        "botSku": {
+            "defaultValue": "F0",
+            "type": "string",
+            "metadata": {
+                "description": "The pricing tier of the Bot Service Registration. Acceptable values are F0 and S1."
+            }
+        },
+        "newAppServicePlanName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The name of the new App Service Plan."
+            }
+        },
+        "newAppServicePlanSku": {
+            "type": "object",
+            "defaultValue": {
+                "name": "S1",
+                "tier": "Standard",
+                "size": "S1",
+                "family": "S",
+                "capacity": 1
+            },
+            "metadata": {
+                "description": "The SKU of the App Service Plan. Defaults to Standard values."
+            }
+        },
+        "appServicePlanLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The location of the App Service Plan."
+            }
+        },
+        "existingAppServicePlan": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "Name of the existing App Service Plan used to create the Web App for the bot."
+            }
+        },
+        "newWebAppName": {
+            "type": "string",
+            "defaultValue": "",
+            "metadata": {
+                "description": "The globally unique name of the Web App. Defaults to the value passed in for \"botId\"."
+            }
+        }
+    },
+    "variables": {
+        "defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlan')), 'createNewAppServicePlan', parameters('existingAppServicePlan'))]",
+        "useExistingAppServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
+        "servicePlanName": "[if(variables('useExistingAppServicePlan'), parameters('existingAppServicePlan'), parameters('newAppServicePlanName'))]",
+        "publishingUsername": "[concat('$', parameters('newWebAppName'))]",
+        "resourcesLocation": "[parameters('appServicePlanLocation')]",
+        "webAppName": "[if(empty(parameters('newWebAppName')), parameters('botId'), parameters('newWebAppName'))]",
+        "siteHost": "[concat(variables('webAppName'), '.azurewebsites.net')]",
+        "botEndpoint": "[concat('https://', variables('siteHost'), '/api/messages')]"
+    },
+    "resources": [
+        {
+            "comments": "Create a new Linux App Service Plan if no existing App Service Plan name was passed in.",
+            "type": "Microsoft.Web/serverfarms",
+            "apiVersion": "2016-09-01",
+            "name": "[variables('servicePlanName')]",
+            "location": "[variables('resourcesLocation')]",
+            "sku": "[parameters('newAppServicePlanSku')]",
+            "kind": "linux",
+            "properties": {
+                "name": "[variables('servicePlanName')]",
+                "perSiteScaling": false,
+                "reserved": true,
+                "targetWorkerCount": 0,
+                "targetWorkerSizeId": 0
+            }
+        },
+        {
+            "comments": "Create a Web App using a Linux App Service Plan",
+            "type": "Microsoft.Web/sites",
+            "apiVersion": "2016-08-01",
+            "name": "[variables('webAppName')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/serverfarms/', variables('servicePlanName'))]"
+            ],
+            "kind": "app,linux",
+            "properties": {
+                "enabled": true,
+                "hostNameSslStates": [
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Standard"
+                    },
+                    {
+                        "name": "[concat(parameters('newWebAppName'), '.scm.azurewebsites.net')]",
+                        "sslState": "Disabled",
+                        "hostType": "Repository"
+                    }
+                ],
+                "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
+                "reserved": true,
+                "scmSiteAlsoStopped": false,
+                "clientAffinityEnabled": false,
+                "clientCertEnabled": false,
+                "hostNamesDisabled": false,
+                "containerSize": 0,
+                "dailyMemoryTimeQuota": 0,
+                "httpsOnly": false,
+                "siteConfig": {
+                    "appSettings": [
+                        {
+                            "name": "MicrosoftAppId",
+                            "value": "[parameters('appId')]"
+                        },
+                        {
+                            "name": "MicrosoftAppPassword",
+                            "value": "[parameters('appSecret')]"
+                        },
+                        {
+                            "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
+                            "value": "true"
+                        }
+                    ],
+                    "cors": {
+                        "allowedOrigins": [
+                            "https://botservice.hosting.portal.azure.net",
+                            "https://hosting.onecloud.azure-test.net/"
+                        ]
+                    }
+                }
+            }
+        },
+        {
+            "type": "Microsoft.Web/sites/config",
+            "apiVersion": "2016-08-01",
+            "name": "[concat(variables('webAppName'), '/web')]",
+            "location": "[variables('resourcesLocation')]",
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites', variables('webAppName'))]"
+            ],
+            "properties": {
+                "numberOfWorkers": 1,
+                "defaultDocuments": [
+                    "Default.htm",
+                    "Default.html",
+                    "Default.asp",
+                    "index.htm",
+                    "index.html",
+                    "iisstart.htm",
+                    "default.aspx",
+                    "index.php",
+                    "hostingstart.html"
+                ],
+                "netFrameworkVersion": "v4.0",
+                "phpVersion": "",
+                "pythonVersion": "",
+                "nodeVersion": "",
+                "linuxFxVersion": "PYTHON|3.7",
+                "requestTracingEnabled": false,
+                "remoteDebuggingEnabled": false,
+                "remoteDebuggingVersion": "VS2017",
+                "httpLoggingEnabled": true,
+                "logsDirectorySizeLimit": 35,
+                "detailedErrorLoggingEnabled": false,
+                "publishingUsername": "[variables('publishingUsername')]",
+                "scmType": "None",
+                "use32BitWorkerProcess": true,
+                "webSocketsEnabled": false,
+                "alwaysOn": false,
+                "appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
+                "managedPipelineMode": "Integrated",
+                "virtualApplications": [
+                    {
+                        "virtualPath": "/",
+                        "physicalPath": "site\\wwwroot",
+                        "preloadEnabled": false,
+                        "virtualDirectories": null
+                    }
+                ],
+                "winAuthAdminState": 0,
+                "winAuthTenantState": 0,
+                "customAppPoolIdentityAdminState": false,
+                "customAppPoolIdentityTenantState": false,
+                "loadBalancing": "LeastRequests",
+                "routingRules": [],
+                "experiments": {
+                    "rampUpRules": []
+                },
+                "autoHealEnabled": false,
+                "vnetName": "",
+                "minTlsVersion": "1.2",
+                "ftpsState": "AllAllowed",
+                "reservedInstanceCount": 0
+            }
+        },
+        {
+            "apiVersion": "2017-12-01",
+            "type": "Microsoft.BotService/botServices",
+            "name": "[parameters('botId')]",
+            "location": "global",
+            "kind": "bot",
+            "sku": {
+                "name": "[parameters('botSku')]"
+            },
+            "properties": {
+                "name": "[parameters('botId')]",
+                "displayName": "[parameters('botId')]",
+                "endpoint": "[variables('botEndpoint')]",
+                "msaAppId": "[parameters('appId')]",
+                "developerAppInsightsApplicationId": null,
+                "developerAppInsightKey": null,
+                "publishingCredentials": null,
+                "storageResourceId": null
+            },
+            "dependsOn": [
+                "[resourceId('Microsoft.Web/sites/', variables('webAppName'))]"
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/samples/python/python_tornado/13.core-bot/dialogs/__init__.py b/samples/python/wip/python_tornado/13.core-bot/dialogs/__init__.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/dialogs/__init__.py
rename to samples/python/wip/python_tornado/13.core-bot/dialogs/__init__.py
diff --git a/samples/python/python_tornado/13.core-bot/dialogs/booking_dialog.py b/samples/python/wip/python_tornado/13.core-bot/dialogs/booking_dialog.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/dialogs/booking_dialog.py
rename to samples/python/wip/python_tornado/13.core-bot/dialogs/booking_dialog.py
diff --git a/samples/python/python_tornado/13.core-bot/dialogs/cancel_and_help_dialog.py b/samples/python/wip/python_tornado/13.core-bot/dialogs/cancel_and_help_dialog.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/dialogs/cancel_and_help_dialog.py
rename to samples/python/wip/python_tornado/13.core-bot/dialogs/cancel_and_help_dialog.py
diff --git a/samples/python/python_tornado/13.core-bot/dialogs/date_resolver_dialog.py b/samples/python/wip/python_tornado/13.core-bot/dialogs/date_resolver_dialog.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/dialogs/date_resolver_dialog.py
rename to samples/python/wip/python_tornado/13.core-bot/dialogs/date_resolver_dialog.py
diff --git a/samples/python/python_tornado/13.core-bot/dialogs/main_dialog.py b/samples/python/wip/python_tornado/13.core-bot/dialogs/main_dialog.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/dialogs/main_dialog.py
rename to samples/python/wip/python_tornado/13.core-bot/dialogs/main_dialog.py
diff --git a/samples/python/python_tornado/13.core-bot/flight_booking_recognizer.py b/samples/python/wip/python_tornado/13.core-bot/flight_booking_recognizer.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/flight_booking_recognizer.py
rename to samples/python/wip/python_tornado/13.core-bot/flight_booking_recognizer.py
diff --git a/samples/python/python_tornado/13.core-bot/helpers/__init__.py b/samples/python/wip/python_tornado/13.core-bot/helpers/__init__.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/helpers/__init__.py
rename to samples/python/wip/python_tornado/13.core-bot/helpers/__init__.py
diff --git a/samples/python/python_tornado/13.core-bot/helpers/activity_helper.py b/samples/python/wip/python_tornado/13.core-bot/helpers/activity_helper.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/helpers/activity_helper.py
rename to samples/python/wip/python_tornado/13.core-bot/helpers/activity_helper.py
diff --git a/samples/python/python_tornado/13.core-bot/helpers/dialog_helper.py b/samples/python/wip/python_tornado/13.core-bot/helpers/dialog_helper.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/helpers/dialog_helper.py
rename to samples/python/wip/python_tornado/13.core-bot/helpers/dialog_helper.py
diff --git a/samples/python/python_tornado/13.core-bot/helpers/luis_helper.py b/samples/python/wip/python_tornado/13.core-bot/helpers/luis_helper.py
similarity index 100%
rename from samples/python/python_tornado/13.core-bot/helpers/luis_helper.py
rename to samples/python/wip/python_tornado/13.core-bot/helpers/luis_helper.py
diff --git a/samples/python/python_tornado/13.core-bot/requirements.txt b/samples/python/wip/python_tornado/13.core-bot/requirements.txt
similarity index 95%
rename from samples/python/python_tornado/13.core-bot/requirements.txt
rename to samples/python/wip/python_tornado/13.core-bot/requirements.txt
index c433484e8d..137b9a316d 100644
--- a/samples/python/python_tornado/13.core-bot/requirements.txt
+++ b/samples/python/wip/python_tornado/13.core-bot/requirements.txt
@@ -1,4 +1,4 @@
-tornado>=6.0.3
-botbuilder-dialogs>=4.8.0
-botbuilder-ai>=4.8.0
-datatypes-date-time>=1.0.0.a2
+tornado>=6.0.3
+botbuilder-dialogs>=4.8.0
+botbuilder-ai>=4.8.0
+datatypes-date-time>=1.0.0.a2