diff --git a/samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/WideWorldImportersDW.sqlproj b/samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/WideWorldImportersDW.sqlproj
index ff21774d..4ced5354 100644
--- a/samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/WideWorldImportersDW.sqlproj
+++ b/samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/WideWorldImportersDW.sqlproj
@@ -80,6 +80,8 @@
     <Folder Include="Security\" />
     <Folder Include="Sequences\Sequences\" />
     <Folder Include="PostDeploymentScripts" />
+    <Folder Include="dbo" />
+    <Folder Include="dbo\Tables" />
   </ItemGroup>
   <ItemGroup>
     <Build Include="Integration\Tables\ETL Cutoff.sql" />
@@ -153,7 +155,7 @@
     <Build Include="Sequences\Sequences\StockItemKey.sql" />
     <Build Include="Sequences\Sequences\SupplierKey.sql" />
     <Build Include="Sequences\Sequences\TransactionTypeKey.sql" />
-    <Build Include="SampleVersion.sql" />
+    <Build Include="dbo\Tables\SampleVersion.sql" />
   </ItemGroup>
   <ItemGroup>
     <PostDeploy Include="PostDeploymentScripts\Script.PostDeployment1.sql" />
diff --git a/samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/SampleVersion.sql b/samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/dbo/Tables/SampleVersion.sql
similarity index 100%
rename from samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/SampleVersion.sql
rename to samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/dbo/Tables/SampleVersion.sql
diff --git a/samples/databases/wide-world-importers/wwi-sample.sln b/samples/databases/wide-world-importers/wwi-sample.sln
index d287e621..38289175 100644
--- a/samples/databases/wide-world-importers/wwi-sample.sln
+++ b/samples/databases/wide-world-importers/wwi-sample.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "WideWorldImportersDW", "wwi-dw-ssdt\wwi-dw-ssdt\WideWorldImportersDW.sqlproj", "{79C14C29-3A96-4B59-BC92-0290AF92F05B}"
 EndProject
-Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WWI-SSASMD", "wwi-ssasmd\WWI-SSASMD\WWI-SSASMD.dwproj", "{AE481845-1E4D-4C1C-80DB-184CE847150F}"
+Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WideWorldImportersMultidimensionalCube", "wwi-ssasmd\WWI-SSASMD\WideWorldImportersMultidimensionalCube.dwproj", "{AE481845-1E4D-4C1C-80DB-184CE847150F}"
 EndProject
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "WideWorldImporters", "wwi-ssdt\wwi-ssdt\WideWorldImporters.sqlproj", "{9E972C93-0716-4442-97FC-72C52C2C5AAA}"
 EndProject
diff --git a/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd.sln b/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd.sln
index cfa2ca80..0367100f 100644
--- a/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd.sln
+++ b/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd.sln
@@ -3,16 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WWI-SSASMD", "WWI-SSASMD\WWI-SSASMD.dwproj", "{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}"
+Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WideWorldImportersMultidimensionalCube", "wwi-ssasmd\WideWorldImportersMultidimensionalCube.dwproj", "{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Development|Default = Development|Default
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}.Development|Default.ActiveCfg = Development
-		{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}.Development|Default.Build.0 = Development
-		{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}.Development|Default.Deploy.0 = Development
+		{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}.Development|Default.ActiveCfg = Development
+		{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}.Development|Default.Build.0 = Development
+		{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}.Development|Default.Deploy.0 = Development
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WWI-SSASMD.database b/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WWI-SSASMD.database
index df743c28..7ebf0240 100644
--- a/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WWI-SSASMD.database
+++ b/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WWI-SSASMD.database
@@ -1,11 +1,11 @@
 <Database xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ddl2="http://schemas.microsoft.com/analysisservices/2003/engine/2" xmlns:ddl2_2="http://schemas.microsoft.com/analysisservices/2003/engine/2/2" xmlns:ddl100_100="http://schemas.microsoft.com/analysisservices/2008/engine/100/100" xmlns:ddl200="http://schemas.microsoft.com/analysisservices/2010/engine/200" xmlns:ddl200_200="http://schemas.microsoft.com/analysisservices/2010/engine/200/200" xmlns:ddl300="http://schemas.microsoft.com/analysisservices/2011/engine/300" xmlns:ddl300_300="http://schemas.microsoft.com/analysisservices/2011/engine/300/300" xmlns:ddl400="http://schemas.microsoft.com/analysisservices/2012/engine/400" xmlns:ddl400_400="http://schemas.microsoft.com/analysisservices/2012/engine/400/400" xmlns:ddl500="http://schemas.microsoft.com/analysisservices/2013/engine/500" xmlns:ddl500_500="http://schemas.microsoft.com/analysisservices/2013/engine/500/500" xmlns:dwd="http://schemas.microsoft.com/DataWarehouse/Designer/1.0" dwd:design-time-name="b941f541-69bc-4244-859a-ba62c19ca689" xmlns="http://schemas.microsoft.com/analysisservices/2003/engine">
   <ID>WWI-SSASMD</ID>
