diff --git a/samples/in-memory/README.md b/samples/features/in-memory/README.md
similarity index 100%
rename from samples/in-memory/README.md
rename to samples/features/in-memory/README.md
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/App.Config b/samples/features/in-memory/ticket-reservations/DemoWorkload/App.Config
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/App.Config
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/App.Config
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj b/samples/features/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj.user b/samples/features/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj.user
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj.user
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.csproj.user
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.ruleset b/samples/features/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.ruleset
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.ruleset
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/DemoWorkload.ruleset
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/FrmConfig.Designer.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/FrmConfig.Designer.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/FrmConfig.Designer.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/FrmConfig.Designer.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/FrmConfig.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/FrmConfig.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/FrmConfig.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/FrmConfig.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/FrmConfig.resx b/samples/features/in-memory/ticket-reservations/DemoWorkload/FrmConfig.resx
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/FrmConfig.resx
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/FrmConfig.resx
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/FrmMain.Designer.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/FrmMain.Designer.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/FrmMain.Designer.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/FrmMain.Designer.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/FrmMain.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/FrmMain.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/FrmMain.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/FrmMain.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/FrmMain.resx b/samples/features/in-memory/ticket-reservations/DemoWorkload/FrmMain.resx
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/FrmMain.resx
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/FrmMain.resx
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Program.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/Program.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Program.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Program.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Properties/AssemblyInfo.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Properties/AssemblyInfo.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/AssemblyInfo.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.Designer.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.Designer.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.Designer.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.Designer.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.resx b/samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.resx
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.resx
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Resources.resx
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.Designer.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.Designer.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.Designer.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.Designer.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.settings b/samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.settings
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.settings
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Properties/Settings.settings
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Resources/SQLBackground.jpg b/samples/features/in-memory/ticket-reservations/DemoWorkload/Resources/SQLBackground.jpg
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Resources/SQLBackground.jpg
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Resources/SQLBackground.jpg
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/Resources/sqlserver.ico b/samples/features/in-memory/ticket-reservations/DemoWorkload/Resources/sqlserver.ico
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/Resources/sqlserver.ico
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/Resources/sqlserver.ico
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/UIControls.cs b/samples/features/in-memory/ticket-reservations/DemoWorkload/UIControls.cs
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/UIControls.cs
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/UIControls.cs
diff --git a/samples/in-memory/ticket-reservations/DemoWorkload/packages.config b/samples/features/in-memory/ticket-reservations/DemoWorkload/packages.config
similarity index 100%
rename from samples/in-memory/ticket-reservations/DemoWorkload/packages.config
rename to samples/features/in-memory/ticket-reservations/DemoWorkload/packages.config
diff --git a/samples/in-memory/ticket-reservations/InMemoryOLTPDemo.sln b/samples/features/in-memory/ticket-reservations/InMemoryOLTPDemo.sln
similarity index 100%
rename from samples/in-memory/ticket-reservations/InMemoryOLTPDemo.sln
rename to samples/features/in-memory/ticket-reservations/InMemoryOLTPDemo.sln
diff --git a/samples/in-memory/ticket-reservations/README.md b/samples/features/in-memory/ticket-reservations/README.md
similarity index 100%
rename from samples/in-memory/ticket-reservations/README.md
rename to samples/features/in-memory/ticket-reservations/README.md
diff --git a/samples/in-memory/ticket-reservations/Screenshots/1.png b/samples/features/in-memory/ticket-reservations/Screenshots/1.png
similarity index 100%
rename from samples/in-memory/ticket-reservations/Screenshots/1.png
rename to samples/features/in-memory/ticket-reservations/Screenshots/1.png
diff --git a/samples/in-memory/ticket-reservations/TicketReservations/TicketReservations.sqlproj b/samples/features/in-memory/ticket-reservations/TicketReservations/TicketReservations.sqlproj
similarity index 100%
rename from samples/in-memory/ticket-reservations/TicketReservations/TicketReservations.sqlproj
rename to samples/features/in-memory/ticket-reservations/TicketReservations/TicketReservations.sqlproj
diff --git a/samples/in-memory/ticket-reservations/TicketReservations/dbo/Sequences/TicketReservationSequence.sql b/samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Sequences/TicketReservationSequence.sql
similarity index 100%
rename from samples/in-memory/ticket-reservations/TicketReservations/dbo/Sequences/TicketReservationSequence.sql
rename to samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Sequences/TicketReservationSequence.sql
diff --git a/samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/BatchInsertReservations.sql b/samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/BatchInsertReservations.sql
similarity index 100%
rename from samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/BatchInsertReservations.sql
rename to samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/BatchInsertReservations.sql
diff --git a/samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/Demo_Reset.sql b/samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/Demo_Reset.sql
similarity index 100%
rename from samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/Demo_Reset.sql
rename to samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/Demo_Reset.sql
diff --git a/samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/InsertReservationDetails.sql b/samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/InsertReservationDetails.sql
similarity index 100%
rename from samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/InsertReservationDetails.sql
rename to samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/InsertReservationDetails.sql
diff --git a/samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/ReadMultipleReservations.sql b/samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/ReadMultipleReservations.sql
similarity index 100%
rename from samples/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/ReadMultipleReservations.sql
rename to samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Stored Procedures/ReadMultipleReservations.sql
diff --git a/samples/in-memory/ticket-reservations/TicketReservations/dbo/Tables/TicketReservationDetail.sql b/samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Tables/TicketReservationDetail.sql
similarity index 100%
rename from samples/in-memory/ticket-reservations/TicketReservations/dbo/Tables/TicketReservationDetail.sql
rename to samples/features/in-memory/ticket-reservations/TicketReservations/dbo/Tables/TicketReservationDetail.sql
diff --git a/samples/master-data-services/BusinessRules/BusinessRules.csproj b/samples/features/master-data-services/BusinessRules/BusinessRules.csproj
similarity index 100%
rename from samples/master-data-services/BusinessRules/BusinessRules.csproj
rename to samples/features/master-data-services/BusinessRules/BusinessRules.csproj
diff --git a/samples/master-data-services/BusinessRules/BusinessRules.sln b/samples/features/master-data-services/BusinessRules/BusinessRules.sln
similarity index 100%
rename from samples/master-data-services/BusinessRules/BusinessRules.sln
rename to samples/features/master-data-services/BusinessRules/BusinessRules.sln
diff --git a/samples/master-data-services/BusinessRules/Program.cs b/samples/features/master-data-services/BusinessRules/Program.cs
similarity index 100%
rename from samples/master-data-services/BusinessRules/Program.cs
rename to samples/features/master-data-services/BusinessRules/Program.cs
diff --git a/samples/master-data-services/BusinessRules/Properties/AssemblyInfo.cs b/samples/features/master-data-services/BusinessRules/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/master-data-services/BusinessRules/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/BusinessRules/Properties/AssemblyInfo.cs
diff --git a/samples/master-data-services/BusinessRules/README.md b/samples/features/master-data-services/BusinessRules/README.md
similarity index 100%
rename from samples/master-data-services/BusinessRules/README.md
rename to samples/features/master-data-services/BusinessRules/README.md
diff --git a/samples/master-data-services/BusinessRules/Reference.cs b/samples/features/master-data-services/BusinessRules/Reference.cs
similarity index 100%
rename from samples/master-data-services/BusinessRules/Reference.cs
rename to samples/features/master-data-services/BusinessRules/Reference.cs
diff --git a/samples/master-data-services/EntityBasedStaging/EntityBasedStaging.csproj b/samples/features/master-data-services/EntityBasedStaging/EntityBasedStaging.csproj
similarity index 100%
rename from samples/master-data-services/EntityBasedStaging/EntityBasedStaging.csproj
rename to samples/features/master-data-services/EntityBasedStaging/EntityBasedStaging.csproj
diff --git a/samples/master-data-services/EntityBasedStaging/EntityBasedStaging.sln b/samples/features/master-data-services/EntityBasedStaging/EntityBasedStaging.sln
similarity index 100%
rename from samples/master-data-services/EntityBasedStaging/EntityBasedStaging.sln
rename to samples/features/master-data-services/EntityBasedStaging/EntityBasedStaging.sln
diff --git a/samples/master-data-services/EntityBasedStaging/Program.cs b/samples/features/master-data-services/EntityBasedStaging/Program.cs
similarity index 100%
rename from samples/master-data-services/EntityBasedStaging/Program.cs
rename to samples/features/master-data-services/EntityBasedStaging/Program.cs
diff --git a/samples/master-data-services/EntityBasedStaging/Properties/AssemblyInfo.cs b/samples/features/master-data-services/EntityBasedStaging/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/master-data-services/EntityBasedStaging/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/EntityBasedStaging/Properties/AssemblyInfo.cs
diff --git a/samples/master-data-services/EntityBasedStaging/README.md b/samples/features/master-data-services/EntityBasedStaging/README.md
similarity index 100%
rename from samples/master-data-services/EntityBasedStaging/README.md
rename to samples/features/master-data-services/EntityBasedStaging/README.md
diff --git a/samples/master-data-services/EntityBasedStaging/Reference.cs b/samples/features/master-data-services/EntityBasedStaging/Reference.cs
similarity index 100%
rename from samples/master-data-services/EntityBasedStaging/Reference.cs
rename to samples/features/master-data-services/EntityBasedStaging/Reference.cs
diff --git a/samples/master-data-services/MasterData/MasterData.csproj b/samples/features/master-data-services/MasterData/MasterData.csproj
similarity index 100%
rename from samples/master-data-services/MasterData/MasterData.csproj
rename to samples/features/master-data-services/MasterData/MasterData.csproj
diff --git a/samples/master-data-services/MasterData/MasterData.sln b/samples/features/master-data-services/MasterData/MasterData.sln
similarity index 100%
rename from samples/master-data-services/MasterData/MasterData.sln
rename to samples/features/master-data-services/MasterData/MasterData.sln
diff --git a/samples/master-data-services/MasterData/Program.cs b/samples/features/master-data-services/MasterData/Program.cs
similarity index 100%
rename from samples/master-data-services/MasterData/Program.cs
rename to samples/features/master-data-services/MasterData/Program.cs
diff --git a/samples/master-data-services/MasterData/Properties/AssemblyInfo.cs b/samples/features/master-data-services/MasterData/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/master-data-services/MasterData/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/MasterData/Properties/AssemblyInfo.cs
diff --git a/samples/master-data-services/MasterData/README.md b/samples/features/master-data-services/MasterData/README.md
similarity index 100%
rename from samples/master-data-services/MasterData/README.md
rename to samples/features/master-data-services/MasterData/README.md
diff --git a/samples/master-data-services/MasterData/Reference.cs b/samples/features/master-data-services/MasterData/Reference.cs
similarity index 100%
rename from samples/master-data-services/MasterData/Reference.cs
rename to samples/features/master-data-services/MasterData/Reference.cs
diff --git a/samples/master-data-services/MetaData/Metadata.csproj b/samples/features/master-data-services/MetaData/Metadata.csproj
similarity index 100%
rename from samples/master-data-services/MetaData/Metadata.csproj
rename to samples/features/master-data-services/MetaData/Metadata.csproj
diff --git a/samples/master-data-services/MetaData/Metadata.sln b/samples/features/master-data-services/MetaData/Metadata.sln
similarity index 100%
rename from samples/master-data-services/MetaData/Metadata.sln
rename to samples/features/master-data-services/MetaData/Metadata.sln
diff --git a/samples/master-data-services/MetaData/Program.cs b/samples/features/master-data-services/MetaData/Program.cs
similarity index 100%
rename from samples/master-data-services/MetaData/Program.cs
rename to samples/features/master-data-services/MetaData/Program.cs
diff --git a/samples/master-data-services/MetaData/Properties/AssemblyInfo.cs b/samples/features/master-data-services/MetaData/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/master-data-services/MetaData/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/MetaData/Properties/AssemblyInfo.cs
diff --git a/samples/master-data-services/MetaData/README.md b/samples/features/master-data-services/MetaData/README.md
similarity index 100%
rename from samples/master-data-services/MetaData/README.md
rename to samples/features/master-data-services/MetaData/README.md
diff --git a/samples/master-data-services/MetaData/Reference.cs b/samples/features/master-data-services/MetaData/Reference.cs
similarity index 100%
rename from samples/master-data-services/MetaData/Reference.cs
rename to samples/features/master-data-services/MetaData/Reference.cs
diff --git a/samples/master-data-services/ModelDeployment/ModelDUtil.csproj b/samples/features/master-data-services/ModelDeployment/ModelDUtil.csproj
similarity index 100%
rename from samples/master-data-services/ModelDeployment/ModelDUtil.csproj
rename to samples/features/master-data-services/ModelDeployment/ModelDUtil.csproj
diff --git a/samples/master-data-services/ModelDeployment/ModelDUtil.exe.config b/samples/features/master-data-services/ModelDeployment/ModelDUtil.exe.config
similarity index 100%
rename from samples/master-data-services/ModelDeployment/ModelDUtil.exe.config
rename to samples/features/master-data-services/ModelDeployment/ModelDUtil.exe.config
diff --git a/samples/master-data-services/ModelDeployment/ModelDUtil.sln b/samples/features/master-data-services/ModelDeployment/ModelDUtil.sln
similarity index 100%
rename from samples/master-data-services/ModelDeployment/ModelDUtil.sln
rename to samples/features/master-data-services/ModelDeployment/ModelDUtil.sln
diff --git a/samples/master-data-services/ModelDeployment/Modes.cs b/samples/features/master-data-services/ModelDeployment/Modes.cs
similarity index 100%
rename from samples/master-data-services/ModelDeployment/Modes.cs
rename to samples/features/master-data-services/ModelDeployment/Modes.cs
diff --git a/samples/master-data-services/ModelDeployment/Program.cs b/samples/features/master-data-services/ModelDeployment/Program.cs
similarity index 100%
rename from samples/master-data-services/ModelDeployment/Program.cs
rename to samples/features/master-data-services/ModelDeployment/Program.cs
diff --git a/samples/master-data-services/ModelDeployment/Properties/AssemblyInfo.cs b/samples/features/master-data-services/ModelDeployment/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/master-data-services/ModelDeployment/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/ModelDeployment/Properties/AssemblyInfo.cs
diff --git a/samples/master-data-services/ModelDeployment/README.md b/samples/features/master-data-services/ModelDeployment/README.md
similarity index 100%
rename from samples/master-data-services/ModelDeployment/README.md
rename to samples/features/master-data-services/ModelDeployment/README.md
diff --git a/samples/master-data-services/README.md b/samples/features/master-data-services/README.md
similarity index 100%
rename from samples/master-data-services/README.md
rename to samples/features/master-data-services/README.md
diff --git a/samples/master-data-services/Security/Program.cs b/samples/features/master-data-services/Security/Program.cs
similarity index 100%
rename from samples/master-data-services/Security/Program.cs
rename to samples/features/master-data-services/Security/Program.cs
diff --git a/samples/master-data-services/Security/Properties/AssemblyInfo.cs b/samples/features/master-data-services/Security/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/master-data-services/Security/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/Security/Properties/AssemblyInfo.cs
diff --git a/samples/master-data-services/Security/README.md b/samples/features/master-data-services/Security/README.md
similarity index 100%
rename from samples/master-data-services/Security/README.md
rename to samples/features/master-data-services/Security/README.md
diff --git a/samples/master-data-services/Security/Reference.cs b/samples/features/master-data-services/Security/Reference.cs
similarity index 100%
rename from samples/master-data-services/Security/Reference.cs
rename to samples/features/master-data-services/Security/Reference.cs
diff --git a/samples/master-data-services/Security/Security.csproj b/samples/features/master-data-services/Security/Security.csproj
similarity index 100%
rename from samples/master-data-services/Security/Security.csproj
rename to samples/features/master-data-services/Security/Security.csproj
diff --git a/samples/master-data-services/Security/Security.sln b/samples/features/master-data-services/Security/Security.sln
similarity index 100%
rename from samples/master-data-services/Security/Security.sln
rename to samples/features/master-data-services/Security/Security.sln
diff --git a/samples/master-data-services/Security/SecurityInformation.cs b/samples/features/master-data-services/Security/SecurityInformation.cs
similarity index 100%
rename from samples/master-data-services/Security/SecurityInformation.cs
rename to samples/features/master-data-services/Security/SecurityInformation.cs
diff --git a/samples/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.csproj b/samples/features/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.csproj
similarity index 100%
rename from samples/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.csproj
rename to samples/features/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.csproj
diff --git a/samples/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.sln b/samples/features/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.sln
similarity index 100%
rename from samples/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.sln
rename to samples/features/master-data-services/Workflow/Microsoft.MasterDataServices.SharePointWorkflow.sln
diff --git a/samples/master-data-services/Workflow/Properties/AssemblyInfo.cs b/samples/features/master-data-services/Workflow/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/master-data-services/Workflow/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/Workflow/Properties/AssemblyInfo.cs
diff --git a/samples/master-data-services/Workflow/README.md b/samples/features/master-data-services/Workflow/README.md
similarity index 100%
rename from samples/master-data-services/Workflow/README.md
rename to samples/features/master-data-services/Workflow/README.md
diff --git a/samples/master-data-services/Workflow/SharePointWorkflowExtender.cs b/samples/features/master-data-services/Workflow/SharePointWorkflowExtender.cs
similarity index 100%
rename from samples/master-data-services/Workflow/SharePointWorkflowExtender.cs
rename to samples/features/master-data-services/Workflow/SharePointWorkflowExtender.cs
diff --git a/samples/r-services/README.md b/samples/features/r-services/README.md
similarity index 100%
rename from samples/r-services/README.md
rename to samples/features/r-services/README.md
diff --git a/samples/r-services/Telco Customer Churn/R/README.md b/samples/features/r-services/Telco Customer Churn/R/README.md
similarity index 100%
rename from samples/r-services/Telco Customer Churn/R/README.md
rename to samples/features/r-services/Telco Customer Churn/R/README.md
diff --git a/samples/r-services/Telco Customer Churn/R/TelcoChurn-DataExploration.r b/samples/features/r-services/Telco Customer Churn/R/TelcoChurn-DataExploration.r
similarity index 100%
rename from samples/r-services/Telco Customer Churn/R/TelcoChurn-DataExploration.r
rename to samples/features/r-services/Telco Customer Churn/R/TelcoChurn-DataExploration.r
diff --git a/samples/r-services/Telco Customer Churn/R/TelcoChurn-DataPreparation.r b/samples/features/r-services/Telco Customer Churn/R/TelcoChurn-DataPreparation.r
similarity index 100%
rename from samples/r-services/Telco Customer Churn/R/TelcoChurn-DataPreparation.r
rename to samples/features/r-services/Telco Customer Churn/R/TelcoChurn-DataPreparation.r
diff --git a/samples/r-services/Telco Customer Churn/R/TelcoChurn-Main.r b/samples/features/r-services/Telco Customer Churn/R/TelcoChurn-Main.r
similarity index 100%
rename from samples/r-services/Telco Customer Churn/R/TelcoChurn-Main.r
rename to samples/features/r-services/Telco Customer Churn/R/TelcoChurn-Main.r
diff --git a/samples/r-services/Telco Customer Churn/R/TelcoChurn-ModelBuilding.r b/samples/features/r-services/Telco Customer Churn/R/TelcoChurn-ModelBuilding.r
similarity index 100%
rename from samples/r-services/Telco Customer Churn/R/TelcoChurn-ModelBuilding.r
rename to samples/features/r-services/Telco Customer Churn/R/TelcoChurn-ModelBuilding.r
diff --git a/samples/r-services/Telco Customer Churn/R/TelcoChurn-Setup.r b/samples/features/r-services/Telco Customer Churn/R/TelcoChurn-Setup.r
similarity index 100%
rename from samples/r-services/Telco Customer Churn/R/TelcoChurn-Setup.r
rename to samples/features/r-services/Telco Customer Churn/R/TelcoChurn-Setup.r
diff --git a/samples/r-services/Telco Customer Churn/README.md b/samples/features/r-services/Telco Customer Churn/README.md
similarity index 100%
rename from samples/r-services/Telco Customer Churn/README.md
rename to samples/features/r-services/Telco Customer Churn/README.md
diff --git a/samples/r-services/Telco Customer Churn/SQL Server/README.md b/samples/features/r-services/Telco Customer Churn/SQL Server/README.md
similarity index 100%
rename from samples/r-services/Telco Customer Churn/SQL Server/README.md
rename to samples/features/r-services/Telco Customer Churn/SQL Server/README.md
diff --git a/samples/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Main.sql b/samples/features/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Main.sql
similarity index 100%
rename from samples/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Main.sql
rename to samples/features/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Main.sql
diff --git a/samples/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Operationalize.sql b/samples/features/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Operationalize.sql
similarity index 100%
rename from samples/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Operationalize.sql
rename to samples/features/r-services/Telco Customer Churn/SQL Server/TelcoChurn-Operationalize.sql
diff --git a/samples/r-services/Telco Customer Churn/SQL Server/teloedw2.bak b/samples/features/r-services/Telco Customer Churn/SQL Server/teloedw2.bak
similarity index 100%
rename from samples/r-services/Telco Customer Churn/SQL Server/teloedw2.bak
rename to samples/features/r-services/Telco Customer Churn/SQL Server/teloedw2.bak