104 files changed, 34 insertions, 34 deletions

diff --git a/src/build_all.cmd b/src/build_all.cmd
index 59cecf2b..60502cdc 100644
--- a/src/build_all.cmd
+++ b/src/build_all.cmd
@@ -49,9 +49,9 @@ call wix\wix.cmd %_C% || exit /b
 call ext\ext.cmd %_C% || exit /b
 
 
-:: samples
+:: tools
 
-call samples\samples.cmd %_C% || exit /b
+call tools\tools.cmd %_C% || exit /b
 
 
 :: integration tests
diff --git a/src/samples/Directory.Build.props b/src/tools/Directory.Build.props
index 9e04afb6..3fdc6553 100644
--- a/src/samples/Directory.Build.props
+++ b/src/tools/Directory.Build.props
@@ -3,7 +3,7 @@
 
 <Project>
   <PropertyGroup>
-    <SegmentName>samples</SegmentName>
+    <SegmentName>tools</SegmentName>
   </PropertyGroup>
 
   <Import Project="..\Directory.Build.props" />
diff --git a/src/samples/Dtf/DDiff/CabDiffEngine.cs b/src/tools/Dtf/DDiff/CabDiffEngine.cs
index 6100ced8..b3bafaa3 100644
--- a/src/samples/Dtf/DDiff/CabDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/CabDiffEngine.cs
@@ -6,7 +6,7 @@ using System.Collections;
 using System.Collections.Generic;
 using WixToolset.Dtf.Compression.Cab;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public class CabDiffEngine : IDiffEngine
         {
diff --git a/src/samples/Dtf/DDiff/DDiff.cs b/src/tools/Dtf/DDiff/DDiff.cs
index 27a5a782..4e9121b6 100644
--- a/src/samples/Dtf/DDiff/DDiff.cs
+++ b/src/tools/Dtf/DDiff/DDiff.cs
@@ -4,7 +4,7 @@ using System;
 using System.IO;
 using System.Text;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public class DDiff
         {
diff --git a/src/samples/Dtf/DDiff/DDiff.csproj b/src/tools/Dtf/DDiff/DDiff.csproj
index 332ad4d0..bf4d6521 100644
--- a/src/samples/Dtf/DDiff/DDiff.csproj
+++ b/src/tools/Dtf/DDiff/DDiff.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <ProjectGuid>{1CDF4242-4C00-4744-BBCD-085128978FF3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>WixToolset.Dtf.Samples.DDiff</RootNamespace>
+    <RootNamespace>WixToolset.Dtf.Tools.DDiff</RootNamespace>
     <AssemblyName>DDiff</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
diff --git a/src/samples/Dtf/DDiff/DirectoryDiffEngine.cs b/src/tools/Dtf/DDiff/DirectoryDiffEngine.cs
index 89e8b47e..a5216f22 100644
--- a/src/samples/Dtf/DDiff/DirectoryDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/DirectoryDiffEngine.cs
@@ -4,7 +4,7 @@ using System;
 using System.IO;
 using System.Collections;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public class DirectoryDiffEngine : IDiffEngine
         {
diff --git a/src/samples/Dtf/DDiff/FileDiffEngine.cs b/src/tools/Dtf/DDiff/FileDiffEngine.cs
index 20ecd857..9eb197ea 100644
--- a/src/samples/Dtf/DDiff/FileDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/FileDiffEngine.cs
@@ -3,7 +3,7 @@
 using System;
 using System.IO;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public class FileDiffEngine : IDiffEngine
         {
diff --git a/src/samples/Dtf/DDiff/IDiffEngine.cs b/src/tools/Dtf/DDiff/IDiffEngine.cs
index 9895d6ff..918e42e6 100644
--- a/src/samples/Dtf/DDiff/IDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/IDiffEngine.cs
@@ -4,7 +4,7 @@ using System;
 using System.IO;
 using System.Collections;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public interface IDiffEngine
         {
diff --git a/src/samples/Dtf/DDiff/MsiDiffEngine.cs b/src/tools/Dtf/DDiff/MsiDiffEngine.cs
index 91bc2969..4e3b2c7b 100644
--- a/src/samples/Dtf/DDiff/MsiDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/MsiDiffEngine.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using WixToolset.Dtf.WindowsInstaller;
 using WixToolset.Dtf.WindowsInstaller.Package;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
     public class MsiDiffEngine : IDiffEngine
     {
diff --git a/src/samples/Dtf/DDiff/MspDiffEngine.cs b/src/tools/Dtf/DDiff/MspDiffEngine.cs
index 285bc83d..a32ab24a 100644
--- a/src/samples/Dtf/DDiff/MspDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/MspDiffEngine.cs
@@ -5,7 +5,7 @@ using System.IO;
 using WixToolset.Dtf.WindowsInstaller;
 using WixToolset.Dtf.WindowsInstaller.Package;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public class MspDiffEngine : MsiDiffEngine
         {
diff --git a/src/samples/Dtf/DDiff/TextFileDiffEngine.cs b/src/tools/Dtf/DDiff/TextFileDiffEngine.cs
index 22567023..beb5ea84 100644
--- a/src/samples/Dtf/DDiff/TextFileDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/TextFileDiffEngine.cs
@@ -4,7 +4,7 @@ using System;
 using System.IO;
 using System.Diagnostics;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public class TextFileDiffEngine : IDiffEngine
         {
diff --git a/src/samples/Dtf/DDiff/VersionedFileDiffEngine.cs b/src/tools/Dtf/DDiff/VersionedFileDiffEngine.cs
index ad4014f3..9a3e399f 100644
--- a/src/samples/Dtf/DDiff/VersionedFileDiffEngine.cs
+++ b/src/tools/Dtf/DDiff/VersionedFileDiffEngine.cs
@@ -4,7 +4,7 @@ using System;
 using System.IO;
 using WixToolset.Dtf.WindowsInstaller;
 
-namespace WixToolset.Dtf.Samples.DDiff
+namespace WixToolset.Dtf.Tools.DDiff
 {
         public class VersionedFileDiffEngine : IDiffEngine
         {
diff --git a/src/samples/Dtf/Documents/Guide/Content/about.htm b/src/tools/Dtf/Documents/Guide/Content/about.htm
index 393b5a81..393b5a81 100644
--- a/src/samples/Dtf/Documents/Guide/Content/about.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/about.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/buildingcas.htm b/src/tools/Dtf/Documents/Guide/Content/buildingcas.htm
index e88ad552..e88ad552 100644
--- a/src/samples/Dtf/Documents/Guide/Content/buildingcas.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/buildingcas.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/cabpack.htm b/src/tools/Dtf/Documents/Guide/Content/cabpack.htm
index 2d9f725e..2d9f725e 100644
--- a/src/samples/Dtf/Documents/Guide/Content/cabpack.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/cabpack.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/cabs.htm b/src/tools/Dtf/Documents/Guide/Content/cabs.htm
index e88d1e15..e88d1e15 100644
--- a/src/samples/Dtf/Documents/Guide/Content/cabs.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/cabs.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/cabwrapper.htm b/src/tools/Dtf/Documents/Guide/Content/cabwrapper.htm
index fd88437c..fd88437c 100644
--- a/src/samples/Dtf/Documents/Guide/Content/cabwrapper.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/cabwrapper.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/caconfig.htm b/src/tools/Dtf/Documents/Guide/Content/caconfig.htm
index a6c97d2b..a6c97d2b 100644
--- a/src/samples/Dtf/Documents/Guide/Content/caconfig.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/caconfig.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/caproxy.htm b/src/tools/Dtf/Documents/Guide/Content/caproxy.htm
index 2ee962d5..2ee962d5 100644
--- a/src/samples/Dtf/Documents/Guide/Content/caproxy.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/caproxy.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/databases.htm b/src/tools/Dtf/Documents/Guide/Content/databases.htm
index 4fe1fba9..4fe1fba9 100644
--- a/src/samples/Dtf/Documents/Guide/Content/databases.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/databases.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/debuggingcas.htm b/src/tools/Dtf/Documents/Guide/Content/debuggingcas.htm
index ca1be161..ca1be161 100644
--- a/src/samples/Dtf/Documents/Guide/Content/debuggingcas.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/debuggingcas.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/dependencies.htm b/src/tools/Dtf/Documents/Guide/Content/dependencies.htm
index cfec5880..cfec5880 100644
--- a/src/samples/Dtf/Documents/Guide/Content/dependencies.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/dependencies.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/filepatchwrapper.htm b/src/tools/Dtf/Documents/Guide/Content/filepatchwrapper.htm
index 6bab69b5..6bab69b5 100644
--- a/src/samples/Dtf/Documents/Guide/Content/filepatchwrapper.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/filepatchwrapper.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/history.htm b/src/tools/Dtf/Documents/Guide/Content/history.htm
index 704ce875..704ce875 100644
--- a/src/samples/Dtf/Documents/Guide/Content/history.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/history.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/installutil.htm b/src/tools/Dtf/Documents/Guide/Content/installutil.htm
index e235a7b6..e235a7b6 100644
--- a/src/samples/Dtf/Documents/Guide/Content/installutil.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/installutil.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/inventory.htm b/src/tools/Dtf/Documents/Guide/Content/inventory.htm
index 40a6ef74..40a6ef74 100644
--- a/src/samples/Dtf/Documents/Guide/Content/inventory.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/inventory.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/managedcas.htm b/src/tools/Dtf/Documents/Guide/Content/managedcas.htm
index 9cce0432..9cce0432 100644
--- a/src/samples/Dtf/Documents/Guide/Content/managedcas.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/managedcas.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/msihelper.htm b/src/tools/Dtf/Documents/Guide/Content/msihelper.htm
index c1493117..c1493117 100644
--- a/src/samples/Dtf/Documents/Guide/Content/msihelper.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/msihelper.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/msiwrapper.htm b/src/tools/Dtf/Documents/Guide/Content/msiwrapper.htm
index 70190ac4..70190ac4 100644
--- a/src/samples/Dtf/Documents/Guide/Content/msiwrapper.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/msiwrapper.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/packages.htm b/src/tools/Dtf/Documents/Guide/Content/packages.htm
index aa521685..aa521685 100644
--- a/src/samples/Dtf/Documents/Guide/Content/packages.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/packages.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/powerdiff.htm b/src/tools/Dtf/Documents/Guide/Content/powerdiff.htm
index f420b47e..f420b47e 100644
--- a/src/samples/Dtf/Documents/Guide/Content/powerdiff.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/powerdiff.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/samplecas.htm b/src/tools/Dtf/Documents/Guide/Content/samplecas.htm
index 4dfed6f0..4dfed6f0 100644
--- a/src/samples/Dtf/Documents/Guide/Content/samplecas.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/samplecas.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/samples.htm b/src/tools/Dtf/Documents/Guide/Content/samples.htm
index 3bcd379a..3bcd379a 100644
--- a/src/samples/Dtf/Documents/Guide/Content/samples.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/samples.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/support.htm b/src/tools/Dtf/Documents/Guide/Content/support.htm
index 89acbadf..89acbadf 100644
--- a/src/samples/Dtf/Documents/Guide/Content/support.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/support.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/using.htm b/src/tools/Dtf/Documents/Guide/Content/using.htm
index 6fe960e8..6fe960e8 100644
--- a/src/samples/Dtf/Documents/Guide/Content/using.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/using.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/whatsnew.htm b/src/tools/Dtf/Documents/Guide/Content/whatsnew.htm
index 3efe67bd..3efe67bd 100644
--- a/src/samples/Dtf/Documents/Guide/Content/whatsnew.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/whatsnew.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/wifile.htm b/src/tools/Dtf/Documents/Guide/Content/wifile.htm
index 20998b73..20998b73 100644
--- a/src/samples/Dtf/Documents/Guide/Content/wifile.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/wifile.htm
diff --git a/src/samples/Dtf/Documents/Guide/Content/writingcas.htm b/src/tools/Dtf/Documents/Guide/Content/writingcas.htm
index 6beccf5f..6beccf5f 100644
--- a/src/samples/Dtf/Documents/Guide/Content/writingcas.htm
+++ b/src/tools/Dtf/Documents/Guide/Content/writingcas.htm
diff --git a/src/samples/Dtf/Documents/Guide/DTF.hhc b/src/tools/Dtf/Documents/Guide/DTF.hhc
index bf43e447..bf43e447 100644
--- a/src/samples/Dtf/Documents/Guide/DTF.hhc
+++ b/src/tools/Dtf/Documents/Guide/DTF.hhc
diff --git a/src/samples/Dtf/Documents/Guide/DTF.hhk b/src/tools/Dtf/Documents/Guide/DTF.hhk
index bc6e49b3..bc6e49b3 100644
--- a/src/samples/Dtf/Documents/Guide/DTF.hhk
+++ b/src/tools/Dtf/Documents/Guide/DTF.hhk
diff --git a/src/samples/Dtf/Documents/Guide/DTF.hhp b/src/tools/Dtf/Documents/Guide/DTF.hhp
index e9b8ad90..e9b8ad90 100644
--- a/src/samples/Dtf/Documents/Guide/DTF.hhp
+++ b/src/tools/Dtf/Documents/Guide/DTF.hhp
diff --git a/src/samples/Dtf/Documents/Guide/dtfguide.helpproj b/src/tools/Dtf/Documents/Guide/dtfguide.helpproj
index 4df2765d..4df2765d 100644
--- a/src/samples/Dtf/Documents/Guide/dtfguide.helpproj
+++ b/src/tools/Dtf/Documents/Guide/dtfguide.helpproj
diff --git a/src/samples/Dtf/Documents/Guide/styles/presentation.css b/src/tools/Dtf/Documents/Guide/styles/presentation.css
index b71c8582..b71c8582 100644
--- a/src/samples/Dtf/Documents/Guide/styles/presentation.css
+++ b/src/tools/Dtf/Documents/Guide/styles/presentation.css
diff --git a/src/samples/Dtf/Documents/Reference/Compression.htm b/src/tools/Dtf/Documents/Reference/Compression.htm
index 7782bea1..7782bea1 100644
--- a/src/samples/Dtf/Documents/Reference/Compression.htm
+++ b/src/tools/Dtf/Documents/Reference/Compression.htm
diff --git a/src/samples/Dtf/Documents/Reference/Compression1.png b/src/tools/Dtf/Documents/Reference/Compression1.png
index 5b2e177f..5b2e177f 100644
--- a/src/samples/Dtf/Documents/Reference/Compression1.png
+++ b/src/tools/Dtf/Documents/Reference/Compression1.png
diff --git a/src/samples/Dtf/Documents/Reference/Compression2.png b/src/tools/Dtf/Documents/Reference/Compression2.png
index 394a5f18..394a5f18 100644
--- a/src/samples/Dtf/Documents/Reference/Compression2.png
+++ b/src/tools/Dtf/Documents/Reference/Compression2.png
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller.htm b/src/tools/Dtf/Documents/Reference/WindowsInstaller.htm
index 28990ce4..28990ce4 100644
--- a/src/samples/Dtf/Documents/Reference/WindowsInstaller.htm
+++ b/src/tools/Dtf/Documents/Reference/WindowsInstaller.htm
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller1.png b/src/tools/Dtf/Documents/Reference/WindowsInstaller1.png
index cc769cc7..cc769cc7 100644
--- a/src/samples/Dtf/Documents/Reference/WindowsInstaller1.png
+++ b/src/tools/Dtf/Documents/Reference/WindowsInstaller1.png
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller2.png b/src/tools/Dtf/Documents/Reference/WindowsInstaller2.png
index 0c11e501..0c11e501 100644
--- a/src/samples/Dtf/Documents/Reference/WindowsInstaller2.png
+++ b/src/tools/Dtf/Documents/Reference/WindowsInstaller2.png
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller3.png b/src/tools/Dtf/Documents/Reference/WindowsInstaller3.png
index 68acd7d8..68acd7d8 100644
--- a/src/samples/Dtf/Documents/Reference/WindowsInstaller3.png
+++ b/src/tools/Dtf/Documents/Reference/WindowsInstaller3.png
diff --git a/src/samples/Dtf/Documents/Reference/dtfref.shfbproj b/src/tools/Dtf/Documents/Reference/dtfref.shfbproj
index e45d2a07..e45d2a07 100644
--- a/src/samples/Dtf/Documents/Reference/dtfref.shfbproj
+++ b/src/tools/Dtf/Documents/Reference/dtfref.shfbproj
diff --git a/src/samples/Dtf/Documents/Reference/helplink.js b/src/tools/Dtf/Documents/Reference/helplink.js
index a4989824..a4989824 100644
--- a/src/samples/Dtf/Documents/Reference/helplink.js
+++ b/src/tools/Dtf/Documents/Reference/helplink.js
diff --git a/src/samples/Dtf/Inventory/Columns.resx b/src/tools/Dtf/Inventory/Columns.resx
index cfeb11e3..cfeb11e3 100644
--- a/src/samples/Dtf/Inventory/Columns.resx
+++ b/src/tools/Dtf/Inventory/Columns.resx
diff --git a/src/samples/Dtf/Inventory/Features.cs b/src/tools/Dtf/Inventory/Features.cs
index c114da86..9d2747ba 100644
--- a/src/samples/Dtf/Inventory/Features.cs
+++ b/src/tools/Dtf/Inventory/Features.cs
@@ -9,7 +9,7 @@ using System.Globalization;
 using System.Windows.Forms;
 using WixToolset.Dtf.WindowsInstaller;
 
-namespace WixToolset.Dtf.Samples.Inventory
+namespace WixToolset.Dtf.Tools.Inventory
 {
         /// <summary>
         /// Provides inventory data about features of products installed on the system.
diff --git a/src/samples/Dtf/Inventory/IInventoryDataProvider.cs b/src/tools/Dtf/Inventory/IInventoryDataProvider.cs
index 23f2c187..affcb358 100644
--- a/src/samples/Dtf/Inventory/IInventoryDataProvider.cs
+++ b/src/tools/Dtf/Inventory/IInventoryDataProvider.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Data;
 
-namespace WixToolset.Dtf.Samples.Inventory
+namespace WixToolset.Dtf.Tools.Inventory
 {
         /// <summary>
         /// Reports the total number of items loaded so far by <see cref="IInventoryDataProvider.GetNodes"/>.
diff --git a/src/samples/Dtf/Inventory/Inventory.cs b/src/tools/Dtf/Inventory/Inventory.cs
index 02793be8..07735086 100644
--- a/src/samples/Dtf/Inventory/Inventory.cs
+++ b/src/tools/Dtf/Inventory/Inventory.cs
@@ -22,7 +22,7 @@ using System.Data;
 [assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode=true)]
 
 
-namespace WixToolset.Dtf.Samples.Inventory
+namespace WixToolset.Dtf.Tools.Inventory
 {
         public class Inventory : System.Windows.Forms.Form
         {
diff --git a/src/samples/Dtf/Inventory/Inventory.csproj b/src/tools/Dtf/Inventory/Inventory.csproj
index 6dc1cfd3..57bae907 100644
--- a/src/samples/Dtf/Inventory/Inventory.csproj
+++ b/src/tools/Dtf/Inventory/Inventory.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <ProjectGuid>{51480F8E-B80F-42DC-91E7-3542C1F12F8C}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>WixToolset.Dtf.Samples.Inventory</RootNamespace>
+    <RootNamespace>WixToolset.Dtf.Tools.Inventory</RootNamespace>
     <AssemblyName>Inventory</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <ApplicationIcon>Inventory.ico</ApplicationIcon>
diff --git a/src/samples/Dtf/Inventory/Inventory.ico b/src/tools/Dtf/Inventory/Inventory.ico
index d5757f7a..d5757f7a 100644
--- a/src/samples/Dtf/Inventory/Inventory.ico
+++ b/src/tools/Dtf/Inventory/Inventory.ico
diff --git a/src/samples/Dtf/Inventory/Inventory.resx b/src/tools/Dtf/Inventory/Inventory.resx
index 9aeb4d2c..9aeb4d2c 100644
--- a/src/samples/Dtf/Inventory/Inventory.resx
+++ b/src/tools/Dtf/Inventory/Inventory.resx
diff --git a/src/samples/Dtf/Inventory/components.cs b/src/tools/Dtf/Inventory/components.cs
index c5147084..b516af46 100644
--- a/src/samples/Dtf/Inventory/components.cs
+++ b/src/tools/Dtf/Inventory/components.cs
@@ -12,7 +12,7 @@ using Microsoft.Win32;
 using WixToolset.Dtf.WindowsInstaller;
 using View = WixToolset.Dtf.WindowsInstaller.View;
 
-namespace WixToolset.Dtf.Samples.Inventory
+namespace WixToolset.Dtf.Tools.Inventory
 {
         /// <summary>
         /// Provides inventory data about components of products installed on the system.
diff --git a/src/samples/Dtf/Inventory/msiutils.cs b/src/tools/Dtf/Inventory/msiutils.cs
index a345e194..189d28a9 100644
--- a/src/samples/Dtf/Inventory/msiutils.cs
+++ b/src/tools/Dtf/Inventory/msiutils.cs
@@ -5,7 +5,7 @@ using System.Collections;
 using WixToolset.Dtf.WindowsInstaller;
 
 
-namespace WixToolset.Dtf.Samples.Inventory
+namespace WixToolset.Dtf.Tools.Inventory
 {
         public class MsiUtils
         {
diff --git a/src/samples/Dtf/Inventory/patches.cs b/src/tools/Dtf/Inventory/patches.cs
index f01a4798..ca96a97d 100644
--- a/src/samples/Dtf/Inventory/patches.cs
+++ b/src/tools/Dtf/Inventory/patches.cs
@@ -9,7 +9,7 @@ using System.Globalization;
 using System.Windows.Forms;
 using WixToolset.Dtf.WindowsInstaller;
 
-namespace WixToolset.Dtf.Samples.Inventory
+namespace WixToolset.Dtf.Tools.Inventory
 {
         /// <summary>
         /// Provides inventory data about patches installed on the system.
diff --git a/src/samples/Dtf/Inventory/products.cs b/src/tools/Dtf/Inventory/products.cs
index 872c56c3..635e5439 100644
--- a/src/samples/Dtf/Inventory/products.cs
+++ b/src/tools/Dtf/Inventory/products.cs
@@ -7,7 +7,7 @@ using System.Collections;
 using System.Windows.Forms;
 using WixToolset.Dtf.WindowsInstaller;
 
-namespace WixToolset.Dtf.Samples.Inventory
+namespace WixToolset.Dtf.Tools.Inventory
 {
         /// <summary>
         /// Provides inventory data about products installed or advertised on the system.
diff --git a/src/samples/Dtf/Inventory/xp.manifest b/src/tools/Dtf/Inventory/xp.manifest
index 34d61fea..34d61fea 100644
--- a/src/samples/Dtf/Inventory/xp.manifest
+++ b/src/tools/Dtf/Inventory/xp.manifest
diff --git a/src/samples/Dtf/WiFile/WiFile.cs b/src/tools/Dtf/WiFile/WiFile.cs
index 1e5c80df..1e5c80df 100644
--- a/src/samples/Dtf/WiFile/WiFile.cs
+++ b/src/tools/Dtf/WiFile/WiFile.cs
diff --git a/src/samples/Dtf/WiFile/WiFile.csproj b/src/tools/Dtf/WiFile/WiFile.csproj
index b5a95481..c8d39235 100644
--- a/src/samples/Dtf/WiFile/WiFile.csproj
+++ b/src/tools/Dtf/WiFile/WiFile.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <ProjectGuid>{AE562F7F-EE33-41D6-A962-DA488FEFBD08}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>WixToolset.Dtf.Samples.WiFile</RootNamespace>
+    <RootNamespace>WixToolset.Dtf.Tools.WiFile</RootNamespace>
     <AssemblyName>WiFile</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
diff --git a/src/samples/Dtf/XPack/AssemblyInfo.cs b/src/tools/Dtf/XPack/AssemblyInfo.cs
index 6dfb9437..6dfb9437 100644
--- a/src/samples/Dtf/XPack/AssemblyInfo.cs
+++ b/src/tools/Dtf/XPack/AssemblyInfo.cs
diff --git a/src/samples/Dtf/XPack/XPack.cs b/src/tools/Dtf/XPack/XPack.cs
index 36543a73..cc52bb7d 100644
--- a/src/samples/Dtf/XPack/XPack.cs
+++ b/src/tools/Dtf/XPack/XPack.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Dtf.Samples.XPack
+namespace WixToolset.Dtf.Tools.XPack
 {
     using System;
     using System.IO;
diff --git a/src/samples/Dtf/XPack/XPack.csproj b/src/tools/Dtf/XPack/XPack.csproj
index 778c2d94..3e76de2e 100644
--- a/src/samples/Dtf/XPack/XPack.csproj
+++ b/src/tools/Dtf/XPack/XPack.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <ProjectGuid>{03E55D95-DABE-4571-9CDA-92A44F92A465}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>WixToolset.Dtf.Samples.XPack</RootNamespace>
+    <RootNamespace>WixToolset.Dtf.Tools.XPack</RootNamespace>
     <AssemblyName>XPack</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
diff --git a/src/samples/ThmViewerPackage/Package.wxs b/src/tools/ThmViewerPackage/Package.wxs
index dae6a9d0..dae6a9d0 100644
--- a/src/samples/ThmViewerPackage/Package.wxs
+++ b/src/tools/ThmViewerPackage/Package.wxs
diff --git a/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj b/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj
index 9b2a2b02..9b2a2b02 100644
--- a/src/samples/ThmViewerPackage/ThmViewerPackage.wixproj
+++ b/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj
diff --git a/src/samples/WixToolset.Templates/WixToolset.Templates.csproj b/src/tools/WixToolset.Templates/WixToolset.Templates.csproj
index 00b6c6d3..00b6c6d3 100644
--- a/src/samples/WixToolset.Templates/WixToolset.Templates.csproj
+++ b/src/tools/WixToolset.Templates/WixToolset.Templates.csproj
diff --git a/src/samples/WixToolset.Templates/templates/FragmentItem/.template.config/template.json b/src/tools/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
index 2bd67b11..2bd67b11 100644
--- a/src/samples/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
+++ b/src/tools/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
diff --git a/src/samples/WixToolset.Templates/templates/FragmentItem/Fragment.wxs b/src/tools/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
index 12e1bfc3..12e1bfc3 100644
--- a/src/samples/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
+++ b/src/tools/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
diff --git a/src/samples/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj b/src/tools/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
index c3536151..c3536151 100644
--- a/src/samples/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
+++ b/src/tools/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
diff --git a/src/samples/WixToolset.Templates/templates/LibraryProject/.template.config/template.json b/src/tools/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
index ddfa82e9..ddfa82e9 100644
--- a/src/samples/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
+++ b/src/tools/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
diff --git a/src/samples/WixToolset.Templates/templates/LibraryProject/Fragment.wxs b/src/tools/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
index 12e1bfc3..12e1bfc3 100644
--- a/src/samples/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
+++ b/src/tools/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
diff --git a/src/samples/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj b/src/tools/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
index cc813aab..cc813aab 100644
--- a/src/samples/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
+++ b/src/tools/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
diff --git a/src/samples/WixToolset.Templates/templates/ModuleProject/.template.config/template.json b/src/tools/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
index 2be72f83..2be72f83 100644
--- a/src/samples/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
+++ b/src/tools/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
diff --git a/src/samples/WixToolset.Templates/templates/ModuleProject/Module.wxs b/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
index 592c844d..592c844d 100644
--- a/src/samples/WixToolset.Templates/templates/ModuleProject/Module.wxs
+++ b/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
diff --git a/src/samples/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj b/src/tools/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
index 17640703..17640703 100644
--- a/src/samples/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
+++ b/src/tools/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
diff --git a/src/samples/WixToolset.Templates/templates/PackageProject/.template.config/template.json b/src/tools/WixToolset.Templates/templates/PackageProject/.template.config/template.json
index d12f3109..d12f3109 100644
--- a/src/samples/WixToolset.Templates/templates/PackageProject/.template.config/template.json
+++ b/src/tools/WixToolset.Templates/templates/PackageProject/.template.config/template.json
diff --git a/src/samples/WixToolset.Templates/templates/PackageProject/Package.wxs b/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
index ac69e549..ac69e549 100644
--- a/src/samples/WixToolset.Templates/templates/PackageProject/Package.wxs
+++ b/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
diff --git a/src/samples/burn/ManagedBundleRunner/BundleErrorEventArgs.cs b/src/tools/burn/ManagedBundleRunner/BundleErrorEventArgs.cs
index 2c377326..964b976e 100644
--- a/src/samples/burn/ManagedBundleRunner/BundleErrorEventArgs.cs
+++ b/src/tools/burn/ManagedBundleRunner/BundleErrorEventArgs.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace Wix.Samples
+namespace WixToolset.Tools
 {
     using System;
 
diff --git a/src/samples/burn/ManagedBundleRunner/BundleProgressEventArgs.cs b/src/tools/burn/ManagedBundleRunner/BundleProgressEventArgs.cs
index ed42b5b1..2add7cca 100644
--- a/src/samples/burn/ManagedBundleRunner/BundleProgressEventArgs.cs
+++ b/src/tools/burn/ManagedBundleRunner/BundleProgressEventArgs.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace Wix.Samples
+namespace WixToolset.Tools
 {
     using System;
 
diff --git a/src/samples/burn/ManagedBundleRunner/BundleResult.cs b/src/tools/burn/ManagedBundleRunner/BundleResult.cs
index c32644f4..5df0d699 100644
--- a/src/samples/burn/ManagedBundleRunner/BundleResult.cs
+++ b/src/tools/burn/ManagedBundleRunner/BundleResult.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace Wix.Samples
+namespace WixToolset.Tools
 {
     /// <summary>
     /// Result codes.
diff --git a/src/samples/burn/ManagedBundleRunner/BundleRunner.cs b/src/tools/burn/ManagedBundleRunner/BundleRunner.cs
index e2089787..98d92c66 100644
--- a/src/samples/burn/ManagedBundleRunner/BundleRunner.cs
+++ b/src/tools/burn/ManagedBundleRunner/BundleRunner.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace Wix.Samples
+namespace WixToolset.Tools
 {
     using System;
     using System.Diagnostics;
diff --git a/src/samples/burn/runbundle/AssemblyInfo.cs b/src/tools/burn/runbundle/AssemblyInfo.cs
index 3a66d5e3..3a66d5e3 100644
--- a/src/samples/burn/runbundle/AssemblyInfo.cs
+++ b/src/tools/burn/runbundle/AssemblyInfo.cs
diff --git a/src/samples/burn/runbundle/Program.cs b/src/tools/burn/runbundle/Program.cs
index 8edca5dc..fd36c2ca 100644
--- a/src/samples/burn/runbundle/Program.cs
+++ b/src/tools/burn/runbundle/Program.cs
@@ -1,10 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace Wix.Samples
+namespace WixToolset.Tools
 {
     using System;
     using System.Linq;
-    using Wix.Samples;
+    using WixToolset.Tools;
 
     /// <summary>
     /// Example executable that installs then immediately uninstalls a bundle showing progress.
diff --git a/src/samples/thmviewer/Resources/LoremIpsum.rtf b/src/tools/thmviewer/Resources/LoremIpsum.rtf
index 1ab0e65b..1ab0e65b 100644
--- a/src/samples/thmviewer/Resources/LoremIpsum.rtf
+++ b/src/tools/thmviewer/Resources/LoremIpsum.rtf
diff --git a/src/samples/thmviewer/Resources/thm.xml b/src/tools/thmviewer/Resources/thm.xml
index 6394f0f1..6394f0f1 100644
--- a/src/samples/thmviewer/Resources/thm.xml
+++ b/src/tools/thmviewer/Resources/thm.xml
diff --git a/src/samples/thmviewer/display.cpp b/src/tools/thmviewer/display.cpp
index 444c6cfb..444c6cfb 100644
--- a/src/samples/thmviewer/display.cpp
+++ b/src/tools/thmviewer/display.cpp
diff --git a/src/samples/thmviewer/load.cpp b/src/tools/thmviewer/load.cpp
index 0267402a..0267402a 100644
--- a/src/samples/thmviewer/load.cpp
+++ b/src/tools/thmviewer/load.cpp
diff --git a/src/samples/thmviewer/precomp.cpp b/src/tools/thmviewer/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/samples/thmviewer/precomp.cpp
+++ b/src/tools/thmviewer/precomp.cpp
diff --git a/src/samples/thmviewer/precomp.h b/src/tools/thmviewer/precomp.h
index 762a0623..762a0623 100644
--- a/src/samples/thmviewer/precomp.h
+++ b/src/tools/thmviewer/precomp.h
diff --git a/src/samples/thmviewer/resource.h b/src/tools/thmviewer/resource.h
index 4acc32cc..4acc32cc 100644
--- a/src/samples/thmviewer/resource.h
+++ b/src/tools/thmviewer/resource.h
diff --git a/src/samples/thmviewer/thmviewer.cpp b/src/tools/thmviewer/thmviewer.cpp
index 38f3c4dc..38f3c4dc 100644
--- a/src/samples/thmviewer/thmviewer.cpp
+++ b/src/tools/thmviewer/thmviewer.cpp
diff --git a/src/samples/thmviewer/thmviewer.manifest b/src/tools/thmviewer/thmviewer.manifest
index 4663b61c..4663b61c 100644
--- a/src/samples/thmviewer/thmviewer.manifest
+++ b/src/tools/thmviewer/thmviewer.manifest
diff --git a/src/samples/thmviewer/thmviewer.rc b/src/tools/thmviewer/thmviewer.rc
index dc6d7242..dc6d7242 100644
--- a/src/samples/thmviewer/thmviewer.rc
+++ b/src/tools/thmviewer/thmviewer.rc
diff --git a/src/samples/thmviewer/thmviewer.v3.ncrunchproject b/src/tools/thmviewer/thmviewer.v3.ncrunchproject
index 3cffd6ce..3cffd6ce 100644
--- a/src/samples/thmviewer/thmviewer.v3.ncrunchproject
+++ b/src/tools/thmviewer/thmviewer.v3.ncrunchproject
diff --git a/src/samples/thmviewer/thmviewer.vcxproj b/src/tools/thmviewer/thmviewer.vcxproj
index 3fd87878..3fd87878 100644
--- a/src/samples/thmviewer/thmviewer.vcxproj
+++ b/src/tools/thmviewer/thmviewer.vcxproj
diff --git a/src/samples/thmviewer/thmviewer.vcxproj.filters b/src/tools/thmviewer/thmviewer.vcxproj.filters
index 488d5510..488d5510 100644
--- a/src/samples/thmviewer/thmviewer.vcxproj.filters
+++ b/src/tools/thmviewer/thmviewer.vcxproj.filters
diff --git a/src/samples/samples.cmd b/src/tools/tools.cmd
index 5d77270e..4764a8fe 100644
--- a/src/samples/samples.cmd
+++ b/src/tools/tools.cmd
@@ -6,13 +6,13 @@
 @if /i "%1"=="release" set _C=Release
 @if not "%1"=="" shift & goto parse_args
 
-@echo Building samples %_C%
+@echo Building tools %_C%
 
-:: samples
+:: tools
 
 nuget restore || exit /b
 
-msbuild -t:Build -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\samples_build.binlog || exit /b
+msbuild -t:Build -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\tools_build.binlog || exit /b
 
 @popd
 @endlocal
diff --git a/src/samples/samples.sln b/src/tools/tools.sln
index fab825cf..4da1e8fd 100644
--- a/src/samples/samples.sln
+++ b/src/tools/tools.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30711.63