Merge branch 'node-folder-renaming' into folder-renaming

# Conflicts: # README.md
NielsGregers · Sep 22, 2016 · 352986f · 352986f
2 parents 6276adc + 23d3735
commit 352986f
Show file tree

Hide file tree

Showing 160 changed files with 44 additions and 44 deletions.
diff --git a/Node/CarouselCards/.vscode/launch.json → Node/cards-CarouselCards/.vscode/launch.json b/Node/CarouselCards/.vscode/launch.json → Node/cards-CarouselCards/.vscode/launch.json
diff --git a/Node/CarouselCards/README.md → Node/cards-CarouselCards/README.md b/Node/CarouselCards/README.md → Node/cards-CarouselCards/README.md
@@ -4,7 +4,7 @@ A sample bot that sends multiple rich card attachments in a single message using
 
 [![Deploy to Azure][Deploy Button]][Deploy CarouselCards/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy CarouselCards/Node]: https://azuredeploy.net?ptmpl=Node/CarouselCards/azuredeploy.json
+[Deploy CarouselCards/Node]: https://azuredeploy.net
 
 ### Prerequisites
 
@@ -56,4 +56,4 @@ To get more information about how to get started in Bot Builder for Node and Att
 * [Message.attachments](https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.message.html#attachments)
 * [Message.attachmentLayout](https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.message.html#attachmentlayout)
 * [AttachmentLayout](https://docs.botframework.com/en-us/node/builder/chat-reference/modules/_botbuilder_d_.html#attachmentlayout)
-* [RichCards sample](../RichCards)
+* [RichCards sample](../cards-RichCards)
diff --git a/Node/CarouselCards/app.js → Node/cards-CarouselCards/app.js b/Node/CarouselCards/app.js → Node/cards-CarouselCards/app.js
diff --git a/Node/CarouselCards/azuredeploy.json → Node/cards-CarouselCards/azuredeploy.json b/Node/CarouselCards/azuredeploy.json → Node/cards-CarouselCards/azuredeploy.json
diff --git a/...CarouselCards/images/outcome-emulator.png → ...CarouselCards/images/outcome-emulator.png b/...CarouselCards/images/outcome-emulator.png → ...CarouselCards/images/outcome-emulator.png
diff --git a/...CarouselCards/images/outcome-facebook.png → ...CarouselCards/images/outcome-facebook.png b/...CarouselCards/images/outcome-facebook.png → ...CarouselCards/images/outcome-facebook.png
diff --git a/Node/CarouselCards/images/outcome-skype.png → ...ds-CarouselCards/images/outcome-skype.png b/Node/CarouselCards/images/outcome-skype.png → ...ds-CarouselCards/images/outcome-skype.png
diff --git a/Node/CarouselCards/package.json → Node/cards-CarouselCards/package.json b/Node/CarouselCards/package.json → Node/cards-CarouselCards/package.json
diff --git a/Node/ReceiveAttachment/.vscode/launch.json → Node/cards-RichCards/.vscode/launch.json b/Node/ReceiveAttachment/.vscode/launch.json → Node/cards-RichCards/.vscode/launch.json
diff --git a/Node/RichCards/README.md → Node/cards-RichCards/README.md b/Node/RichCards/README.md → Node/cards-RichCards/README.md
@@ -4,7 +4,7 @@ A sample bot to renders several types of cards as attachments.
 
 [![Deploy to Azure][Deploy Button]][Deploy RichCards/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy RichCards/Node]: https://azuredeploy.net?ptmpl=Node/RichCards/azuredeploy.json
+[Deploy RichCards/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/RichCards/app.js → Node/cards-RichCards/app.js b/Node/RichCards/app.js → Node/cards-RichCards/app.js
diff --git a/Node/RichCards/azuredeploy.json → Node/cards-RichCards/azuredeploy.json b/Node/RichCards/azuredeploy.json → Node/cards-RichCards/azuredeploy.json
diff --git a/...ichCards/images/outcome-hero-emulator.png → ...ichCards/images/outcome-hero-emulator.png b/...ichCards/images/outcome-hero-emulator.png → ...ichCards/images/outcome-hero-emulator.png
diff --git a/...ichCards/images/outcome-hero-facebook.png → ...ichCards/images/outcome-hero-facebook.png b/...ichCards/images/outcome-hero-facebook.png → ...ichCards/images/outcome-hero-facebook.png
diff --git a/Node/RichCards/images/outcome-hero-skype.png → ...s-RichCards/images/outcome-hero-skype.png b/Node/RichCards/images/outcome-hero-skype.png → ...s-RichCards/images/outcome-hero-skype.png
diff --git a/...Cards/images/outcome-receipt-emulator.png → ...Cards/images/outcome-receipt-emulator.png b/...Cards/images/outcome-receipt-emulator.png → ...Cards/images/outcome-receipt-emulator.png
diff --git a/...Cards/images/outcome-receipt-facebook.png → ...Cards/images/outcome-receipt-facebook.png b/...Cards/images/outcome-receipt-facebook.png → ...Cards/images/outcome-receipt-facebook.png
diff --git a/...ichCards/images/outcome-receipt-skype.png → ...ichCards/images/outcome-receipt-skype.png b/...ichCards/images/outcome-receipt-skype.png → ...ichCards/images/outcome-receipt-skype.png
diff --git a/...hCards/images/outcome-signin-emulator.png → ...hCards/images/outcome-signin-emulator.png b/...hCards/images/outcome-signin-emulator.png → ...hCards/images/outcome-signin-emulator.png
diff --git a/...hCards/images/outcome-signin-facebook.png → ...hCards/images/outcome-signin-facebook.png b/...hCards/images/outcome-signin-facebook.png → ...hCards/images/outcome-signin-facebook.png
diff --git a/...RichCards/images/outcome-signin-skype.png → ...RichCards/images/outcome-signin-skype.png b/...RichCards/images/outcome-signin-skype.png → ...RichCards/images/outcome-signin-skype.png
diff --git a/...rds/images/outcome-thumbnail-emulator.png → ...rds/images/outcome-thumbnail-emulator.png b/...rds/images/outcome-thumbnail-emulator.png → ...rds/images/outcome-thumbnail-emulator.png
diff --git a/...rds/images/outcome-thumbnail-facebook.png → ...rds/images/outcome-thumbnail-facebook.png b/...rds/images/outcome-thumbnail-facebook.png → ...rds/images/outcome-thumbnail-facebook.png
diff --git a/...hCards/images/outcome-thumbnail-skype.png → ...hCards/images/outcome-thumbnail-skype.png b/...hCards/images/outcome-thumbnail-skype.png → ...hCards/images/outcome-thumbnail-skype.png
diff --git a/Node/RichCards/package.json → Node/cards-RichCards/package.json b/Node/RichCards/package.json → Node/cards-RichCards/package.json
diff --git a/Node/ChannelData/.vscode/launch.json → Node/core-ChannelData/.vscode/launch.json b/Node/ChannelData/.vscode/launch.json → Node/core-ChannelData/.vscode/launch.json
diff --git a/Node/ChannelData/README.md → Node/core-ChannelData/README.md b/Node/ChannelData/README.md → Node/core-ChannelData/README.md
@@ -4,7 +4,7 @@ A sample bot sending native metadata to Facebook using ChannelData.
 
 [![Deploy to Azure][Deploy Button]][Deploy ChannelData/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy ChannelData/Node]: https://azuredeploy.net?ptmpl=Node/ChannelData/azuredeploy.json
+[Deploy ChannelData/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/ChannelData/app.js → Node/core-ChannelData/app.js b/Node/ChannelData/app.js → Node/core-ChannelData/app.js
diff --git a/Node/ChannelData/azuredeploy.json → Node/core-ChannelData/azuredeploy.json b/Node/ChannelData/azuredeploy.json → Node/core-ChannelData/azuredeploy.json
diff --git a/Node/ChannelData/facebook-channeldata.js → .../core-ChannelData/facebook-channeldata.js b/Node/ChannelData/facebook-channeldata.js → .../core-ChannelData/facebook-channeldata.js
diff --git a/Node/ChannelData/images/outcome-emulator.png → ...e-ChannelData/images/outcome-emulator.png b/Node/ChannelData/images/outcome-emulator.png → ...e-ChannelData/images/outcome-emulator.png
diff --git a/Node/ChannelData/images/outcome-facebook.png → ...e-ChannelData/images/outcome-facebook.png b/Node/ChannelData/images/outcome-facebook.png → ...e-ChannelData/images/outcome-facebook.png
diff --git a/Node/ChannelData/package.json → Node/core-ChannelData/package.json b/Node/ChannelData/package.json → Node/core-ChannelData/package.json
diff --git a/...CreateNewConversation/.vscode/launch.json → ...CreateNewConversation/.vscode/launch.json b/...CreateNewConversation/.vscode/launch.json → ...CreateNewConversation/.vscode/launch.json
diff --git a/Node/CreateNewConversation/README.md → Node/core-CreateNewConversation/README.md b/Node/CreateNewConversation/README.md → Node/core-CreateNewConversation/README.md
@@ -4,7 +4,7 @@ A sample bot that starts a new conversation using a previously stored user addre
 
 [![Deploy to Azure][Deploy Button]][Deploy CreateNewConversation/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy CreateNewConversation/Node]: https://azuredeploy.net?ptmpl=Node/CreateNewConversation/azuredeploy.json
+[Deploy CreateNewConversation/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/CreateNewConversation/app.js → Node/core-CreateNewConversation/app.js b/Node/CreateNewConversation/app.js → Node/core-CreateNewConversation/app.js
diff --git a/Node/CreateNewConversation/azuredeploy.json → ...re-CreateNewConversation/azuredeploy.json b/Node/CreateNewConversation/azuredeploy.json → ...re-CreateNewConversation/azuredeploy.json
diff --git a/...wConversation/images/outcome-emulator.png → ...wConversation/images/outcome-emulator.png b/...wConversation/images/outcome-emulator.png → ...wConversation/images/outcome-emulator.png
diff --git a/...eNewConversation/images/outcome-skype.png → ...eNewConversation/images/outcome-skype.png b/...eNewConversation/images/outcome-skype.png → ...eNewConversation/images/outcome-skype.png
diff --git a/Node/CreateNewConversation/package.json → Node/core-CreateNewConversation/package.json b/Node/CreateNewConversation/package.json → Node/core-CreateNewConversation/package.json
diff --git a/...ectLine/DirectLineBot/.vscode/launch.json → ...ectLine/DirectLineBot/.vscode/launch.json b/...ectLine/DirectLineBot/.vscode/launch.json → ...ectLine/DirectLineBot/.vscode/launch.json
diff --git a/Node/DirectLine/DirectLineBot/app.js → Node/core-DirectLine/DirectLineBot/app.js b/Node/DirectLine/DirectLineBot/app.js → Node/core-DirectLine/DirectLineBot/app.js
diff --git a/Node/DirectLine/DirectLineBot/package.json → ...ore-DirectLine/DirectLineBot/package.json b/Node/DirectLine/DirectLineBot/package.json → ...ore-DirectLine/DirectLineBot/package.json
diff --git a/...Line/DirectLineClient/.vscode/launch.json → ...Line/DirectLineClient/.vscode/launch.json b/...Line/DirectLineClient/.vscode/launch.json → ...Line/DirectLineClient/.vscode/launch.json
diff --git a/Node/DirectLine/DirectLineClient/app.js → Node/core-DirectLine/DirectLineClient/app.js b/Node/DirectLine/DirectLineClient/app.js → Node/core-DirectLine/DirectLineClient/app.js
diff --git a/.../DirectLineClient/directline-swagger.json → .../DirectLineClient/directline-swagger.json b/.../DirectLineClient/directline-swagger.json → .../DirectLineClient/directline-swagger.json
diff --git a/.../DirectLine/DirectLineClient/package.json → ...-DirectLine/DirectLineClient/package.json b/.../DirectLine/DirectLineClient/package.json → ...-DirectLine/DirectLineClient/package.json
diff --git a/Node/DirectLine/README.md → Node/core-DirectLine/README.md b/Node/DirectLine/README.md → Node/core-DirectLine/README.md
@@ -4,7 +4,7 @@ A sample bot and a custom client communicating to each other using the Direct Li
 
 [![Deploy to Azure][Deploy Button]][Deploy DirectLine/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy DirectLine/Node]: https://azuredeploy.net?ptmpl=Node/DirectLine/azuredeploy.json
+[Deploy DirectLine/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/DirectLine/azuredeploy.json → Node/core-DirectLine/azuredeploy.json b/Node/DirectLine/azuredeploy.json → Node/core-DirectLine/azuredeploy.json
diff --git a/Node/DirectLine/images/outcome-configure.png → ...e-DirectLine/images/outcome-configure.png b/Node/DirectLine/images/outcome-configure.png → ...e-DirectLine/images/outcome-configure.png
diff --git a/Node/DirectLine/images/outcome.png → Node/core-DirectLine/images/outcome.png b/Node/DirectLine/images/outcome.png → Node/core-DirectLine/images/outcome.png
diff --git a/...etConversationMembers/.vscode/launch.json → ...etConversationMembers/.vscode/launch.json b/...etConversationMembers/.vscode/launch.json → ...etConversationMembers/.vscode/launch.json
diff --git a/Node/GetConversationMembers/README.md → Node/core-GetConversationMembers/README.md b/Node/GetConversationMembers/README.md → Node/core-GetConversationMembers/README.md
@@ -4,7 +4,7 @@ A sample bot that retrieves the conversation's members list and detects when it
 
 [![Deploy to Azure][Deploy Button]][Deploy GetConversationMembers/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy GetConversationMembers/Node]: https://azuredeploy.net?ptmpl=Node/GetConversationMembers/azuredeploy.json
+[Deploy GetConversationMembers/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/GetConversationMembers/app.js → Node/core-GetConversationMembers/app.js b/Node/GetConversationMembers/app.js → Node/core-GetConversationMembers/app.js
diff --git a/Node/GetConversationMembers/azuredeploy.json → ...e-GetConversationMembers/azuredeploy.json b/Node/GetConversationMembers/azuredeploy.json → ...e-GetConversationMembers/azuredeploy.json
diff --git a/...sationMembers/images/outcome-emulator.png → ...sationMembers/images/outcome-emulator.png b/...sationMembers/images/outcome-emulator.png → ...sationMembers/images/outcome-emulator.png
diff --git a/...versationMembers/images/outcome-skype.png → ...versationMembers/images/outcome-skype.png b/...versationMembers/images/outcome-skype.png → ...versationMembers/images/outcome-skype.png
diff --git a/...versationMembers/images/outcome-slack.png → ...versationMembers/images/outcome-slack.png b/...versationMembers/images/outcome-slack.png → ...versationMembers/images/outcome-slack.png
diff --git a/Node/GetConversationMembers/package.json → .../core-GetConversationMembers/package.json b/Node/GetConversationMembers/package.json → .../core-GetConversationMembers/package.json
diff --git a/Node/MultiDialogs/.vscode/launch.json → Node/core-MultiDialogs/.vscode/launch.json b/Node/MultiDialogs/.vscode/launch.json → Node/core-MultiDialogs/.vscode/launch.json
diff --git a/Node/MultiDialogs/README.md → Node/core-MultiDialogs/README.md b/Node/MultiDialogs/README.md → Node/core-MultiDialogs/README.md
@@ -4,7 +4,7 @@ A sample bot showing different kind of dialogs.
 
 [![Deploy to Azure][Deploy Button]][Deploy MultiDialogs/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy MultiDialogs/Node]: https://azuredeploy.net?ptmpl=Node/MultiDialogs/azuredeploy.json
+[Deploy MultiDialogs/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/MultiDialogs/app.js → Node/core-MultiDialogs/app.js b/Node/MultiDialogs/app.js → Node/core-MultiDialogs/app.js
diff --git a/Node/MultiDialogs/azuredeploy.json → Node/core-MultiDialogs/azuredeploy.json b/Node/MultiDialogs/azuredeploy.json → Node/core-MultiDialogs/azuredeploy.json
diff --git a/Node/MultiDialogs/flights.js → Node/core-MultiDialogs/flights.js b/Node/MultiDialogs/flights.js → Node/core-MultiDialogs/flights.js
diff --git a/Node/MultiDialogs/hotels.js → Node/core-MultiDialogs/hotels.js b/Node/MultiDialogs/hotels.js → Node/core-MultiDialogs/hotels.js
diff --git a/.../MultiDialogs/images/outcome-emulator.png → ...-MultiDialogs/images/outcome-emulator.png b/.../MultiDialogs/images/outcome-emulator.png → ...-MultiDialogs/images/outcome-emulator.png
diff --git a/.../MultiDialogs/images/outcome-facebook.png → ...-MultiDialogs/images/outcome-facebook.png b/.../MultiDialogs/images/outcome-facebook.png → ...-MultiDialogs/images/outcome-facebook.png
diff --git a/Node/MultiDialogs/images/outcome-skype.png → ...ore-MultiDialogs/images/outcome-skype.png b/Node/MultiDialogs/images/outcome-skype.png → ...ore-MultiDialogs/images/outcome-skype.png
diff --git a/Node/MultiDialogs/package.json → Node/core-MultiDialogs/package.json b/Node/MultiDialogs/package.json → Node/core-MultiDialogs/package.json
diff --git a/Node/MultiDialogs/store.js → Node/core-MultiDialogs/store.js b/Node/MultiDialogs/store.js → Node/core-MultiDialogs/store.js
diff --git a/Node/MultiDialogs/support.js → Node/core-MultiDialogs/support.js b/Node/MultiDialogs/support.js → Node/core-MultiDialogs/support.js
diff --git a/Node/RichCards/.vscode/launch.json → ...ore-ReceiveAttachment/.vscode/launch.json b/Node/RichCards/.vscode/launch.json → ...ore-ReceiveAttachment/.vscode/launch.json
diff --git a/Node/ReceiveAttachment/README.md → Node/core-ReceiveAttachment/README.md b/Node/ReceiveAttachment/README.md → Node/core-ReceiveAttachment/README.md
@@ -4,7 +4,7 @@ A sample bot that receives attachments sent by the user and downloads them.
 
 [![Deploy to Azure][Deploy Button]][Deploy ReceiveAttachment/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy ReceiveAttachment/Node]: https://azuredeploy.net?ptmpl=Node/ReceiveAttachment/azuredeploy.json
+[Deploy ReceiveAttachment/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/ReceiveAttachment/app.js → Node/core-ReceiveAttachment/app.js b/Node/ReceiveAttachment/app.js → Node/core-ReceiveAttachment/app.js
diff --git a/Node/ReceiveAttachment/azuredeploy.json → Node/core-ReceiveAttachment/azuredeploy.json b/Node/ReceiveAttachment/azuredeploy.json → Node/core-ReceiveAttachment/azuredeploy.json
diff --git a/Node/ReceiveAttachment/images/outcome.png → ...core-ReceiveAttachment/images/outcome.png b/Node/ReceiveAttachment/images/outcome.png → ...core-ReceiveAttachment/images/outcome.png
diff --git a/Node/ReceiveAttachment/package.json → Node/core-ReceiveAttachment/package.json b/Node/ReceiveAttachment/package.json → Node/core-ReceiveAttachment/package.json
diff --git a/Node/SendAttachment/.vscode/launch.json → Node/core-SendAttachment/.vscode/launch.json b/Node/SendAttachment/.vscode/launch.json → Node/core-SendAttachment/.vscode/launch.json
diff --git a/Node/SendAttachment/README.md → Node/core-SendAttachment/README.md b/Node/SendAttachment/README.md → Node/core-SendAttachment/README.md
@@ -4,7 +4,7 @@ A sample bot that passes simple media attachments (images) to a message.
 
 [![Deploy to Azure][Deploy Button]][Deploy SendAttachment/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy SendAttachment/Node]: https://azuredeploy.net?ptmpl=Node/SendAttachment/azuredeploy.json
+[Deploy SendAttachment/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/SendAttachment/app.js → Node/core-SendAttachment/app.js b/Node/SendAttachment/app.js → Node/core-SendAttachment/app.js
diff --git a/Node/SendAttachment/azuredeploy.json → Node/core-SendAttachment/azuredeploy.json b/Node/SendAttachment/azuredeploy.json → Node/core-SendAttachment/azuredeploy.json
diff --git a/...endAttachment/images/outcome-emulator.png → ...endAttachment/images/outcome-emulator.png b/...endAttachment/images/outcome-emulator.png → ...endAttachment/images/outcome-emulator.png
diff --git a/...endAttachment/images/outcome-facebook.png → ...endAttachment/images/outcome-facebook.png b/...endAttachment/images/outcome-facebook.png → ...endAttachment/images/outcome-facebook.png
diff --git a/Node/SendAttachment/images/outcome-skype.png → ...e-SendAttachment/images/outcome-skype.png b/Node/SendAttachment/images/outcome-skype.png → ...e-SendAttachment/images/outcome-skype.png
diff --git a/Node/SendAttachment/package.json → Node/core-SendAttachment/package.json b/Node/SendAttachment/package.json → Node/core-SendAttachment/package.json
diff --git a/Node/State/.vscode/launch.json → Node/core-State/.vscode/launch.json b/Node/State/.vscode/launch.json → Node/core-State/.vscode/launch.json
diff --git a/Node/State/README.md → Node/core-State/README.md b/Node/State/README.md → Node/core-State/README.md
@@ -4,7 +4,7 @@ A stateless sample bot tracking context of a conversation.
 
 [![Deploy to Azure][Deploy Button]][Deploy State/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy State/Node]: https://azuredeploy.net?ptmpl=Node/State/azuredeploy.json
+[Deploy State/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/State/app.js → Node/core-State/app.js b/Node/State/app.js → Node/core-State/app.js
diff --git a/Node/State/azuredeploy.json → Node/core-State/azuredeploy.json b/Node/State/azuredeploy.json → Node/core-State/azuredeploy.json
diff --git a/Node/State/images/outcome-1.png → Node/core-State/images/outcome-1.png b/Node/State/images/outcome-1.png → Node/core-State/images/outcome-1.png
diff --git a/Node/State/images/outcome-2.png → Node/core-State/images/outcome-2.png b/Node/State/images/outcome-2.png → Node/core-State/images/outcome-2.png
diff --git a/Node/State/images/outcome-3.png → Node/core-State/images/outcome-3.png b/Node/State/images/outcome-3.png → Node/core-State/images/outcome-3.png
diff --git a/Node/State/package.json → Node/core-State/package.json b/Node/State/package.json → Node/core-State/package.json
diff --git a/Node/ContosoFlowers/.vscode/launch.json → Node/demo-ContosoFlowers/.vscode/launch.json b/Node/ContosoFlowers/.vscode/launch.json → Node/demo-ContosoFlowers/.vscode/launch.json
diff --git a/Node/ContosoFlowers/README.md → Node/demo-ContosoFlowers/README.md b/Node/ContosoFlowers/README.md → Node/demo-ContosoFlowers/README.md
@@ -7,7 +7,7 @@ You came across the Microsoft Bot Framework which support a great variety of cha
 
 [![Deploy to Azure][Deploy Button]][Deploy ContosoFlowers/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy ContosoFlowers/Node]: https://azuredeploy.net?ptmpl=Node/ContosoFlowers/azuredeploy.json
+[Deploy ContosoFlowers/Node]: https://azuredeploy.net
 
 ### Prerequisites
 
@@ -242,7 +242,7 @@ orderService.retrieveOrder(orderId).then((order) => {
 |----------|-------|----------|
 |![Rich Cards - Receipt Card](images/richcards-receiptcard-emulator.png)|![Rich Cards - Receipt Card](images/richcards-receiptcard-facebook.png)|![Rich Cards - Receipt Card](images/richcards-receiptcard-skype.png)|
 
-> You can also see a full sample explaining the different types of rich cards in the [Rich Cards Bot Sample](../RichCards).
+> You can also see a full sample explaining the different types of rich cards in the [Rich Cards Bot Sample](../cards-RichCards).
 
 #### Carousel of Cards
 
@@ -302,7 +302,7 @@ bot.dialog('/', [
 |----------|-------|----------|
 |![Carousel of Cards](images/carousel-cards-emulator.png)|![Carousel of Cards](images/carousel-cards-facebook.png)|![Carousel of Cards](images/carousel-cards-skype.png)|
 
-> You can also see a full sample bot sending multiple rich card attachments in a single message using the Carousel layout in the [Carousel of Cards Bot Sample](../CarouselCards).
+> You can also see a full sample bot sending multiple rich card attachments in a single message using the Carousel layout in the [Carousel of Cards Bot Sample](../cards-CarouselCards).
 
 #### Complex Forms
 
@@ -391,7 +391,7 @@ switch (option) {
 |----------|-------|----------|
 |![State SettingsDialog](images/state-settingsdialog-emulator.png)|![State SettingsDialog](images/state-settingsdialog-facebook.png)|![State SettingsDialog](images/state-settingsdialog-skype.png)|
 
-> You can also see a full sample bot tracking context of a conversation in the [State API Bot Sample](../State).
+> You can also see a full sample bot tracking context of a conversation in the [State API Bot Sample](../core-State).
 
 The [shop dialog](bot/dialogs/shop.js) on the other hand, shows how to use `dialogData` to store information about the order and details, within the dialog instance, and then use it in the last step to trigger the checkout process.
 
@@ -527,11 +527,11 @@ While not covered in this sample, it is important to highlight two features that
 
 If you want to be able to take advantage of special features or concepts for a channel we provide a way for you to send native metadata to that channel giving you much deeper control over how your bot interacts on a channel. The way you do this is to pass extra properties via the [sourceEvent method](https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.message.html#sourceevent).
 
-> You can also see a full sample bot sending native metadata to Facebook using ChannelData in the [ChannelData Bot Sample](../ChannelData).
+> You can also see a full sample bot sending native metadata to Facebook using ChannelData in the [ChannelData Bot Sample](../core-ChannelData).
 
 One of the key problems in human-computer interactions is the ability of the computer to understand what a person wants, and to find the pieces of information that are relevant to their intent. In the LUIS application, you will bundle together the intents and entities that are important to your task.
 
-> You can also see a full sample bot using LuisDialog to integrate with a LUIS.ai application in the [LUIS Bot Sample](../LUIS).
+> You can also see a full sample bot using LuisDialog to integrate with a LUIS.ai application in the [LUIS Bot Sample](../intelligence-LUIS).
 
 #### Localization
 

diff --git a/Node/ContosoFlowers/app.js → Node/demo-ContosoFlowers/app.js b/Node/ContosoFlowers/app.js → Node/demo-ContosoFlowers/app.js
diff --git a/Node/ContosoFlowers/azuredeploy.json → Node/demo-ContosoFlowers/azuredeploy.json b/Node/ContosoFlowers/azuredeploy.json → Node/demo-ContosoFlowers/azuredeploy.json
diff --git a/...Flowers/bot/dialogs/CarouselPagination.js → ...Flowers/bot/dialogs/CarouselPagination.js b/...Flowers/bot/dialogs/CarouselPagination.js → ...Flowers/bot/dialogs/CarouselPagination.js
diff --git a/...wers/bot/dialogs/SimpleWaterfallDialog.js → ...wers/bot/dialogs/SimpleWaterfallDialog.js b/...wers/bot/dialogs/SimpleWaterfallDialog.js → ...wers/bot/dialogs/SimpleWaterfallDialog.js
diff --git a/Node/ContosoFlowers/bot/dialogs/address.js → ...emo-ContosoFlowers/bot/dialogs/address.js b/Node/ContosoFlowers/bot/dialogs/address.js → ...emo-ContosoFlowers/bot/dialogs/address.js
diff --git a/Node/ContosoFlowers/bot/dialogs/checkout.js → ...mo-ContosoFlowers/bot/dialogs/checkout.js b/Node/ContosoFlowers/bot/dialogs/checkout.js → ...mo-ContosoFlowers/bot/dialogs/checkout.js
diff --git a/Node/ContosoFlowers/bot/dialogs/delivery.js → ...mo-ContosoFlowers/bot/dialogs/delivery.js b/Node/ContosoFlowers/bot/dialogs/delivery.js → ...mo-ContosoFlowers/bot/dialogs/delivery.js
diff --git a/Node/ContosoFlowers/bot/dialogs/details.js → ...emo-ContosoFlowers/bot/dialogs/details.js b/Node/ContosoFlowers/bot/dialogs/details.js → ...emo-ContosoFlowers/bot/dialogs/details.js
diff --git a/Node/ContosoFlowers/bot/dialogs/help.js → Node/demo-ContosoFlowers/bot/dialogs/help.js b/Node/ContosoFlowers/bot/dialogs/help.js → Node/demo-ContosoFlowers/bot/dialogs/help.js
diff --git a/...oFlowers/bot/dialogs/product-selection.js → ...oFlowers/bot/dialogs/product-selection.js b/...oFlowers/bot/dialogs/product-selection.js → ...oFlowers/bot/dialogs/product-selection.js
diff --git a/Node/ContosoFlowers/bot/dialogs/settings.js → ...mo-ContosoFlowers/bot/dialogs/settings.js b/Node/ContosoFlowers/bot/dialogs/settings.js → ...mo-ContosoFlowers/bot/dialogs/settings.js
diff --git a/Node/ContosoFlowers/bot/dialogs/shop.js → Node/demo-ContosoFlowers/bot/dialogs/shop.js b/Node/ContosoFlowers/bot/dialogs/shop.js → Node/demo-ContosoFlowers/bot/dialogs/shop.js
diff --git a/Node/ContosoFlowers/bot/index.js → Node/demo-ContosoFlowers/bot/index.js b/Node/ContosoFlowers/bot/index.js → Node/demo-ContosoFlowers/bot/index.js
diff --git a/Node/ContosoFlowers/bot/site-url.js → Node/demo-ContosoFlowers/bot/site-url.js b/Node/ContosoFlowers/bot/site-url.js → Node/demo-ContosoFlowers/bot/site-url.js
diff --git a/Node/ContosoFlowers/bot/utils.js → Node/demo-ContosoFlowers/bot/utils.js b/Node/ContosoFlowers/bot/utils.js → Node/demo-ContosoFlowers/bot/utils.js
diff --git a/Node/ContosoFlowers/bot/validators.js → Node/demo-ContosoFlowers/bot/validators.js b/Node/ContosoFlowers/bot/validators.js → Node/demo-ContosoFlowers/bot/validators.js
diff --git a/Node/ContosoFlowers/checkout.js → Node/demo-ContosoFlowers/checkout.js b/Node/ContosoFlowers/checkout.js → Node/demo-ContosoFlowers/checkout.js
diff --git a/Node/ContosoFlowers/data/orders.json → Node/demo-ContosoFlowers/data/orders.json b/Node/ContosoFlowers/data/orders.json → Node/demo-ContosoFlowers/data/orders.json
diff --git a/...wers/images/address-checkout-emulator.png → ...wers/images/address-checkout-emulator.png b/...wers/images/address-checkout-emulator.png → ...wers/images/address-checkout-emulator.png
diff --git a/...wers/images/address-checkout-facebook.png → ...wers/images/address-checkout-facebook.png b/...wers/images/address-checkout-facebook.png → ...wers/images/address-checkout-facebook.png
diff --git a/...Flowers/images/address-checkout-skype.png → ...Flowers/images/address-checkout-skype.png b/...Flowers/images/address-checkout-skype.png → ...Flowers/images/address-checkout-skype.png
diff --git a/...lowers/images/carousel-cards-emulator.png → ...lowers/images/carousel-cards-emulator.png b/...lowers/images/carousel-cards-emulator.png → ...lowers/images/carousel-cards-emulator.png
diff --git a/...lowers/images/carousel-cards-facebook.png → ...lowers/images/carousel-cards-facebook.png b/...lowers/images/carousel-cards-facebook.png → ...lowers/images/carousel-cards-facebook.png
diff --git a/...soFlowers/images/carousel-cards-skype.png → ...soFlowers/images/carousel-cards-skype.png b/...soFlowers/images/carousel-cards-skype.png → ...soFlowers/images/carousel-cards-skype.png
diff --git a/...oFlowers/images/complexforms-emulator.png → ...oFlowers/images/complexforms-emulator.png b/...oFlowers/images/complexforms-emulator.png → ...oFlowers/images/complexforms-emulator.png
diff --git a/...oFlowers/images/complexforms-facebook.png → ...oFlowers/images/complexforms-facebook.png b/...oFlowers/images/complexforms-facebook.png → ...oFlowers/images/complexforms-facebook.png
diff --git a/...tosoFlowers/images/complexforms-skype.png → ...tosoFlowers/images/complexforms-skype.png b/...tosoFlowers/images/complexforms-skype.png → ...tosoFlowers/images/complexforms-skype.png
diff --git a/...ontosoFlowers/images/dialogdata-debug.png → ...ontosoFlowers/images/dialogdata-debug.png b/...ontosoFlowers/images/dialogdata-debug.png → ...ontosoFlowers/images/dialogdata-debug.png
diff --git a/...s/images/middleware-settings-emulator.png → ...s/images/middleware-settings-emulator.png b/...s/images/middleware-settings-emulator.png → ...s/images/middleware-settings-emulator.png
diff --git a/...s/images/middleware-settings-facebook.png → ...s/images/middleware-settings-facebook.png b/...s/images/middleware-settings-facebook.png → ...s/images/middleware-settings-facebook.png
diff --git a/...wers/images/middleware-settings-skype.png → ...wers/images/middleware-settings-skype.png b/...wers/images/middleware-settings-skype.png → ...wers/images/middleware-settings-skype.png
diff --git a/...rs/images/richcards-herocard-emulator.png → ...rs/images/richcards-herocard-emulator.png b/...rs/images/richcards-herocard-emulator.png → ...rs/images/richcards-herocard-emulator.png
diff --git a/...rs/images/richcards-herocard-facebook.png → ...rs/images/richcards-herocard-facebook.png b/...rs/images/richcards-herocard-facebook.png → ...rs/images/richcards-herocard-facebook.png
diff --git a/...owers/images/richcards-herocard-skype.png → ...owers/images/richcards-herocard-skype.png b/...owers/images/richcards-herocard-skype.png → ...owers/images/richcards-herocard-skype.png
diff --git a/...images/richcards-receiptcard-emulator.png → ...images/richcards-receiptcard-emulator.png b/...images/richcards-receiptcard-emulator.png → ...images/richcards-receiptcard-emulator.png
diff --git a/...images/richcards-receiptcard-facebook.png → ...images/richcards-receiptcard-facebook.png b/...images/richcards-receiptcard-facebook.png → ...images/richcards-receiptcard-facebook.png
diff --git a/...rs/images/richcards-receiptcard-skype.png → ...rs/images/richcards-receiptcard-skype.png b/...rs/images/richcards-receiptcard-skype.png → ...rs/images/richcards-receiptcard-skype.png
diff --git a/.../images/state-settingsdialog-emulator.png → .../images/state-settingsdialog-emulator.png b/.../images/state-settingsdialog-emulator.png → .../images/state-settingsdialog-emulator.png
diff --git a/.../images/state-settingsdialog-facebook.png → .../images/state-settingsdialog-facebook.png b/.../images/state-settingsdialog-facebook.png → .../images/state-settingsdialog-facebook.png
diff --git a/...ers/images/state-settingsdialog-skype.png → ...ers/images/state-settingsdialog-skype.png b/...ers/images/state-settingsdialog-skype.png → ...ers/images/state-settingsdialog-skype.png
diff --git a/...lowers/images/welcomemessage-emulator.png → ...lowers/images/welcomemessage-emulator.png b/...lowers/images/welcomemessage-emulator.png → ...lowers/images/welcomemessage-emulator.png
diff --git a/Node/ContosoFlowers/package.json → Node/demo-ContosoFlowers/package.json b/Node/ContosoFlowers/package.json → Node/demo-ContosoFlowers/package.json
diff --git a/Node/ContosoFlowers/public/favicon.ico → Node/demo-ContosoFlowers/public/favicon.ico b/Node/ContosoFlowers/public/favicon.ico → Node/demo-ContosoFlowers/public/favicon.ico
diff --git a/...ntosoFlowers/public/stylesheets/style.css → ...ntosoFlowers/public/stylesheets/style.css b/...ntosoFlowers/public/stylesheets/style.css → ...ntosoFlowers/public/stylesheets/style.css
diff --git a/Node/ContosoFlowers/services/location.js → .../demo-ContosoFlowers/services/location.js b/Node/ContosoFlowers/services/location.js → .../demo-ContosoFlowers/services/location.js
diff --git a/Node/ContosoFlowers/services/orders.js → Node/demo-ContosoFlowers/services/orders.js b/Node/ContosoFlowers/services/orders.js → Node/demo-ContosoFlowers/services/orders.js
diff --git a/Node/ContosoFlowers/services/products.js → .../demo-ContosoFlowers/services/products.js b/Node/ContosoFlowers/services/products.js → .../demo-ContosoFlowers/services/products.js
diff --git a/...ntosoFlowers/views/checkout/completed.pug → ...ntosoFlowers/views/checkout/completed.pug b/...ntosoFlowers/views/checkout/completed.pug → ...ntosoFlowers/views/checkout/completed.pug
diff --git a/Node/ContosoFlowers/views/checkout/index.pug → ...o-ContosoFlowers/views/checkout/index.pug b/Node/ContosoFlowers/views/checkout/index.pug → ...o-ContosoFlowers/views/checkout/index.pug
diff --git a/Node/ContosoFlowers/views/error.pug → Node/demo-ContosoFlowers/views/error.pug b/Node/ContosoFlowers/views/error.pug → Node/demo-ContosoFlowers/views/error.pug
diff --git a/Node/ContosoFlowers/views/index.pug → Node/demo-ContosoFlowers/views/index.pug b/Node/ContosoFlowers/views/index.pug → Node/demo-ContosoFlowers/views/index.pug
diff --git a/Node/ContosoFlowers/views/layout.pug → Node/demo-ContosoFlowers/views/layout.pug b/Node/ContosoFlowers/views/layout.pug → Node/demo-ContosoFlowers/views/layout.pug
diff --git a/Node/LUIS/.vscode/launch.json → Node/intelligence-LUIS/.vscode/launch.json b/Node/LUIS/.vscode/launch.json → Node/intelligence-LUIS/.vscode/launch.json
diff --git a/Node/LUIS/LuisBot.json → Node/intelligence-LUIS/LuisBot.json b/Node/LUIS/LuisBot.json → Node/intelligence-LUIS/LuisBot.json
diff --git a/Node/LUIS/README.md → Node/intelligence-LUIS/README.md b/Node/LUIS/README.md → Node/intelligence-LUIS/README.md
@@ -4,7 +4,7 @@ A sample bot using IntentDialog to integrate with a LUIS.ai application.
 
 [![Deploy to Azure][Deploy Button]][Deploy LUIS/Node]
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
-[Deploy LUIS/Node]: https://azuredeploy.net?ptmpl=Node/LUIS/azuredeploy.json
+[Deploy LUIS/Node]: https://azuredeploy.net
 
 ### Prerequisites
 

diff --git a/Node/LUIS/app.js → Node/intelligence-LUIS/app.js b/Node/LUIS/app.js → Node/intelligence-LUIS/app.js
diff --git a/Node/LUIS/azuredeploy.json → Node/intelligence-LUIS/azuredeploy.json b/Node/LUIS/azuredeploy.json → Node/intelligence-LUIS/azuredeploy.json
diff --git a/Node/LUIS/images/highlights-phrase.png → ...ligence-LUIS/images/highlights-phrase.png b/Node/LUIS/images/highlights-phrase.png → ...ligence-LUIS/images/highlights-phrase.png
diff --git a/Node/LUIS/images/highlights-regex.png → ...lligence-LUIS/images/highlights-regex.png b/Node/LUIS/images/highlights-regex.png → ...lligence-LUIS/images/highlights-regex.png
diff --git a/Node/LUIS/images/outcome.png → Node/intelligence-LUIS/images/outcome.png b/Node/LUIS/images/outcome.png → Node/intelligence-LUIS/images/outcome.png
diff --git a/Node/LUIS/images/prereqs-import.png → ...telligence-LUIS/images/prereqs-import.png b/Node/LUIS/images/prereqs-import.png → ...telligence-LUIS/images/prereqs-import.png
diff --git a/Node/LUIS/images/prereqs-publish.png → ...elligence-LUIS/images/prereqs-publish.png b/Node/LUIS/images/prereqs-publish.png → ...elligence-LUIS/images/prereqs-publish.png
diff --git a/Node/LUIS/package.json → Node/intelligence-LUIS/package.json b/Node/LUIS/package.json → Node/intelligence-LUIS/package.json
diff --git a/Node/LUIS/store.js → Node/intelligence-LUIS/store.js b/Node/LUIS/store.js → Node/intelligence-LUIS/store.js