-  <Name>wwi-ssasmd</Name>
-  <CreatedTimestamp>0001-01-01T06:00:00Z</CreatedTimestamp>
-  <LastSchemaUpdate>0001-01-01T06:00:00Z</LastSchemaUpdate>
-  <LastProcessed>0001-01-01T06:00:00Z</LastProcessed>
+  <Name>WideWorldImportersMultidimensionalCube</Name>
+  <CreatedTimestamp>0001-01-01T08:00:00Z</CreatedTimestamp>
+  <LastSchemaUpdate>0001-01-01T08:00:00Z</LastSchemaUpdate>
+  <LastProcessed>0001-01-01T08:00:00Z</LastProcessed>
   <State>Unprocessed</State>
-  <LastUpdate>0001-01-01T06:00:00Z</LastUpdate>
+  <LastUpdate>0001-01-01T08:00:00Z</LastUpdate>
   <DataSourceImpersonationInfo>
     <ImpersonationMode>Default</ImpersonationMode>
     <ImpersonationInfoSecurity>Unchanged</ImpersonationInfoSecurity>
diff --git a/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WWI-SSASMD.dwproj b/samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WideWorldImportersMultidimensionalCube.dwproj
similarity index 100%
rename from samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WWI-SSASMD.dwproj
rename to samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd/WideWorldImportersMultidimensionalCube.dwproj
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WideWorldImporters.sqlproj b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WideWorldImporters.sqlproj
index e3e23273..1b0bfc28 100644
--- a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WideWorldImporters.sqlproj
+++ b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WideWorldImporters.sqlproj
@@ -146,6 +146,8 @@
     <Folder Include="PostDeploymentScripts" />
     <Folder Include="DataLoadSimulation\Functions\" />
     <Folder Include="DataLoadSimulation\Tables" />
+    <Folder Include="dbo" />
+    <Folder Include="dbo\Tables" />
   </ItemGroup>
   <ItemGroup>
     <Build Include="Warehouse\Tables\Colors.sql">
@@ -688,10 +690,10 @@
     <Build Include="DataLoadSimulation\Functions\GetBogativePhoneNumber.sql" />
     <Build Include="Application\Stored Procedures\Configuration_RemoveColumnstoreIndexing.sql" />
     <Build Include="Application\Stored Procedures\Configuration_DisableInMemory.sql" />
-    <Build Include="Application\Stored Procedures\Configuration_PrepareForDowngradeToStandard.sql" />
-    <Build Include="SampleVersion.sql" />
     <Build Include="DataLoadSimulation\Tables\ColdRoomTemperatures_temp.sql" />
     <Build Include="DataLoadSimulation\Stored Procedures\PopulateColdRoomTemperatures_temp.sql" />
+    <Build Include="dbo\Tables\SampleVersion.sql" />
+    <Build Include="Application\Stored Procedures\Configuration_PrepareForAzureStandard.sql" />
   </ItemGroup>
   <ItemGroup>
     <PostDeploy Include="PostDeploymentScripts\Script.PostDeployment1.sql" />
diff --git a/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/SampleVersion.sql b/samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/dbo/Tables/SampleVersion.sql
similarity index 100%
rename from samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/SampleVersion.sql
rename to samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/dbo/Tables/SampleVersion.sql