diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 163ded544..ed97b2f28 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -29,7 +29,7 @@
       <DotNetPath>$(Stage0Path)</DotNetPath>
 
       <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
-      <OutputDirectory>$(BaseOutputDirectory)/stage2</OutputDirectory>
+      <OutputDirectory>$(BaseOutputDirectory)/stage2/</OutputDirectory>
       <Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
       <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
diff --git a/build/package/Microsoft.DotNet.Cli.Archive.targets b/build/package/Microsoft.DotNet.Cli.Archive.targets
index 0caa18de8..f4f8b6383 100644
--- a/build/package/Microsoft.DotNet.Cli.Archive.targets
+++ b/build/package/Microsoft.DotNet.Cli.Archive.targets
@@ -10,18 +10,25 @@
 
     <ItemGroup>
       <GeneratedArchives Include="$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)" />
+
+      <GenerateArchivesInputsOutputs Include="%(LayoutDefinition.Name)">
+        <Inputs>%(LayoutDefinition.OutputFiles)</Inputs>
+        <Outputs>$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)</Outputs>
+        <InputDirectory>$(LayoutDirectory)/%(LayoutDefinition.Name)</InputDirectory>
+        <OutFileName>%(LayoutDefinition.NameWithVersion)</OutFileName>
+      </GenerateArchivesInputsOutputs>
     </ItemGroup>
   </Target>
 
   <Target Name="GenerateArchives" 
           DependsOnTargets="Init;Layout;SetupGenerateArchivesInputsOutputs" 
-          Inputs="@(LayoutDefinition -> '$(LayoutDirectory)/%(Name)')" 
-          Outputs="@(GeneratedArchives -> '%(Identity)')">
+          Inputs="%(GenerateArchivesInputsOutputs.Inputs)" 
+          Outputs="%(GenerateArchivesInputsOutputs.Outputs)">
 
     <ArchiveDirectory
-        FileName="%(LayoutDefinition.NameWithVersion)"
+        FileName="%(GenerateArchivesInputsOutputs.OutFileName)"
         OutputDirectory="$(ArchiveOutputDirectory)"
-        InputDirectory="$(LayoutDirectory)/%(LayoutDefinition.Name)" >
+        InputDirectory="$(LayoutDirectory)/%(GenerateArchivesInputsOutputs.InputDirectory)" >
 
         <Output TaskParameter="OutputArchive"
                 ItemName="Archives" />
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
index 9dce2263c..13bf3b7df 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     
-  <UsingTask TaskName="DebTargets" AssemblyFile="$(CLIBuildDll)" />
+    <UsingTask TaskName="DebTargets" AssemblyFile="$(CLIBuildDll)" />
 
-  <Target Name="GenerateSdkDeb" >
-    
-  </Target>
-
-  <Target Name="GenerateDebs"
-          DependsOnTargets="Init;
-                            Layout;
-                            GenerateSdkDeb;
-                            TestSdkDeb" />
+    <Target Name="GenerateDebs" >
+        <DebTargets />
+    </Target>
 
 </Project>
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets b/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
index 63cc98cc8..8823537d0 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
@@ -66,13 +66,25 @@
       <ItemGroup>
         <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
       </ItemGroup>
+
+      <ItemGroup>
+        <GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" />
+        <GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" />
+
+        <GenerateSdkProductArchiveInputs Include="$(SdkInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveResourcesDirectory)/**/*" />
+      </ItemGroup>
     </Target>
 
     <Target Name="GenerateSdkPkg" 
-            Inputs="$(SdkLayoutOutputDirectory);"
+            Inputs="@(GenerateSdkPkgInputs)"
             Outputs="$(SdkInstallerFile)"
             DependsOnTargets="Init;Layout;SetupPkgInputsOutputs"
-            Condition=" '%(OSName)' == 'osx' ">
+            Condition=" '$(OSName)' == 'osx' ">
       
       <Exec Command="pkgbuild
                      --root '$(SdkLayoutOutputDirectory)'
@@ -84,16 +96,10 @@
     </Target>
 
     <Target Name="GenerateSdkProductArchive"
-            Inputs="$(SdkInstallerFile);
-                    $(DownloadedSharedFrameworkInstallerFile);
-                    $(DownloadedHostFxrInstallerFile);
-                    $(DownloadedSharedHostInstallerFile);
-                    $(SdkProductArchiveDistributionTemplateFile);
-                    $(ResourcesPath)"
+            Inputs="@(GenerateSdkProductArchiveInputs)"
             Outputs="$(CombinedFrameworkSdkHostInstallerFile)"
             DependsOnTargets="GenerateSdkPkg"
-            Condition=" '%(OSName)' == 'osx' ">
-      
+            Condition=" '$(OSName)' == 'osx' ">
       <!-- Move ProductArchive pkg components into place with component ids in the filenames -->
       <Copy 
         SourceFiles="$(SdkInstallerFile);
@@ -103,8 +109,7 @@
         DestinationFiles="$(SdkPkgIntermediatePath);
                           $(SharedFrameworkPkgIntermediatePath);
                           $(HostFxrPkgIntermediatePath);
-                          $(SharedHostPkgIntermediatePath);"
-        Overwrite="true" />
+                          $(SharedHostPkgIntermediatePath);" />
       
       <!-- Fill out parameters in the Distribution Template -->
       <ReplaceFileContents
@@ -117,7 +122,7 @@
                      --version '$(SdkVersion)'
                      --identifier '$(SdkProductArchiveId)'
                      --package-path '$(PkgIntermediateDirectory)'
-                     --resources '$(ResourcesPath)'
+                     --resources '$(SdkProductArchiveResourcesDirectory)'
                      --distribution '$(SdkProductArchiveDistributionFile)'
                      '$(CombinedFrameworkSdkHostInstallerFile)'" />
     </Target>
@@ -128,6 +133,6 @@
                               SetupPkgInputsOutputs;
                               GenerateSdkPkg;
                               GenerateSdkProductArchive"
-            Condition=" '%(OSName)' == 'osx' " />
+            Condition=" '$(OSName)' == 'osx' " />
 
 </Project>
diff --git a/build/package/Microsoft.DotNet.Cli.Layout.targets b/build/package/Microsoft.DotNet.Cli.Layout.targets
index 4da8d42a2..694da724c 100644
--- a/build/package/Microsoft.DotNet.Cli.Layout.targets
+++ b/build/package/Microsoft.DotNet.Cli.Layout.targets
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
   
   <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
     <PropertyGroup>
@@ -9,8 +11,8 @@
     <!-- Set up Items with Layout Input Files -->
     <ItemGroup>
       <SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
-      <SdkDebugLayoutInput Include="$(SymbolsOutputDirectory)/sdk/**/*.pdb" />
-      <CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**" />
+      <SdkDebugLayoutInput Include="$(SymbolsOutputDirectory)/sdk/**/*" />
+      <CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
       <CombinedFrameworkSdkInput Include="$(OutputDirectory)/shared/**/*" />
       <CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" />
     </ItemGroup>
@@ -45,14 +47,14 @@
 
     <!-- Set up Items Defining Layouts for easy change -->
     <ItemGroup>
-      <LayoutDefinition Include="SdkName">
+      <LayoutDefinition Include="Sdk">
         <InputFiles>@(SdkLayoutInput)</InputFiles>
         <OutputFiles>@(SdkRelativeOutputFiles -> '$(SdkLayoutOutputDirectory)/%(Identity)')</OutputFiles>
         <NameWithVersion>$(ArtifactNameWithVersionSdk)</NameWithVersion>
         <Name>$(ArtifactNameSdk)</Name>
       </LayoutDefinition>
 
-      <LayoutDefinition Include="SdkDebug">
+      <LayoutDefinition Include="Debug">
         <InputFiles>@(SdkDebugLayoutInput)</InputFiles>
         <OutputFiles>@(SdkDebugRelativeOutputFiles -> '$(SdkDebugLayoutOutputDirectory)/%(Identity)')</OutputFiles>        
         <NameWithVersion>$(ArtifactNameWithVersionSdkDebug)</NameWithVersion>
@@ -77,7 +79,7 @@
   </Target>
 
   <Target Name="Layout" 
-          DependsOnTargets="Init;dotn"
+          DependsOnTargets="Init;SetupLayoutInputsOutputs"
           Inputs="@(LayoutDefinition -> '%(InputFiles)')" 
           Outputs="@(LayoutDefinition -> '%(OutputFiles)')" >