Support MSI backends creating custom tables and remove WixToolset.Data.WindowsInstaller

102 files changed, 894 insertions, 9258 deletions

diff --git a/src/WixToolset.Data.WindowsInstaller/RowIndexedList.cs b/src/WixToolset.Core.Burn/RowIndexedList.cs
index 27c43a81..3a4dad38 100644
--- a/src/WixToolset.Data.WindowsInstaller/RowIndexedList.cs
+++ b/src/WixToolset.Core.Burn/RowIndexedList.cs
@@ -1,9 +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 WixToolset.Data
+namespace WixToolset.Core.Burn
 {
     using System;
     using System.Collections.Generic;
+    using WixToolset.Data.WindowsInstaller;
 
     /// <summary>
     /// A list of rows indexed by their primary key. Unlike a <see cref="RowDictionary"/>
diff --git a/src/WixToolset.Data.WindowsInstaller/TableExtensions.cs b/src/WixToolset.Core.Burn/TableExtensions.cs
index 1be64ffe..465bf870 100644
--- a/src/WixToolset.Data.WindowsInstaller/TableExtensions.cs
+++ b/src/WixToolset.Core.Burn/TableExtensions.cs
@@ -1,9 +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 WixToolset.Data
+namespace WixToolset.Core.Burn
 {
     using System.Collections.Generic;
     using System.Linq;
+    using WixToolset.Data.WindowsInstaller;
 
     /// <summary>
     /// Methods that extend <see cref="Table"/>.
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 012998e6..9e30aed2 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -10,6 +10,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
 
@@ -21,7 +22,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         // As outlined in RFC 4122, this is our namespace for generating name-based (version 3) UUIDs.
         internal static readonly Guid WixComponentGuidNamespace = new Guid("{3064E5C6-FB63-4FE9-AC49-E446A792EFA5}");
 
-        public BindDatabaseCommand(IBindContext context, Validator validator)
+        public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendExtension> backendExtension, Validator validator)
         {
             this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions();
 
@@ -40,7 +41,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.Validator = validator;
             this.WixVariableResolver = context.WixVariableResolver;
 
-            this.BackendExtensions = context.ExtensionManager.Create<IWindowsInstallerBackendExtension>();
+            this.BackendExtensions = backendExtension;
         }
 
         private IEnumerable<BindPath> BindPaths { get; }
@@ -298,7 +299,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // Try to put as much above here as possible, updating the IR is better.
             Output output;
             {
-                var command = new CreateOutputFromIRCommand(section, this.TableDefinitions);
+                var command = new CreateOutputFromIRCommand(section, this.TableDefinitions, this.BackendExtensions);
                 command.Execute();
 
                 output = command.Output;
@@ -313,13 +314,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // Modularize identifiers and add tables with real streams to the import tables.
             if (OutputType.Module == output.Type)
             {
-                // Gather all the suppress modularization identifiers
-                var suppressModularizationIdentifiers = new HashSet<string>(section.Tuples.OfType<WixSuppressModularizationTuple>().Select(s => s.WixSuppressModularization));
-
-                foreach (var table in output.Tables)
-                {
-                    table.Modularize(modularizationGuid, suppressModularizationIdentifiers);
-                }
+                var command = new ModularaizeCommand(output, modularizationGuid, section.Tuples.OfType<WixSuppressModularizationTuple>());
+                command.Execute();
             }
 
 #if TODO_FINISH_UPDATE
@@ -897,7 +893,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 Dictionary<string, bool> componentGuidConditions = new Dictionary<string, bool>(componentTable.Rows.Count);
 
-                foreach (Data.Rows.ComponentRow row in componentTable.Rows)
+                foreach (Data.WindowsInstaller.Rows.ComponentRow row in componentTable.Rows)
                 {
                     // we don't care about unmanaged components and if there's a * GUID remaining,
                     // there's already an error that prevented it from being replaced with a real GUID.
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
index b4027834..49440cea 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
@@ -10,6 +10,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Extensibility;
     using WixToolset.Msi;
     using WixToolset.Core.Native;
+    using WixToolset.Data.WindowsInstaller;
 
     internal class BindTransformCommand
     {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs
index 0dcddb99..559d440c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs
@@ -5,12 +5,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
-    using WixToolset.Data;
-    using WixToolset.Data.Rows;
-    using WixToolset.Extensibility;
-    using WixToolset.Core.Native;
     using WixToolset.Core.Bind;
+    using WixToolset.Core.Native;
+    using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
+    using WixToolset.Extensibility;
 
     internal class CopyTransformDataCommand
     {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index a449397d..0aa50bd9 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -12,8 +12,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Core.Bind;
     using WixToolset.Data;
     using WixToolset.Data.Bind;
-    using WixToolset.Data.Rows;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
     using WixToolset.Extensibility;
 
     /// <summary>
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs
new file mode 100644
index 00000000..1fc7d068
--- /dev/null
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs
@@ -0,0 +1,228 @@
+// 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.Core.WindowsInstaller.Bind
+{
+    using System;
+    using System.Globalization;
+    using System.IO;
+    using System.Text;
+    using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
+
+    internal class CreateIdtFileCommand
+    {
+        public CreateIdtFileCommand(Table table, int codepage, string intermediateFolder, bool keepAddedColumns)
+        {
+            this.Table = table;
+            this.Codepage = codepage;
+            this.IntermediateFolder = intermediateFolder;
+            this.KeepAddedColumns = keepAddedColumns;
+        }
+
+        private Table Table { get; }
+
+        private int Codepage { get; set; }
+
+        private string IntermediateFolder { get; }
+
+        private bool KeepAddedColumns { get; }
+
+        public string IdtPath { get; private set; }
+
+        public void Execute()
+        {
+            // write out the table to an IDT file
+            Encoding encoding;
+
+            // If UTF8 encoding, use the UTF8-specific constructor to avoid writing
+            // the byte order mark at the beginning of the file
+            if (this.Codepage == Encoding.UTF8.CodePage)
+            {
+                encoding = new UTF8Encoding(false, true);
+            }
+            else
+            {
+                if (this.Codepage == 0)
+                {
+                    this.Codepage = Encoding.ASCII.CodePage;
+                }
+
+                encoding = Encoding.GetEncoding(this.Codepage, new EncoderExceptionFallback(), new DecoderExceptionFallback());
+            }
+
+            this.IdtPath = Path.Combine(this.IntermediateFolder, String.Concat(this.Table.Name, ".idt"));
+
+            using (var idtWriter = new StreamWriter(this.IdtPath, false, encoding))
+            {
+                this.TableToIdtDefinition(this.Table, idtWriter, this.KeepAddedColumns);
+            }
+        }
+
+        private void TableToIdtDefinition(Table table, StreamWriter writer, bool keepAddedColumns)
+        {
+            if (table.Definition.Unreal)
+            {
+                return;
+            }
+
+            if (TableDefinition.MaxColumnsInRealTable < table.Definition.Columns.Count)
+            {
+                throw new WixException(WixDataErrors.TooManyColumnsInRealTable(table.Definition.Name, table.Definition.Columns.Count, TableDefinition.MaxColumnsInRealTable));
+            }
+
+            // Tack on the table header, and flush before we start writing bytes directly to the stream.
+            var header = this.TableDefinitionToIdtDefinition(table.Definition, keepAddedColumns);
+            writer.Write(header);
+            writer.Flush();
+
+            using (var binary = new BinaryWriter(writer.BaseStream, writer.Encoding, true))
+            {
+                // Create an encoding that replaces characters with question marks, and doesn't throw. We'll 
+                // use this in case of errors
+                Encoding convertEncoding = Encoding.GetEncoding(writer.Encoding.CodePage);
+
+                foreach (Row row in table.Rows)
+                {
+                    if (row.Redundant)
+                    {
+                        continue;
+                    }
+
+                    string rowString = this.RowToIdtDefinition(row, keepAddedColumns);
+                    byte[] rowBytes;
+
+                    try
+                    {
+                        // GetBytes will throw an exception if any character doesn't match our current encoding
+                        rowBytes = writer.Encoding.GetBytes(rowString);
+                    }
+                    catch (EncoderFallbackException)
+                    {
+                        Messaging.Instance.OnMessage(WixDataErrors.InvalidStringForCodepage(row.SourceLineNumbers, Convert.ToString(writer.Encoding.WindowsCodePage, CultureInfo.InvariantCulture)));
+
+                        rowBytes = convertEncoding.GetBytes(rowString);
+                    }
+
+                    binary.Write(rowBytes, 0, rowBytes.Length);
+                }
+            }
+        }
+
+        private string TableDefinitionToIdtDefinition(TableDefinition definition, bool keepAddedColumns)
+        {
+            var first = true;
+            var columnString = new StringBuilder();
+            var dataString = new StringBuilder();
+            var tableString = new StringBuilder();
+
+            tableString.Append(definition.Name);
+            foreach (var column in definition.Columns)
+            {
+                // conditionally keep columns added in a transform; otherwise,
+                // break because columns can only be added at the end
+                if (column.Added && !keepAddedColumns)
+                {
+                    break;
+                }
+
+                if (!first)
+                {
+                    columnString.Append('\t');
+                    dataString.Append('\t');
+                }
+
+                columnString.Append(column.Name);
+                dataString.Append(ColumnIdtType(column));
+
+                if (column.PrimaryKey)
+                {
+                    tableString.AppendFormat("\t{0}", column.Name);
+                }
+
+                first = false;
+            }
+            columnString.Append("\r\n");
+            columnString.Append(dataString);
+            columnString.Append("\r\n");
+            columnString.Append(tableString);
+            columnString.Append("\r\n");
+
+            return columnString.ToString();
+        }
+
+        private string RowToIdtDefinition(Row row, bool keepAddedColumns)
+        {
+            var first = true;
+            var sb = new StringBuilder();
+
+            foreach (var field in row.Fields)
+            {
+                // Conditionally keep columns added in a transform; otherwise,
+                // break because columns can only be added at the end.
+                if (field.Column.Added && !keepAddedColumns)
+                {
+                    break;
+                }
+
+                if (first)
+                {
+                    first = false;
+                }
+                else
+                {
+                    sb.Append('\t');
+                }
+
+                sb.Append(this.FieldToIdtValue(field));
+            }
+            sb.Append("\r\n");
+
+            return sb.ToString();
+        }
+
+        private string FieldToIdtValue(Field field)
+        {
+            var data = field.AsString();
+
+            if (String.IsNullOrEmpty(data))
+            {
+                return data;
+            }
+
+            // Special field value idt-specific escaping.
+            return data.Replace('\t', '\x10')
+                       .Replace('\r', '\x11')
+                       .Replace('\n', '\x19');
+        }
+
+
+        /// <summary>
+        /// Gets the type of the column in IDT format.
+        /// </summary>
+        /// <value>IDT format for column type.</value>
+        private static string ColumnIdtType(ColumnDefinition column)
+        {
+            char typeCharacter;
+            switch (column.Type)
+            {
+                case ColumnType.Number:
+                    typeCharacter = column.Nullable ? 'I' : 'i';
+                    break;
+                case ColumnType.Preserved:
+                case ColumnType.String:
+                    typeCharacter = column.Nullable ? 'S' : 's';
+                    break;
+                case ColumnType.Localized:
+                    typeCharacter = column.Nullable ? 'L' : 'l';
+                    break;
+                case ColumnType.Object:
+                    typeCharacter = column.Nullable ? 'V' : 'v';
+                    break;
+                default:
+                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_UnknownColumnType, column.Type));
+            }
+
+            return String.Concat(typeCharacter, column.Length);
+        }
+    }
+}
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index a19a53f1..4e053c12 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -3,20 +3,26 @@
 namespace WixToolset.Core.WindowsInstaller.Bind
 {
     using System;
+    using System.Collections.Generic;
     using System.Linq;
     using WixToolset.Core.Native;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
+    using WixToolset.Extensibility;
 
     internal class CreateOutputFromIRCommand
     {
-        public CreateOutputFromIRCommand(IntermediateSection section, TableDefinitionCollection tableDefinitions)
+        public CreateOutputFromIRCommand(IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendExtension> backendExtensions)
         {
             this.Section = section;
             this.TableDefinitions = tableDefinitions;
+            this.BackendExtensions = backendExtensions;
         }
 
+        private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
+
         private TableDefinitionCollection TableDefinitions { get; }
 
         private IntermediateSection Section { get; }
@@ -60,6 +66,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         // Ignored.
                         break;
 
+                    case TupleDefinitionType.MustBeFromAnExtension:
+                        this.AddTupleFromExtension(tuple, output);
+                        break;
+
                     default:
                         this.AddTupleDefaultly(tuple, output);
                         break;
@@ -206,6 +216,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
         }
 
+        private void AddTupleFromExtension(IntermediateTuple tuple, Output output)
+        {
+            foreach (var extension in this.BackendExtensions)
+            {
+                if (extension.TryAddTupleToOutput(tuple, output))
+                {
+                    break;
+                }
+            }
+        }
+
         private void AddTupleDefaultly(IntermediateTuple tuple, Output output)
         {
             if (!this.TableDefinitions.TryGet(tuple.Definition.Name, out var tableDefinition))
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
index a3d3ecf7..e4e66559 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Extensibility;
     using WixToolset.Msi;
     using WixToolset.Core.Native;
+    using WixToolset.Data.WindowsInstaller;
 
     internal class GenerateDatabaseCommand 
     {
@@ -44,14 +45,56 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // Add the _Validation rows.
             if (!this.SuppressAddingValidationRows)
             {
-                Table validationTable = this.Output.EnsureTable(this.TableDefinitions["_Validation"]);
+                var validationTable = this.Output.EnsureTable(this.TableDefinitions["_Validation"]);
 
-                foreach (Table table in this.Output.Tables)
+                foreach (var table in this.Output.Tables)
                 {
                     if (!table.Definition.Unreal)
                     {
                         // Add the validation rows for this table.
-                        table.Definition.AddValidationRows(validationTable);
+                        foreach (ColumnDefinition columnDef in table.Definition.Columns)
+                        {
+                            var row = validationTable.CreateRow(null);
+
+                            row[0] = table.Name;
+
+                            row[1] = columnDef.Name;
+
+                            if (columnDef.Nullable)
+                            {
+                                row[2] = "Y";
+                            }
+                            else
+                            {
+                                row[2] = "N";
+                            }
+
+                            if (columnDef.MinValue.HasValue)
+                            {
+                                row[3] = columnDef.MinValue.Value;
+                            }
+
+                            if (columnDef.MaxValue.HasValue)
+                            {
+                                row[4] = columnDef.MaxValue.Value;
+                            }
+
+                            row[5] = columnDef.KeyTable;
+
+                            if (columnDef.KeyColumn.HasValue)
+                            {
+                                row[6] = columnDef.KeyColumn.Value;
+                            }
+
+                            if (ColumnCategory.Unknown != columnDef.Category)
+                            {
+                                row[7] = columnDef.Category.ToString();
+                            }
+
+                            row[8] = columnDef.Possibilities;
+
+                            row[9] = columnDef.Description;
+                        }
                     }
                 }
             }
@@ -133,7 +176,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         {
                             try
                             {
-                                db.ImportTable(this.Output.Codepage, importTable, baseDirectory, this.KeepAddedColumns);
+                                //db.ImportTable(this.Output.Codepage, importTable, baseDirectory, this.KeepAddedColumns);
+                                var command = new CreateIdtFileCommand(importTable, this.Output.Codepage, baseDirectory, this.KeepAddedColumns);
+                                command.Execute();
+
+                                db.Import(command.IdtPath);
                             }
                             catch (WixInvalidIdtException)
                             {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
index dcf67c05..32a05d93 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
@@ -8,12 +8,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.IO;
     using System.Runtime.InteropServices;
     using System.Text;
+    using WixToolset.Core.Bind;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
     using WixToolset.MergeMod;
     using WixToolset.Msi;
-    using WixToolset.Core.Native;
-    using WixToolset.Core.Bind;
 
     /// <summary>
     /// Update file information.
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs
new file mode 100644
index 00000000..03538fc3
--- /dev/null
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs
@@ -0,0 +1,238 @@
+// 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.Core.WindowsInstaller.Bind
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.Linq;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using WixToolset.Data;
+    using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
+
+    internal class ModularaizeCommand
+    {
+        public ModularaizeCommand(Output output, string modularizationGuid, IEnumerable<WixSuppressModularizationTuple> suppressTuples)
+        {
+            this.Output = output;
+            this.ModularizationGuid = modularizationGuid;
+
+            // Gather all the unique suppress modularization identifiers.
+            this.SuppressModularizationIdentifiers = new HashSet<string>(suppressTuples.Select(s => s.WixSuppressModularization));
+        }
+
+        private Output Output { get; }
+
+        private string ModularizationGuid { get; }
+
+        private HashSet<string> SuppressModularizationIdentifiers { get; }
+
+        public void Execute()
+        {
+            foreach (var table in this.Output.Tables)
+            {
+                this.ModularizeTable(table);
+            }
+        }
+
+        /// <summary>
+        /// Modularize the table.
+        /// </summary>
+        /// <param name="modularizationGuid">String containing the GUID of the Merge Module, if appropriate.</param>
+        /// <param name="suppressModularizationIdentifiers">Optional collection of identifiers that should not be modularized.</param>
+        public void ModularizeTable(Table table)
+        {
+            var modularizedColumns = new List<int>();
+
+            // find the modularized columns
+            for (var i = 0; i < table.Definition.Columns.Count; ++i)
+            {
+                if (ColumnModularizeType.None != table.Definition.Columns[i].ModularizeType)
+                {
+                    modularizedColumns.Add(i);
+                }
+            }
+
+            if (0 < modularizedColumns.Count)
+            {
+                foreach (var row in table.Rows)
+                {
+                    foreach (var modularizedColumn in modularizedColumns)
+                    {
+                        var field = row.Fields[modularizedColumn];
+
+                        if (field.Data != null)
+                        {
+                            field.Data = this.ModularizedRowFieldValue(row, field);
+                        }
+                    }
+                }
+            }
+        }
+
+        private string ModularizedRowFieldValue(Row row, Field field)
+        {
+            var fieldData = field.AsString();
+
+            if (!(WindowsInstallerStandard.IsStandardAction(fieldData) || WindowsInstallerStandard.IsStandardProperty(fieldData)))
+            {
+                ColumnModularizeType modularizeType = field.Column.ModularizeType;
+
+                // special logic for the ControlEvent table's Argument column
+                // this column requires different modularization methods depending upon the value of the Event column
+                if (ColumnModularizeType.ControlEventArgument == field.Column.ModularizeType)
+                {
+                    switch (row[2].ToString())
+                    {
+                        case "CheckExistingTargetPath": // redirectable property name
+                        case "CheckTargetPath":
+                        case "DoAction": // custom action name
+                        case "NewDialog": // dialog name
+                        case "SelectionBrowse":
+                        case "SetTargetPath":
+                        case "SpawnDialog":
+                        case "SpawnWaitDialog":
+                            if (Common.IsIdentifier(fieldData))
+                            {
+                                modularizeType = ColumnModularizeType.Column;
+                            }
+                            else
+                            {
+                                modularizeType = ColumnModularizeType.Property;
+                            }
+                            break;
+                        default: // formatted
+                            modularizeType = ColumnModularizeType.Property;
+                            break;
+                    }
+                }
+                else if (ColumnModularizeType.ControlText == field.Column.ModularizeType)
+                {
+                    // icons are stored in the Binary table, so they get column-type modularization
+                    if (("Bitmap" == row[2].ToString() || "Icon" == row[2].ToString()) && Common.IsIdentifier(fieldData))
+                    {
+                        modularizeType = ColumnModularizeType.Column;
+                    }
+                    else
+                    {
+                        modularizeType = ColumnModularizeType.Property;
+                    }
+                }
+
+                switch (modularizeType)
+                {
+                    case ColumnModularizeType.Column:
+                        // ensure the value is an identifier (otherwise it shouldn't be modularized this way)
+                        if (!Common.IsIdentifier(fieldData))
+                        {
+                            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_CannotModularizeIllegalID, fieldData));
+                        }
+
+                        // if we're not supposed to suppress modularization of this identifier
+                        if (!this.SuppressModularizationIdentifiers.Contains(fieldData))
+                        {
+                            fieldData = String.Concat(fieldData, ".", this.ModularizationGuid);
+                        }
+                        break;
+
+                    case ColumnModularizeType.Property:
+                    case ColumnModularizeType.Condition:
+                        Regex regex;
+                        if (ColumnModularizeType.Property == modularizeType)
+                        {
+                            regex = new Regex(@"\[(?<identifier>[#$!]?[a-zA-Z_][a-zA-Z0-9_\.]*)]", RegexOptions.Singleline | RegexOptions.ExplicitCapture);
+                        }
+                        else
+                        {
+                            Debug.Assert(ColumnModularizeType.Condition == modularizeType);
+
+                            // This heinous looking regular expression is actually quite an elegant way 
+                            // to shred the entire condition into the identifiers that need to be 
+                            // modularized.  Let's break it down piece by piece:
+                            //
+                            // 1. Look for the operators: NOT, EQV, XOR, OR, AND, IMP (plus a space).  Note that the
+                            //    regular expression is case insensitive so we don't have to worry about
+                            //    all the permutations of these strings.
+                            // 2. Look for quoted strings.  Quoted strings are just text and are ignored 
+                            //    outright.
+                            // 3. Look for environment variables.  These look like identifiers we might 
+                            //    otherwise be interested in but start with a percent sign.  Like quoted 
+                            //    strings these enviroment variable references are ignored outright.
+                            // 4. Match all identifiers that are things that need to be modularized.  Note
+                            //    the special characters (!, $, ?, &) that denote Component and Feature states.
+                            regex = new Regex(@"NOT\s|EQV\s|XOR\s|OR\s|AND\s|IMP\s|"".*?""|%[a-zA-Z_][a-zA-Z0-9_\.]*|(?<identifier>[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
+
+                            // less performant version of the above with captures showing where everything lives
+                            // regex = new Regex(@"(?<operator>NOT|EQV|XOR|OR|AND|IMP)|(?<string>"".*?"")|(?<environment>%[a-zA-Z_][a-zA-Z0-9_\.]*)|(?<identifier>[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)",RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
+                        }
+
+                        var matches = regex.Matches(fieldData);
+
+                        var sb = new StringBuilder(fieldData);
+
+                        // Notice how this code walks backward through the list
+                        // because it modifies the string as we through it.
+                        for (var i = matches.Count - 1; 0 <= i; i--)
+                        {
+                            var group = matches[i].Groups["identifier"];
+                            if (group.Success)
+                            {
+                                var identifier = group.Value;
+                                if (!WindowsInstallerStandard.IsStandardProperty(identifier) && !this.SuppressModularizationIdentifiers.Contains(identifier))
+                                {
+                                    sb.Insert(group.Index + group.Length, '.');
+                                    sb.Insert(group.Index + group.Length + 1, this.ModularizationGuid);
+                                }
+                            }
+                        }
+
+                        fieldData = sb.ToString();
+                        break;
+
+                    case ColumnModularizeType.CompanionFile:
+                        // if we're not supposed to ignore this identifier and the value does not start with
+                        // a digit, we must have a companion file so modularize it
+                        if (!this.SuppressModularizationIdentifiers.Contains(fieldData) &&
+                            0 < fieldData.Length && !Char.IsDigit(fieldData, 0))
+                        {
+                            fieldData = String.Concat(fieldData, ".", this.ModularizationGuid);
+                        }
+                        break;
+
+                    case ColumnModularizeType.Icon:
+                        if (!this.SuppressModularizationIdentifiers.Contains(fieldData))
+                        {
+                            var start = fieldData.LastIndexOf(".", StringComparison.Ordinal);
+                            if (-1 == start)
+                            {
+                                fieldData = String.Concat(fieldData, ".", this.ModularizationGuid);
+                            }
+                            else
+                            {
+                                fieldData = String.Concat(fieldData.Substring(0, start), ".", this.ModularizationGuid, fieldData.Substring(start));
+                            }
+                        }
+                        break;
+
+                    case ColumnModularizeType.SemicolonDelimited:
+                        var keys = fieldData.Split(';');
+                        for (var i = 0; i < keys.Length; ++i)
+                        {
+                            if (!String.IsNullOrEmpty(keys[i]))
+                            {
+                                keys[i] = String.Concat(keys[i], ".", this.ModularizationGuid);
+                            }
+                        }
+
+                        fieldData = String.Join(";", keys);
+                        break;
+                }
+            }
+
+            return fieldData;
+        }
+    }
+}
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateControlTextCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateControlTextCommand.cs
index 9579e0f8..dddc9380 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateControlTextCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateControlTextCommand.cs
@@ -5,7 +5,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System;
     using System.IO;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
 
     internal class UpdateControlTextCommand
     {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index a9eb2a8f..cf620e72 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -14,6 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Core.Bind;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Msi;
 
     /// <summary>
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
index db74eda5..0767adb0 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
@@ -2,13 +2,13 @@
 
 namespace WixToolset.Core.WindowsInstaller.Bind
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
     using WixToolset.Core.Bind;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
 
     internal class UpdateMediaSequencesCommand
     {
diff --git a/src/WixToolset.Data.WindowsInstaller/Data/actions.xml b/src/WixToolset.Core.WindowsInstaller/Data/actions.xml
index f65b792d..f65b792d 100644
--- a/src/WixToolset.Data.WindowsInstaller/Data/actions.xml
+++ b/src/WixToolset.Core.WindowsInstaller/Data/actions.xml
diff --git a/src/WixToolset.Data.WindowsInstaller/Data/tables.xml b/src/WixToolset.Core.WindowsInstaller/Data/tables.xml
index e4b5e954..e4b5e954 100644
--- a/src/WixToolset.Data.WindowsInstaller/Data/tables.xml
+++ b/src/WixToolset.Core.WindowsInstaller/Data/tables.xml
diff --git a/src/WixToolset.Core.WindowsInstaller/Differ.cs b/src/WixToolset.Core.WindowsInstaller/Differ.cs
index bdd06d32..9bbde302 100644
--- a/src/WixToolset.Core.WindowsInstaller/Differ.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Differ.cs
@@ -1,14 +1,14 @@
 // 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
+namespace WixToolset.Core.WindowsInstaller
 {
     using System;
     using System.Collections;
     using System.Collections.Generic;
     using System.Globalization;
-    using WixToolset.Core;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
     using WixToolset.Extensibility;
     using WixToolset.Msi;
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
index 58384325..5c56d9aa 100644
--- a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
@@ -9,7 +9,9 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
     using System.Runtime.InteropServices;
     using System.Security.Cryptography.X509Certificates;
     using WixToolset.Core.Native;
+    using WixToolset.Core.WindowsInstaller.Bind;
     using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
     using WixToolset.Msi;
 
@@ -250,13 +252,19 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
 
                 if (digitalCertificateTable.Rows.Count > 0)
                 {
-                    database.ImportTable(codepage, digitalCertificateTable, this.Context.IntermediateFolder, true);
+                    var command = new CreateIdtFileCommand(digitalCertificateTable, codepage, this.Context.IntermediateFolder, true);
+                    command.Execute();
+
+                    database.Import(command.IdtPath);
                     shouldCommit = true;
                 }
 
                 if (digitalSignatureTable.Rows.Count > 0)
                 {
-                    database.ImportTable(codepage, digitalSignatureTable, this.Context.IntermediateFolder, true);
+                    var command = new CreateIdtFileCommand(digitalSignatureTable, codepage, this.Context.IntermediateFolder, true);
+                    command.Execute();
+
+                    database.Import(command.IdtPath);
                     shouldCommit = true;
                 }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/Database.cs b/src/WixToolset.Core.WindowsInstaller/Msi/Database.cs
index 801ebdde..ccb0e6cf 100644
--- a/src/WixToolset.Core.WindowsInstaller/Msi/Database.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Msi/Database.cs
@@ -3,13 +3,11 @@
 namespace WixToolset.Msi
 {
     using System;
-    using System.ComponentModel;
     using System.Globalization;
     using System.IO;
-    using System.Text;
     using System.Threading;
-    using WixToolset.Data;
     using WixToolset.Core.Native;
+    using WixToolset.Data;
 
     /// <summary>
     /// Wrapper class for managing MSI API database handles.
@@ -25,8 +23,7 @@ namespace WixToolset.Msi
         /// <param name="type">Persist mode to use when opening the database.</param>
         public Database(string path, OpenDatabase type)
         {
-            uint handle = 0;
-            int error = MsiInterop.MsiOpenDatabase(path, new IntPtr((int)type), out handle);
+            int error = MsiInterop.MsiOpenDatabase(path, new IntPtr((int)type), out var handle);
             if (0 != error)
             {
                 throw new MsiException(error);
@@ -153,9 +150,9 @@ namespace WixToolset.Msi
         /// <param name="fileName">Specifies the name of the exported table archive file.</param>
         public void Export(string tableName, string folderPath, string fileName)
         {
-            if (null == folderPath || 0 == folderPath.Length)
+            if (String.IsNullOrEmpty(folderPath))
             {
-                folderPath = System.Environment.CurrentDirectory;
+                folderPath = Environment.CurrentDirectory;
             }
 
             int error = MsiInterop.MsiDatabaseExport(this.Handle, tableName, folderPath, fileName);
@@ -241,63 +238,13 @@ namespace WixToolset.Msi
         /// primary key columns for a specified table.</returns>
         public Record PrimaryKeys(string tableName)
         {
-            uint recordHandle;
-            int error = MsiInterop.MsiDatabaseGetPrimaryKeys(this.Handle, tableName, out recordHandle);
-            if (0 != error)
+            var error = MsiInterop.MsiDatabaseGetPrimaryKeys(this.Handle, tableName, out var recordHandle);
+            if (error != 0)
             {
                 throw new MsiException(error);
             }
 
             return new Record(recordHandle);
         }
-
-        /// <summary>
-        /// Imports a table into the database.
-        /// </summary>
-        /// <param name="codepage">Codepage of the database to import table to.</param>
-        /// <param name="table">Table to import into database.</param>
-        /// <param name="baseDirectory">The base directory where intermediate files are created.</param>
-        /// <param name="keepAddedColumns">Whether to keep columns added in a transform.</param>
-        public void ImportTable(int codepage, Table table, string baseDirectory, bool keepAddedColumns)
-        {
-            // write out the table to an IDT file
-            string idtPath = Path.Combine(baseDirectory, String.Concat(table.Name, ".idt"));
-            Encoding encoding;
-
-            // If UTF8 encoding, use the UTF8-specific constructor to avoid writing
-            // the byte order mark at the beginning of the file
-            if (Encoding.UTF8.CodePage == codepage)
-            {
-                encoding = new UTF8Encoding(false, true);
-            }
-            else
-            {
-                if (0 == codepage)
-                {
-                    codepage = Encoding.ASCII.CodePage;
-                }
-
-                encoding = Encoding.GetEncoding(codepage, new EncoderExceptionFallback(), new DecoderExceptionFallback());
-            }
-
-            using (StreamWriter idtWriter = new StreamWriter(idtPath, false, encoding))
-            {
-                table.ToIdtDefinition(idtWriter, keepAddedColumns);
-            }
-
-            // try to import the table into the MSI
-            try
-            {
-                this.Import(idtPath);
-            }
-            catch (WixInvalidIdtException)
-            {
-                table.ValidateRows();
-
-                // If ValidateRows finds anything it doesn't like, it throws. Otherwise, we'll
-                // throw WixInvalidIdtException here which is caught in light and turns off tidy.
-                throw new WixInvalidIdtException(idtPath, table.Name);
-            }
-        }
     }
 }
diff --git a/src/WixToolset.Data.WindowsInstaller/WixInvalidIdtException.cs b/src/WixToolset.Core.WindowsInstaller/Msi/WixInvalidIdtException.cs
index 33fd0591..a603d5a7 100644
--- a/src/WixToolset.Data.WindowsInstaller/WixInvalidIdtException.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Msi/WixInvalidIdtException.cs
@@ -1,8 +1,9 @@
 // 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.Data
+namespace WixToolset.Msi
 {
     using System;
+    using WixToolset.Data;
 
     /// <summary>
     /// WiX invalid idt exception.
diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 2590c14f..4753677a 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -14,12 +14,26 @@ namespace WixToolset.Core.WindowsInstaller
     {
         public BindResult Bind(IBindContext context)
         {
+            var backendExtensions = context.ExtensionManager.Create<IWindowsInstallerBackendExtension>();
+
+            foreach (var extension in backendExtensions)
+            {
+                extension.PreBackendBind(context);
+            }
+
             var validator = Validator.CreateFromContext(context, "darice.cub");
 
-            var command = new BindDatabaseCommand(context, validator);
+            var command = new BindDatabaseCommand(context, backendExtensions, validator);
             command.Execute();
 
-            return new BindResult(command.FileTransfers, command.ContentFilePaths);
+            var result = new BindResult(command.FileTransfers, command.ContentFilePaths);
+
+            foreach (var extension in backendExtensions)
+            {
+                extension.PostBackendBind(result);
+            }
+
+            return result;
         }
 
         public bool Inscribe(IInscribeContext context)
diff --git a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
index e39eb883..2323f8dd 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
@@ -13,12 +13,26 @@ namespace WixToolset.Core.WindowsInstaller
     {
         public BindResult Bind(IBindContext context)
         {
+            var backendExtensions = context.ExtensionManager.Create<IWindowsInstallerBackendExtension>();
+
+            foreach (var extension in backendExtensions)
+            {
+                extension.PreBackendBind(context);
+            }
+
             var validator = Validator.CreateFromContext(context, "mergemod.cub");
 
-            var command = new BindDatabaseCommand(context, validator);
+            var command = new BindDatabaseCommand(context, backendExtensions, validator);
             command.Execute();
 
-            return new BindResult(command.FileTransfers, command.ContentFilePaths);
+            var result = new BindResult(command.FileTransfers, command.ContentFilePaths);
+
+            foreach (var extension in backendExtensions)
+            {
+                extension.PostBackendBind(result);
+            }
+
+            return result;
         }
 
         public bool Inscribe(IInscribeContext context)
diff --git a/src/WixToolset.Core.WindowsInstaller/Patch.cs b/src/WixToolset.Core.WindowsInstaller/Patch.cs
index 8e617fdb..24a54859 100644
--- a/src/WixToolset.Core.WindowsInstaller/Patch.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Patch.cs
@@ -3,14 +3,11 @@
 namespace WixToolset.Data
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using WixToolset.Data.Rows;
+    using WixToolset.Core.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
-    using WixToolset.Core.Native;
-    using WixToolset.Msi;
 
     /// <summary>
     /// Contains output tables and logic for building an MSP package.
diff --git a/src/WixToolset.Data.WindowsInstaller/RowDictionary.cs b/src/WixToolset.Core.WindowsInstaller/RowDictionary.cs
index 5756db71..101ebefd 100644
--- a/src/WixToolset.Data.WindowsInstaller/RowDictionary.cs
+++ b/src/WixToolset.Core.WindowsInstaller/RowDictionary.cs
@@ -1,9 +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 WixToolset.Data
+namespace WixToolset.Core.WindowsInstaller
 {
     using System;
     using System.Collections.Generic;
+    using WixToolset.Data.WindowsInstaller;
 
     /// <summary>
     /// A dictionary of rows. Unlike the <see cref="RowIndexedCollection"/> this
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs b/src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs
index 9fab6b5d..d72198ee 100644
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRowCollection.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Rows/WixActionRowCollection.cs
@@ -1,17 +1,19 @@
 // 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.Data.Rows
+namespace WixToolset.Core.WindowsInstaller.Rows
 {
     using System;
     using System.Collections;
     using System.Diagnostics;
+    using System.Globalization;
     using System.Xml;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller.Rows;
 
     /// <summary>
     /// A collection of action rows sorted by their sequence table and action name.
     /// </summary>
-    public sealed class WixActionRowCollection : ICollection
+    internal sealed class WixActionRowCollection : ICollection
     {
         private SortedList collection;
 
@@ -172,7 +174,7 @@ namespace WixToolset.Data.Rows
                         switch (reader.LocalName)
                         {
                             case "action":
-                                WixActionRow[] parsedActionRows = WixActionRow.Parse(reader);
+                                WixActionRow[] parsedActionRows = ParseActions(reader);
 
                                 foreach (WixActionRow actionRow in parsedActionRows)
                                 {
@@ -219,5 +221,108 @@ namespace WixToolset.Data.Rows
         {
             return String.Concat(sequenceTable, '/', action);
         }
+
+        /// <summary>
+        /// Parses ActionRows from the Xml reader.
+        /// </summary>
+        /// <param name="reader">Xml reader that contains serialized ActionRows.</param>
+        /// <returns>The parsed ActionRows.</returns>
+        internal static WixActionRow[] ParseActions(XmlReader reader)
+        {
+            Debug.Assert("action" == reader.LocalName);
+
+            string id = null;
+            string condition = null;
+            bool empty = reader.IsEmptyElement;
+            int sequence = int.MinValue;
+            int sequenceCount = 0;
+            SequenceTable[] sequenceTables = new SequenceTable[Enum.GetValues(typeof(SequenceTable)).Length];
+
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.Name)
+                {
+                    case "name":
+                        id = reader.Value;
+                        break;
+                    case "AdminExecuteSequence":
+                        if (reader.Value.Equals("yes"))
+                        {
+                            sequenceTables[sequenceCount] = SequenceTable.AdminExecuteSequence;
+                            ++sequenceCount;
+                        }
+                        break;
+                    case "AdminUISequence":
+                        if (reader.Value.Equals("yes"))
+                        {
+                            sequenceTables[sequenceCount] = SequenceTable.AdminUISequence;
+                            ++sequenceCount;
+                        }
+                        break;
+                    case "AdvtExecuteSequence":
+                        if (reader.Value.Equals("yes"))
+                        {
+                            sequenceTables[sequenceCount] = SequenceTable.AdvtExecuteSequence;
+                            ++sequenceCount;
+                        }
+                        break;
+                    case "condition":
+                        condition = reader.Value;
+                        break;
+                    case "InstallExecuteSequence":
+                        if (reader.Value.Equals("yes"))
+                        {
+                            sequenceTables[sequenceCount] = SequenceTable.InstallExecuteSequence;
+                            ++sequenceCount;
+                        }
+                        break;
+                    case "InstallUISequence":
+                        if (reader.Value.Equals("yes"))
+                        {
+                            sequenceTables[sequenceCount] = SequenceTable.InstallUISequence;
+                            ++sequenceCount;
+                        }
+                        break;
+                    case "sequence":
+                        sequence = Convert.ToInt32(reader.Value, CultureInfo.InvariantCulture);
+                        break;
+                }
+            }
+
+            if (null == id)
+            {
+                throw new XmlException();
+            }
+
+            if (int.MinValue == sequence)
+            {
+                throw new XmlException();
+            }
+            else if (1 > sequence)
+            {
+                throw new XmlException();
+            }
+
+            if (0 == sequenceCount)
+            {
+                throw new XmlException();
+            }
+
+            if (!empty && reader.Read() && XmlNodeType.EndElement != reader.MoveToContent())
+            {
+                throw new XmlException();
+            }
+
+            // create the actions
+            WixActionRow[] actionRows = new WixActionRow[sequenceCount];
+            for (int i = 0; i < sequenceCount; i++)
+            {
+                //WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence);
+                //actionRows[i] = actionRow;
+                throw new NotImplementedException();
+            }
+
+            return actionRows;
+        }
     }
 }
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
index 7985c120..1757e06f 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
@@ -9,7 +9,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.IO;
     using WixToolset.Core.Native;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
     using WixToolset.Msi;
 
     internal class ExtractCabinetsCommand
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index 9cd7b775..72e0c3c8 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -10,7 +10,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.Text.RegularExpressions;
     using WixToolset.Core.Native;
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
     using WixToolset.Msi;
 
     internal class UnbindDatabaseCommand
@@ -155,13 +156,10 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                         ColumnCategory columnCategory = ColumnCategory.Unknown;
                                         ColumnModularizeType columnModularizeType = ColumnModularizeType.None;
                                         bool primary = tablePrimaryKeys.Contains(columnName);
-                                        bool minValueSet = false;
-                                        int minValue = -1;
-                                        bool maxValueSet = false;
-                                        int maxValue = -1;
+                                        int? minValue = null;
+                                        int? maxValue = null;
                                         string keyTable = null;
-                                        bool keyColumnSet = false;
-                                        int keyColumn = -1;
+                                        int? keyColumn = null;
                                         string category = null;
                                         string set = null;
                                         string description = null;
@@ -205,16 +203,13 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                                 if (null != validationRecord)
                                                 {
                                                     string validationNullable = validationRecord.GetString(3);
-                                                    minValueSet = !validationRecord.IsNull(4);
-                                                    minValue = (minValueSet ? validationRecord.GetInteger(4) : -1);
-                                                    maxValueSet = !validationRecord.IsNull(5);
-                                                    maxValue = (maxValueSet ? validationRecord.GetInteger(5) : -1);
-                                                    keyTable = (!validationRecord.IsNull(6) ? validationRecord.GetString(6) : null);
-                                                    keyColumnSet = !validationRecord.IsNull(7);
-                                                    keyColumn = (keyColumnSet ? validationRecord.GetInteger(7) : -1);
-                                                    category = (!validationRecord.IsNull(8) ? validationRecord.GetString(8) : null);
-                                                    set = (!validationRecord.IsNull(9) ? validationRecord.GetString(9) : null);
-                                                    description = (!validationRecord.IsNull(10) ? validationRecord.GetString(10) : null);
+                                                    minValue = validationRecord.IsNull(4) ? null : (int?)validationRecord.GetInteger(4);
+                                                    maxValue = validationRecord.IsNull(5) ? null : (int?)validationRecord.GetInteger(5);
+                                                    keyTable = validationRecord.IsNull(6) ? null : validationRecord.GetString(6);
+                                                    keyColumn = validationRecord.IsNull(7) ? null : (int?)validationRecord.GetInteger(7);
+                                                    category = validationRecord.IsNull(8) ? null : validationRecord.GetString(8);
+                                                    set = validationRecord.IsNull(9) ? null : validationRecord.GetString(9);
+                                                    description = validationRecord.IsNull(10) ? null : validationRecord.GetString(10);
 
                                                     // check the validation nullable value against the column definition
                                                     if (null == validationNullable)
@@ -264,7 +259,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                             columnModularizeType = ColumnModularizeType.Column;
                                         }
 
-                                        columns.Add(new ColumnDefinition(columnName, columnType, length, primary, nullable, columnModularizeType, (ColumnType.Localized == columnType), minValueSet, minValue, maxValueSet, maxValue, keyTable, keyColumnSet, keyColumn, columnCategory, set, description, true, true));
+                                        columns.Add(new ColumnDefinition(columnName, columnType, length, primary, nullable, columnCategory, minValue, maxValue, keyTable, keyColumn, set, description, columnModularizeType, (ColumnType.Localized == columnType), true));
                                     }
                                 }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
index 7eb81ac7..70f751f5 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using WixToolset.Core.Native;
     using WixToolset.Core.WindowsInstaller.Bind;
     using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
     using WixToolset.Msi;
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs
index 652a8a07..eb17d8af 100644
--- a/src/WixToolset.Core.WindowsInstaller/Validator.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs
@@ -9,14 +9,15 @@ namespace WixToolset.Core.WindowsInstaller
     using System.Diagnostics.CodeAnalysis;
     using System.Globalization;
     using System.IO;
+    using System.Linq;
+    using System.Reflection;
     using System.Threading;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
-    using WixToolset.Core.Native;
-    using WixToolset.Msi;
-    using System.Linq;
-    using System.Reflection;
     using WixToolset.Extensibility.Services;
+    using WixToolset.Msi;
 
     /// <summary>
     /// Runs internal consistency evaluators (ICEs) from cub files against a database.
diff --git a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
index 44ec3106..67f5962c 100644
--- a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
+++ b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Extensibility
     using System;
     using System.Collections;
     using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
 
     /// <summary>
     /// Base class for creating a validator extension. This default implementation
diff --git a/src/WixToolset.Data.WindowsInstaller/WindowsInstallerStandardInternal.cs b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerStandardInternal.cs
index cc6754c3..3b4721a6 100644
--- a/src/WixToolset.Data.WindowsInstaller/WindowsInstallerStandardInternal.cs
+++ b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerStandardInternal.cs
@@ -1,15 +1,17 @@
 // 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.Data
+namespace WixToolset.Core.WindowsInstaller
 {
+    using System;
     using System.Reflection;
     using System.Xml;
-    using WixToolset.Data.Rows;
+    using WixToolset.Core.WindowsInstaller.Rows;
+    using WixToolset.Data.WindowsInstaller;
 
     /// <summary>
     /// Represents the Windows Installer standard objects.
     /// </summary>
-    public static class WindowsInstallerStandardInternal
+    internal static class WindowsInstallerStandardInternal
     {
         private static readonly object lockObject = new object();
 
@@ -26,7 +28,7 @@ namespace WixToolset.Data
             {
                 if (null == WindowsInstallerStandardInternal.tableDefinitions)
                 {
-                    using (XmlReader reader = XmlReader.Create(Assembly.GetExecutingAssembly().GetManifestResourceStream("WixToolset.Data.WindowsInstaller.Data.tables.xml")))
+                    using (XmlReader reader = XmlReader.Create(Assembly.GetExecutingAssembly().GetManifestResourceStream("WixToolset.Core.WindowsInstaller.Data.tables.xml")))
                     {
                         WindowsInstallerStandardInternal.tableDefinitions = TableDefinitionCollection.Load(reader);
                     }
@@ -42,11 +44,12 @@ namespace WixToolset.Data
         /// <returns>Collection of standard actions in this assembly.</returns>
         public static WixActionRowCollection GetStandardActionRows()
         {
+#if REVISIT_FOR_PATCHING
             lock (lockObject)
             {
                 if (null == WindowsInstallerStandardInternal.standardActions)
                 {
-                    using (XmlReader reader = XmlReader.Create(Assembly.GetExecutingAssembly().GetManifestResourceStream("WixToolset.Data.WindowsInstaller.Data.actions.xml")))
+                    using (XmlReader reader = XmlReader.Create(Assembly.GetExecutingAssembly().GetManifestResourceStream("WixToolset.Core.WindowsInstaller.Data.actions.xml")))
                     {
                         WindowsInstallerStandardInternal.standardActions = WixActionRowCollection.Load(reader);
                     }
@@ -54,6 +57,8 @@ namespace WixToolset.Data
             }
 
             return WindowsInstallerStandardInternal.standardActions;
+#endif 
+            throw new NotImplementedException();
         }
     }
 }
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
index da49f31c..4a26d031 100644
--- a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+++ b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
@@ -13,6 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Data\actions.xml" />
+    <EmbeddedResource Include="Data\tables.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
     <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
 
@@ -22,8 +27,6 @@
     <ProjectReference Include="$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
 
     <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
-
-    <ProjectReference Include="..\WixToolset.Data.WindowsInstaller\WixToolset.Data.WindowsInstaller.csproj" />
     <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
   </ItemGroup>
 
diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs
new file mode 100644
index 00000000..3b41fdf1
--- /dev/null
+++ b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs
@@ -0,0 +1,53 @@
+// 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.Core.ExtensibilityServices
+{
+    using System;
+    using System.Linq;
+    using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility.Services;
+
+    internal class WindowsInstallerBackendHelper : IWindowsInstallerBackendHelper
+    {
+        public WindowsInstallerBackendHelper(IServiceProvider serviceProvider)
+        {
+            this.ServiceProvider = serviceProvider;
+        }
+
+        private IServiceProvider ServiceProvider { get; }
+
+        public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, Output output, TableDefinition[] tableDefinitions)
+        {
+            var tableDefinition = tableDefinitions.FirstOrDefault(t => t.Name == tuple.Definition.Name);
+
+            if (tableDefinition == null)
+            {
+                return false;
+            }
+
+            var table = output.EnsureTable(tableDefinition);
+            var row = table.CreateRow(tuple.SourceLineNumbers);
+            for (var i = 0; i < tuple.Fields.Length; ++i)
+            {
+                if (i < tableDefinition.Columns.Count)
+                {
+                    var column = tableDefinition.Columns[i];
+
+                    switch (column.Type)
+                    {
+                        case ColumnType.Number:
+                            row[i] = tuple.AsNumber(i);
+                            break;
+
+                        default:
+                            row[i] = tuple.AsString(i);
+                            break;
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index d31d7355..c77f3813 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -14,6 +14,7 @@ namespace WixToolset.Core
         private ParseHelper parseHelper;
         private PreprocessHelper preprocessHelper;
         private TupleDefinitionCreator tupleDefinitionCreator;
+        private WindowsInstallerBackendHelper windowsInstallerBackendHelper;
 
         public object GetService(Type serviceType)
         {
@@ -76,6 +77,11 @@ namespace WixToolset.Core
                 return this.preprocessHelper = this.preprocessHelper ?? new PreprocessHelper(this);
             }
 
+            if (serviceType == typeof(IWindowsInstallerBackendHelper))
+            {
+                return this.windowsInstallerBackendHelper = this.windowsInstallerBackendHelper ?? new WindowsInstallerBackendHelper(this);
+            }
+
             throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
         }
     }
diff --git a/src/WixToolset.Data.WindowsInstaller/ColumnDefinition.cs b/src/WixToolset.Data.WindowsInstaller/ColumnDefinition.cs
deleted file mode 100644
index 056be1e9..00000000
--- a/src/WixToolset.Data.WindowsInstaller/ColumnDefinition.cs
+++ /dev/null
@@ -1,1033 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Globalization;
-    using System.Xml;
-
-    /// <summary>
-    /// Defines MSI column types.
-    /// </summary>
-    public enum ColumnType
-    {
-        /// <summary>Unknown column type, default and invalid.</summary>
-        Unknown,
-
-        /// <summary>Column is a string.</summary>
-        String,
-
-        /// <summary>Column is a localizable string.</summary>
-        Localized,
-
-        /// <summary>Column is a number.</summary>
-        Number,
-
-        /// <summary>Column is a binary stream.</summary>
-        Object,
-
-        /// <summary>Column is a string that is preserved in transforms (like Object).</summary>
-        Preserved,
-    }
-
-    /// <summary>
-    /// Specifies if the column should be modularized.
-    /// </summary>
-    public enum ColumnModularizeType
-    {
-        /// <summary>Column should not be modularized.</summary>
-        None,
-
-        /// <summary>Column should be modularized.</summary>
-        Column,
-
-        /// <summary>When the column is an primary or foreign key to the Icon table it should be modularized special.</summary>
-        Icon,
-
-        /// <summary>When the column is a companion file it should be modularized.</summary>
-        CompanionFile,
-
-        /// <summary>Column is a condition and should be modularized.</summary>
-        Condition,
-
-        /// <summary>Special modularization type for the ControlEvent table's Argument column.</summary>
-        ControlEventArgument,
-
-        /// <summary>Special modularization type for the Control table's Text column.</summary>
-        ControlText,
-
-        /// <summary>Any Properties in the column should be modularized.</summary>
-        Property,
-
-        /// <summary>Semi-colon list of keys, all of which need to be modularized.</summary>
-        SemicolonDelimited,
-    }
-
-    /// <summary>
-    /// Column validation category type
-    /// </summary>
-    public enum ColumnCategory
-    {
-        /// <summary>Unknown category, default and invalid.</summary>
-        Unknown,
-
-        /// <summary>Text category.</summary>
-        Text,
-
-        /// <summary>UpperCase category.</summary>
-        UpperCase,
-
-        /// <summary>LowerCase category.</summary>
-        LowerCase,
-
-        /// <summary>Integer category.</summary>
-        Integer,
-
-        /// <summary>DoubleInteger category.</summary>
-        DoubleInteger,
-
-        /// <summary>TimeDate category.</summary>
-        TimeDate,
-
-        /// <summary>Identifier category.</summary>
-        Identifier,
-
-        /// <summary>Property category.</summary>
-        Property,
-
-        /// <summary>Filename category.</summary>
-        Filename,
-
-        /// <summary>WildCardFilename category.</summary>
-        WildCardFilename,
-
-        /// <summary>Path category.</summary>
-        Path,
-
-        /// <summary>Paths category.</summary>
-        Paths,
-
-        /// <summary>AnyPath category.</summary>
-        AnyPath,
-
-        /// <summary>DefaultDir category.</summary>
-        DefaultDir,
-
-        /// <summary>RegPath category.</summary>
-        RegPath,
-
-        /// <summary>Formatted category.</summary>
-        Formatted,
-
-        /// <summary>Template category.</summary>
-        Template,
-
-        /// <summary>Condition category.</summary>
-        Condition,
-
-        /// <summary>Guid category.</summary>
-        Guid,
-
-        /// <summary>Version category.</summary>
-        Version,
-
-        /// <summary>Language category.</summary>
-        Language,
-
-        /// <summary>Binary category.</summary>
-        Binary,
-
-        /// <summary>CustomSource category.</summary>
-        CustomSource,
-
-        /// <summary>Cabinet category.</summary>
-        Cabinet,
-
-        /// <summary>Shortcut category.</summary>
-        Shortcut,
-
-        /// <summary>Formatted SDDL category.</summary>
-        FormattedSDDLText,
-    }
-
-    /// <summary>
-    /// Definition of a table's column.
-    /// </summary>
-    public sealed class ColumnDefinition : IComparable<ColumnDefinition>
-    {
-        private string name;
-        private ColumnType type;
-        private int length;
-        private bool primaryKey;
-        private bool nullable;
-        private ColumnModularizeType modularize;
-        private bool localizable;
-        private bool added;
-
-        private bool minValueSet;
-        private long minValue;
-        private bool maxValueSet;
-        private long maxValue;
-        private string keyTable;
-        private bool keyColumnSet;
-        private int keyColumn;
-        private ColumnCategory category;
-        private string possibilities;
-        private string description;
-        private bool escapeIdtCharacters;
-        private bool useCData;
-
-        /// <summary>
-        /// Creates a new column definition.
-        /// </summary>
-        /// <param name="name">Name of column.</param>
-        /// <param name="type">Type of column</param>
-        /// <param name="length">Length of column.</param>
-        /// <param name="primaryKey">If column is primary key.</param>
-        /// <param name="nullable">If column is nullable.</param>
-        /// <param name="modularizeType">Type of modularization for column</param>
-        /// <param name="localizable">If the column is localizable.</param>
-        /// <param name="minValueSet">If the minimum of the value was set.</param>
-        /// <param name="minValue">Minimum value for the column.</param>
-        /// <param name="maxValueSet">If the maximum value was set.</param>
-        /// <param name="maxValue">Maximum value for the colum.</param>
-        /// <param name="keyTable">Optional name of table for foreign key.</param>
-        /// <param name="keyColumnSet">If the key column was set.</param>
-        /// <param name="keyColumn">Optional name of column for foreign key.</param>
-        /// <param name="category">Validation category for column.</param>
-        /// <param name="possibilities">Set of possible values for column.</param>
-        /// <param name="description">Description of column in vaidation table.</param>
-        /// <param name="escapeIdtCharacters">If characters should be escaped in IDT.</param>
-        /// <param name="useCData">If whitespace should be preserved in a CDATA node.</param>
-        public ColumnDefinition(string name, ColumnType type, int length, bool primaryKey, bool nullable, ColumnModularizeType modularizeType, bool localizable, bool minValueSet, long minValue, bool maxValueSet, long maxValue, string keyTable, bool keyColumnSet, int keyColumn, ColumnCategory category, string possibilities, string description, bool escapeIdtCharacters, bool useCData)
-        {
-            this.name = name;
-            this.type = type;
-            this.length = length;
-            this.primaryKey = primaryKey;
-            this.nullable = nullable;
-            this.modularize = modularizeType;
-            this.localizable = localizable;
-            this.minValueSet = minValueSet;
-            this.minValue = minValue;
-            this.maxValueSet = maxValueSet;
-            this.maxValue = maxValue;
-            this.keyTable = keyTable;
-            this.keyColumnSet = keyColumnSet;
-            this.keyColumn = keyColumn;
-            this.category = category;
-            this.possibilities = possibilities;
-            this.description = description;
-            this.escapeIdtCharacters = escapeIdtCharacters;
-            this.useCData = useCData;
-        }
-
-        /// <summary>
-        /// Gets whether this column was added via a transform.
-        /// </summary>
-        /// <value>Whether this column was added via a transform.</value>
-        public bool Added
-        {
-            get { return this.added; }
-            set { this.added = value; }
-        }
-
-        /// <summary>
-        /// Gets the name of the column.
-        /// </summary>
-        /// <value>Name of column.</value>
-        public string Name
-        {
-            get { return this.name; }
-        }
-
-        /// <summary>
-        /// Gets the type of the column.
-        /// </summary>
-        /// <value>Type of column.</value>
-        public ColumnType Type
-        {
-            get { return this.type; }
-        }
-
-        /// <summary>
-        /// Gets the length of the column.
-        /// </summary>
-        /// <value>Length of column.</value>
-        public int Length
-        {
-            get { return this.length; }
-        }
-
-        /// <summary>
-        /// Gets if the column is a primary key.
-        /// </summary>
-        /// <value>true if column is primary key.</value>
-        public bool PrimaryKey
-        {
-            get { return this.primaryKey; }
-        }
-
-        /// <summary>
-        /// Gets if the column is nullable.
-        /// </summary>
-        /// <value>true if column is nullable.</value>
-        public bool Nullable
-        {
-            get { return this.nullable; }
-        }
-
-        /// <summary>
-        /// Gets the type of modularization for this column.
-        /// </summary>
-        /// <value>Column's modularization type.</value>
-        public ColumnModularizeType ModularizeType
-        {
-            get { return this.modularize; }
-        }
-
-        /// <summary>
-        /// Gets if the column is localizable. Can be because the type is localizable, or because the column 
-        /// was explicitly set to be so.
-        /// </summary>
-        /// <value>true if column is localizable.</value>
-        public bool IsLocalizable
-        {
-            get { return this.localizable || ColumnType.Localized == this.Type; }
-        }
-
-        /// <summary>
-        /// Gets if the minimum value of the column is set.
-        /// </summary>
-        /// <value>true if minimum value is set.</value>
-        public bool IsMinValueSet
-        {
-            get { return this.minValueSet; }
-        }
-
-        /// <summary>
-        /// Gets the minimum value for the column, only valid if IsMinValueSet returns true.
-        /// </summary>
-        /// <value>Minimum value for the column.</value>
-        public long MinValue
-        {
-            get { return this.minValue; }
-        }
-
-        /// <summary>
-        /// Gets if the maximum value of the column is set.
-        /// </summary>
-        /// <value>true if maximum value is set.</value>
-        public bool IsMaxValueSet
-        {
-            get { return this.maxValueSet; }
-        }
-
-        /// <summary>
-        /// Gets the maximum value for the column, only valid if IsMinValueSet returns true.
-        /// </summary>
-        /// <value>Maximum value for the column.</value>
-        public long MaxValue
-        {
-            get { return this.maxValue; }
-        }
-
-        /// <summary>
-        /// Gets the table that has the foreign key for this column
-        /// </summary>
-        /// <value>Foreign key table name.</value>
-        public string KeyTable
-        {
-            get { return this.keyTable; }
-        }
-
-        /// <summary>
-        /// Gets if the key column is set.
-        /// </summary>
-        /// <value>True if the key column is set.</value>
-        public bool IsKeyColumnSet
-        {
-            get { return this.keyColumnSet; }
-        }
-
-        /// <summary>
-        /// Gets the foreign key column that this column refers to.
-        /// </summary>
-        /// <value>Foreign key column.</value>
-        public int KeyColumn
-        {
-            get { return this.keyColumn; }
-        }
-
-        /// <summary>
-        /// Gets the validation category for this column.
-        /// </summary>
-        /// <value>Validation category.</value>
-        public ColumnCategory Category
-        {
-            get { return this.category; }
-        }
-
-        /// <summary>
-        /// Gets the set of possibilities for this column.
-        /// </summary>
-        /// <value>Set of possibilities for this column.</value>
-        public string Possibilities
-        {
-            get { return this.possibilities; }
-        }
-
-        /// <summary>
-        /// Gets the description for this column.
-        /// </summary>
-        /// <value>Description of column.</value>
-        public string Description
-        {
-            get { return this.description; }
-        }
-
-        /// <summary>
-        /// Gets if characters should be escaped to fit into IDT.
-        /// </summary>
-        /// <value>true if data should be escaped when adding to IDT.</value>
-        public bool EscapeIdtCharacters
-        {
-            get { return this.escapeIdtCharacters; }
-        }
-
-        /// <summary>
-        /// Gets if whitespace should be preserved in a CDATA node.
-        /// </summary>
-        /// <value>true if whitespace should be preserved in a CDATA node.</value>
-        public bool UseCData
-        {
-            get { return this.useCData; }
-        }
-
-        /// <summary>
-        /// Gets the type of the column in IDT format.
-        /// </summary>
-        /// <value>IDT format for column type.</value>
-        public string IdtType
-        {
-            get
-            {
-                char typeCharacter;
-                switch (this.type)
-                {
-                    case ColumnType.Number:
-                        typeCharacter = this.nullable ? 'I' : 'i';
-                        break;
-                    case ColumnType.Preserved:
-                    case ColumnType.String:
-                        typeCharacter = this.nullable ? 'S' : 's';
-                        break;
-                    case ColumnType.Localized:
-                        typeCharacter = this.nullable ? 'L' : 'l';
-                        break;
-                    case ColumnType.Object:
-                        typeCharacter = this.nullable ? 'V' : 'v';
-                        break;
-                    default:
-                        throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_UnknownColumnType, this.type));
-                }
-
-                return String.Concat(typeCharacter, this.length);
-            }
-        }
-
-        /// <summary>
-        /// Parses a column definition in a table definition.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <returns>The ColumnDefintion represented by the Xml.</returns>
-        internal static ColumnDefinition Read(XmlReader reader)
-        {
-            if (!reader.LocalName.Equals("columnDefinition"))
-            {
-                throw new XmlException();
-            }
-
-            bool added = false;
-            ColumnCategory category = ColumnCategory.Unknown;
-            string description = null;
-            bool empty = reader.IsEmptyElement;
-            bool escapeIdtCharacters = false;
-            int keyColumn = -1;
-            bool keyColumnSet = false;
-            string keyTable = null;
-            int length = -1;
-            bool localizable = false;
-            long maxValue = 0;
-            bool maxValueSet = false;
-            long minValue = 0;
-            bool minValueSet = false;
-            ColumnModularizeType modularize = ColumnModularizeType.None;
-            string name = null;
-            bool nullable = false;
-            string possibilities = null;
-            bool primaryKey = false;
-            ColumnType type = ColumnType.Unknown;
-            bool useCData = false;
-
-            // parse the attributes
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "added":
-                        added = reader.Value.Equals("yes");
-                        break;
-                    case "category":
-                        switch (reader.Value)
-                        {
-                            case "anyPath":
-                                category = ColumnCategory.AnyPath;
-                                break;
-                            case "binary":
-                                category = ColumnCategory.Binary;
-                                break;
-                            case "cabinet":
-                                category = ColumnCategory.Cabinet;
-                                break;
-                            case "condition":
-                                category = ColumnCategory.Condition;
-                                break;
-                            case "customSource":
-                                category = ColumnCategory.CustomSource;
-                                break;
-                            case "defaultDir":
-                                category = ColumnCategory.DefaultDir;
-                                break;
-                            case "doubleInteger":
-                                category = ColumnCategory.DoubleInteger;
-                                break;
-                            case "filename":
-                                category = ColumnCategory.Filename;
-                                break;
-                            case "formatted":
-                                category = ColumnCategory.Formatted;
-                                break;
-                            case "formattedSddl":
-                                category = ColumnCategory.FormattedSDDLText;
-                                break;
-                            case "guid":
-                                category = ColumnCategory.Guid;
-                                break;
-                            case "identifier":
-                                category = ColumnCategory.Identifier;
-                                break;
-                            case "integer":
-                                category = ColumnCategory.Integer;
-                                break;
-                            case "language":
-                                category = ColumnCategory.Language;
-                                break;
-                            case "lowerCase":
-                                category = ColumnCategory.LowerCase;
-                                break;
-                            case "path":
-                                category = ColumnCategory.Path;
-                                break;
-                            case "paths":
-                                category = ColumnCategory.Paths;
-                                break;
-                            case "property":
-                                category = ColumnCategory.Property;
-                                break;
-                            case "regPath":
-                                category = ColumnCategory.RegPath;
-                                break;
-                            case "shortcut":
-                                category = ColumnCategory.Shortcut;
-                                break;
-                            case "template":
-                                category = ColumnCategory.Template;
-                                break;
-                            case "text":
-                                category = ColumnCategory.Text;
-                                break;
-                            case "timeDate":
-                                category = ColumnCategory.TimeDate;
-                                break;
-                            case "upperCase":
-                                category = ColumnCategory.UpperCase;
-                                break;
-                            case "version":
-                                category = ColumnCategory.Version;
-                                break;
-                            case "wildCardFilename":
-                                category = ColumnCategory.WildCardFilename;
-                                break;
-                            default:
-                                throw new InvalidOperationException();
-                        }
-                        break;
-                    case "description":
-                        description = reader.Value;
-                        break;
-                    case "escapeIdtCharacters":
-                        escapeIdtCharacters = reader.Value.Equals("yes");
-                        break;
-                    case "keyColumn":
-                        keyColumnSet = true;
-                        keyColumn = Convert.ToInt32(reader.Value, 10);
-                        break;
-                    case "keyTable":
-                        keyTable = reader.Value;
-                        break;
-                    case "length":
-                        length = Convert.ToInt32(reader.Value, 10);
-                        break;
-                    case "localizable":
-                        localizable = reader.Value.Equals("yes");
-                        break;
-                    case "maxValue":
-                        maxValueSet = true;
-                        maxValue = Convert.ToInt32(reader.Value, 10);
-                        break;
-                    case "minValue":
-                        minValueSet = true;
-                        minValue = Convert.ToInt32(reader.Value, 10);
-                        break;
-                    case "modularize":
-                        switch (reader.Value)
-                        {
-                            case "column":
-                                modularize = ColumnModularizeType.Column;
-                                break;
-                            case "companionFile":
-                                modularize = ColumnModularizeType.CompanionFile;
-                                break;
-                            case "condition":
-                                modularize = ColumnModularizeType.Condition;
-                                break;
-                            case "controlEventArgument":
-                                modularize = ColumnModularizeType.ControlEventArgument;
-                                break;
-                            case "controlText":
-                                modularize = ColumnModularizeType.ControlText;
-                                break;
-                            case "icon":
-                                modularize = ColumnModularizeType.Icon;
-                                break;
-                            case "none":
-                                modularize = ColumnModularizeType.None;
-                                break;
-                            case "property":
-                                modularize = ColumnModularizeType.Property;
-                                break;
-                            case "semicolonDelimited":
-                                modularize = ColumnModularizeType.SemicolonDelimited;
-                                break;
-                            default:
-                                throw new XmlException();
-                        }
-                        break;
-                    case "name":
-                        switch (reader.Value)
-                        {
-                            case "CREATE":
-                            case "DELETE":
-                            case "DROP":
-                            case "INSERT":
-                                throw new XmlException();
-                            default:
-                                name = reader.Value;
-                                break;
-                        }
-                        break;
-                    case "nullable":
-                        nullable = reader.Value.Equals("yes");
-                        break;
-                    case "primaryKey":
-                        primaryKey = reader.Value.Equals("yes");
-                        break;
-                    case "set":
-                        possibilities = reader.Value;
-                        break;
-                    case "type":
-                        switch (reader.Value)
-                        {
-                            case "localized":
-                                type = ColumnType.Localized;
-                                break;
-                            case "number":
-                                type = ColumnType.Number;
-                                break;
-                            case "object":
-                                type = ColumnType.Object;
-                                break;
-                            case "string":
-                                type = ColumnType.String;
-                                break;
-                            case "preserved":
-                                type = ColumnType.Preserved;
-                                break;
-                            default:
-                                throw new XmlException();
-                        }
-                        break;
-                    case "useCData":
-                        useCData = reader.Value.Equals("yes");
-                        break;
-                }
-            }
-
-            // parse the child elements (there should be none)
-            if (!empty)
-            {
-                bool done = false;
-
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            throw new XmlException();
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            ColumnDefinition columnDefinition = new ColumnDefinition(name, type, length, primaryKey, nullable, modularize, localizable, minValueSet, minValue, maxValueSet, maxValue, keyTable, keyColumnSet, keyColumn, category, possibilities, description, escapeIdtCharacters, useCData);
-            columnDefinition.Added = added;
-
-            return columnDefinition;
-        }
-
-        /// <summary>
-        /// Persists a ColumnDefinition in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>
-        internal void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("columnDefinition", TableDefinitionCollection.XmlNamespaceUri);
-
-            writer.WriteAttributeString("name", this.name);
-
-            switch (this.type)
-            {
-                case ColumnType.Localized:
-                    writer.WriteAttributeString("type", "localized");
-                    break;
-                case ColumnType.Number:
-                    writer.WriteAttributeString("type", "number");
-                    break;
-                case ColumnType.Object:
-                    writer.WriteAttributeString("type", "object");
-                    break;
-                case ColumnType.String:
-                    writer.WriteAttributeString("type", "string");
-                    break;
-                case ColumnType.Preserved:
-                    writer.WriteAttributeString("type", "preserved");
-                    break;
-            }
-
-            writer.WriteAttributeString("length", this.length.ToString(CultureInfo.InvariantCulture.NumberFormat));
-
-            if (this.primaryKey)
-            {
-                writer.WriteAttributeString("primaryKey", "yes");
-            }
-
-            if (this.nullable)
-            {
-                writer.WriteAttributeString("nullable", "yes");
-            }
-
-            if (this.localizable)
-            {
-                writer.WriteAttributeString("localizable", "yes");
-            }
-
-            if (this.added)
-            {
-                writer.WriteAttributeString("added", "yes");
-            }
-
-            switch (this.modularize)
-            {
-                case ColumnModularizeType.Column:
-                    writer.WriteAttributeString("modularize", "column");
-                    break;
-                case ColumnModularizeType.CompanionFile:
-                    writer.WriteAttributeString("modularize", "companionFile");
-                    break;
-                case ColumnModularizeType.Condition:
-                    writer.WriteAttributeString("modularize", "condition");
-                    break;
-                case ColumnModularizeType.ControlEventArgument:
-                    writer.WriteAttributeString("modularize", "controlEventArgument");
-                    break;
-                case ColumnModularizeType.ControlText:
-                    writer.WriteAttributeString("modularize", "controlText");
-                    break;
-                case ColumnModularizeType.Icon:
-                    writer.WriteAttributeString("modularize", "icon");
-                    break;
-                case ColumnModularizeType.None:
-                    // this is the default value
-                    break;
-                case ColumnModularizeType.Property:
-                    writer.WriteAttributeString("modularize", "property");
-                    break;
-                case ColumnModularizeType.SemicolonDelimited:
-                    writer.WriteAttributeString("modularize", "semicolonDelimited");
-                    break;
-            }
-
-            if (this.minValueSet)
-            {
-                writer.WriteAttributeString("minValue", this.minValue.ToString(CultureInfo.InvariantCulture.NumberFormat));
-            }
-
-            if (this.maxValueSet)
-            {
-                writer.WriteAttributeString("maxValue", this.maxValue.ToString(CultureInfo.InvariantCulture.NumberFormat));
-            }
-
-            if (!String.IsNullOrEmpty(this.keyTable))
-            {
-                writer.WriteAttributeString("keyTable", this.keyTable);
-            }
-
-            if (this.keyColumnSet)
-            {
-                writer.WriteAttributeString("keyColumn", this.keyColumn.ToString(CultureInfo.InvariantCulture.NumberFormat));
-            }
-
-            switch (this.category)
-            {
-                case ColumnCategory.AnyPath:
-                    writer.WriteAttributeString("category", "anyPath");
-                    break;
-                case ColumnCategory.Binary:
-                    writer.WriteAttributeString("category", "binary");
-                    break;
-                case ColumnCategory.Cabinet:
-                    writer.WriteAttributeString("category", "cabinet");
-                    break;
-                case ColumnCategory.Condition:
-                    writer.WriteAttributeString("category", "condition");
-                    break;
-                case ColumnCategory.CustomSource:
-                    writer.WriteAttributeString("category", "customSource");
-                    break;
-                case ColumnCategory.DefaultDir:
-                    writer.WriteAttributeString("category", "defaultDir");
-                    break;
-                case ColumnCategory.DoubleInteger:
-                    writer.WriteAttributeString("category", "doubleInteger");
-                    break;
-                case ColumnCategory.Filename:
-                    writer.WriteAttributeString("category", "filename");
-                    break;
-                case ColumnCategory.Formatted:
-                    writer.WriteAttributeString("category", "formatted");
-                    break;
-                case ColumnCategory.FormattedSDDLText:
-                    writer.WriteAttributeString("category", "formattedSddl");
-                    break;
-                case ColumnCategory.Guid:
-                    writer.WriteAttributeString("category", "guid");
-                    break;
-                case ColumnCategory.Identifier:
-                    writer.WriteAttributeString("category", "identifier");
-                    break;
-                case ColumnCategory.Integer:
-                    writer.WriteAttributeString("category", "integer");
-                    break;
-                case ColumnCategory.Language:
-                    writer.WriteAttributeString("category", "language");
-                    break;
-                case ColumnCategory.LowerCase:
-                    writer.WriteAttributeString("category", "lowerCase");
-                    break;
-                case ColumnCategory.Path:
-                    writer.WriteAttributeString("category", "path");
-                    break;
-                case ColumnCategory.Paths:
-                    writer.WriteAttributeString("category", "paths");
-                    break;
-                case ColumnCategory.Property:
-                    writer.WriteAttributeString("category", "property");
-                    break;
-                case ColumnCategory.RegPath:
-                    writer.WriteAttributeString("category", "regPath");
-                    break;
-                case ColumnCategory.Shortcut:
-                    writer.WriteAttributeString("category", "shortcut");
-                    break;
-                case ColumnCategory.Template:
-                    writer.WriteAttributeString("category", "template");
-                    break;
-                case ColumnCategory.Text:
-                    writer.WriteAttributeString("category", "text");
-                    break;
-                case ColumnCategory.TimeDate:
-                    writer.WriteAttributeString("category", "timeDate");
-                    break;
-                case ColumnCategory.UpperCase:
-                    writer.WriteAttributeString("category", "upperCase");
-                    break;
-                case ColumnCategory.Version:
-                    writer.WriteAttributeString("category", "version");
-                    break;
-                case ColumnCategory.WildCardFilename:
-                    writer.WriteAttributeString("category", "wildCardFilename");
-                    break;
-            }
-
-            if (!String.IsNullOrEmpty(this.possibilities))
-            {
-                writer.WriteAttributeString("set", this.possibilities);
-            }
-
-            if (!String.IsNullOrEmpty(this.description))
-            {
-                writer.WriteAttributeString("description", this.description);
-            }
-
-            if (this.escapeIdtCharacters)
-            {
-                writer.WriteAttributeString("escapeIdtCharacters", "yes");
-            }
-
-            if (this.useCData)
-            {
-                writer.WriteAttributeString("useCData", "yes");
-            }
-
-            writer.WriteEndElement();
-        }
-
-        /// <summary>
-        /// Validate a value for this column.
-        /// </summary>
-        /// <param name="value">The value to validate.</param>
-        /// <returns>Validated value.</returns>
-        internal object ValidateValue(object value)
-        {
-            if (null == value)
-            {
-                if (!this.nullable)
-                {
-                    throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with a null value because this is a required field.", this.name));
-                }
-            }
-            else // check numerical values against their specified minimum and maximum values.
-            {
-                if (ColumnType.Number == this.type && !this.IsLocalizable)
-                {
-                    // For now all enums in the tables can be represented by integers. This if statement would need to
-                    // be enhanced if that ever changes.
-                    if (value is int || value.GetType().IsEnum)
-                    {
-                        int intValue = (int)value;
-
-                        // validate the value against the minimum allowed value
-                        if (this.minValueSet && this.minValue > intValue)
-                        {
-                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is less than the minimum allowed value for this column, {2}.", this.name, intValue, this.minValue));
-                        }
-
-                        // validate the value against the maximum allowed value
-                        if (this.maxValueSet && this.maxValue < intValue)
-                        {
-                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is greater than the maximum allowed value for this column, {2}.", this.name, intValue, this.maxValue));
-                        }
-
-                        return intValue;
-                    }
-                    else if (value is long)
-                    {
-                        long longValue = (long)value;
-
-                        // validate the value against the minimum allowed value
-                        if (this.minValueSet && this.minValue > longValue)
-                        {
-                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is less than the minimum allowed value for this column, {2}.", this.name, longValue, this.minValue));
-                        }
-
-                        // validate the value against the maximum allowed value
-                        if (this.maxValueSet && this.maxValue < longValue)
-                        {
-                            throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set column '{0}' with value {1} because it is greater than the maximum allowed value for this column, {2}.", this.name, longValue, this.maxValue));
-                        }
-
-                        return longValue;
-                    }
-                    else
-                    {
-                        throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set number column '{0}' with a value of type '{1}'.", this.name, value.GetType().ToString()));
-                    }
-                }
-                else
-                {
-                    if (!(value is string))
-                    {
-                        //throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set string column '{0}' with a value of type '{1}'.", this.name, value.GetType().ToString()));
-                        return value.ToString();
-                    }
-                }
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Compare this column definition to another column definition.
-        /// </summary>
-        /// <remarks>
-        /// Only Windows Installer traits are compared, allowing for updates to WiX-specific table definitions.
-        /// </remarks>
-        /// <param name="other">The <see cref="ColumnDefinition"/> to compare with this one.</param>
-        /// <returns>0 if the columns' core propeties are the same; otherwise, non-0.</returns>
-        public int CompareTo(ColumnDefinition other)
-        {
-            // by definition, this object is greater than null
-            if (null == other)
-            {
-                return 1;
-            }
-
-            // compare column names
-            int ret = String.Compare(this.Name, other.Name, StringComparison.Ordinal);
-
-            // compare column types
-            if (0 == ret)
-            {
-                ret = this.Type == other.Type ? 0 : -1;
-
-                // compare column lengths
-                if (0 == ret)
-                {
-                    ret = this.Length == other.Length ? 0 : -1;
-
-                    // compare whether both are primary keys
-                    if (0 == ret)
-                    {
-                        ret = this.PrimaryKey == other.PrimaryKey ? 0 : -1;
-
-                        // compare nullability
-                        if (0 == ret)
-                        {
-                            ret = this.Nullable == other.Nullable ? 0 : -1;
-                        }
-                    }
-                }
-            }
-
-            return ret;
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Common.cs b/src/WixToolset.Data.WindowsInstaller/Common.cs
deleted file mode 100644
index a1e1e607..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Common.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Text.RegularExpressions;
-
-    internal static class Common
-    {
-        private static readonly Regex LegalIdentifierCharacters = new Regex(@"^[_A-Za-z][0-9A-Za-z_\.]*$", RegexOptions.Compiled);
-
-        public static bool IsIdentifier(string value)
-        {
-            if (!String.IsNullOrEmpty(value))
-            {
-                if (LegalIdentifierCharacters.IsMatch(value))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Field.cs b/src/WixToolset.Data.WindowsInstaller/Field.cs
deleted file mode 100644
index 74b78229..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Field.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Xml;
-
-    /// <summary>
-    /// Field containing data for a column in a row.
-    /// </summary>
-    public class Field
-    {
-        private object data;
-
-        /// <summary>
-        /// Instantiates a new Field.
-        /// </summary>
-        /// <param name="columnDefinition">Column definition for this field.</param>
-        protected Field(ColumnDefinition columnDefinition)
-        {
-            this.Column = columnDefinition;
-        }
-
-        /// <summary>
-        /// Gets or sets the column definition for this field.
-        /// </summary>
-        /// <value>Column definition.</value>
-        public ColumnDefinition Column { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the data for this field.
-        /// </summary>
-        /// <value>Data in the field.</value>
-        public object Data
-        {
-            get
-            {
-                return this.data;
-            }
-
-            set
-            {
-                // Validate the value before setting it.
-                this.data = this.Column.ValidateValue(value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets whether this field is modified.
-        /// </summary>
-        /// <value>Whether this field is modified.</value>
-        public bool Modified { get; set; }
-
-        /// <summary>
-        /// Gets or sets the previous data.
-        /// </summary>
-        /// <value>The previous data.</value>
-        public string PreviousData { get; set; }
-
-        /// <summary>
-        /// Instantiate a new Field object of the correct type.
-        /// </summary>
-        /// <param name="columnDefinition">The column definition for the field.</param>
-        /// <returns>The new Field object.</returns>
-        public static Field Create(ColumnDefinition columnDefinition)
-        {
-            return (ColumnType.Object == columnDefinition.Type) ? new ObjectField(columnDefinition) : new Field(columnDefinition);
-        }
-
-        /// <summary>
-        /// Sets the value of a particular field in the row without validating.
-        /// </summary>
-        /// <param name="field">field index.</param>
-        /// <param name="value">Value of a field in the row.</param>
-        /// <returns>True if successful, false if validation failed.</returns>
-        public bool BestEffortSet(object value)
-        {
-            bool success = true;
-            object bestEffortValue = value;
-
-            try
-            {
-                bestEffortValue = this.Column.ValidateValue(value);
-            }
-            catch (InvalidOperationException)
-            {
-                success = false;
-            }
-
-            this.data = bestEffortValue;
-            return success;
-        }
-
-        /// <summary>
-        /// Determine if this field is identical to another field.
-        /// </summary>
-        /// <param name="field">The other field to compare to.</param>
-        /// <returns>true if they are equal; false otherwise.</returns>
-        public bool IsIdentical(Field field)
-        {
-            return (this.Column.Name == field.Column.Name &&
-                ((null != this.data && this.data.Equals(field.data)) || (null == this.data && null == field.data)));
-        }
-
-        /// <summary>
-        /// Overrides the built in object implementation to return the field's data as a string.
-        /// </summary>
-        /// <returns>Field's data as a string.</returns>
-        public override string ToString()
-        {
-            return this.AsString();
-        }
-
-        /// <summary>
-        /// Gets the field as an integer.
-        /// </summary>
-        /// <returns>Field's data as an integer.</returns>
-        public int AsInteger()
-        {
-            return (this.data is int) ? (int)this.data : Convert.ToInt32(this.data, CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Gets the field as an integer that could be null.
-        /// </summary>
-        /// <returns>Field's data as an integer that could be null.</returns>
-        public int? AsNullableInteger()
-        {
-            return (null == this.data) ? (int?)null : (this.data is int) ? (int)this.data : Convert.ToInt32(this.data, CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Gets the field as a string.
-        /// </summary>
-        /// <returns>Field's data as a string.</returns>
-        public string AsString()
-        {
-            return (null == this.data) ? null : Convert.ToString(this.data, CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Parse a field from the xml.
-        /// </summary>
-        /// <param name="reader">XmlReader where the intermediate is persisted.</param>
-        internal virtual void Read(XmlReader reader)
-        {
-            Debug.Assert("field" == reader.LocalName);
-
-            bool empty = reader.IsEmptyElement;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "modified":
-                        this.Modified = reader.Value.Equals("yes");
-                        break;
-                    case "previousData":
-                        this.PreviousData = reader.Value;
-                        break;
-                }
-            }
-
-            if (!empty)
-            {
-                bool done = false;
-
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            throw new XmlException();
-                        case XmlNodeType.CDATA:
-                        case XmlNodeType.Text:
-                        case XmlNodeType.SignificantWhitespace:
-                            if (0 < reader.Value.Length)
-                            {
-                                if (ColumnType.Number == this.Column.Type && !this.Column.IsLocalizable)
-                                {
-                                    // older wix files could persist data as a long value (which would overflow an int)
-                                    // since the Convert class always throws exceptions for overflows, read in integral
-                                    // values as a long to avoid the overflow, then cast it to an int (this operation can
-                                    // overflow without throwing an exception inside an unchecked block)
-                                    this.data = unchecked((int)Convert.ToInt64(reader.Value, CultureInfo.InvariantCulture));
-                                }
-                                else
-                                {
-                                    this.data = reader.Value;
-                                }
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Persists a field in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Field should persist itself as XML.</param>
-        internal virtual void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("field", Intermediate.XmlNamespaceUri);
-
-            if (this.Modified)
-            {
-                writer.WriteAttributeString("modified", "yes");
-            }
-
-            if (null != this.PreviousData)
-            {
-                writer.WriteAttributeString("previousData", this.PreviousData);
-            }
-
-            // Convert the data to a string that will persist nicely (nulls as String.Empty).
-            string text = Convert.ToString(this.data, CultureInfo.InvariantCulture);
-            if (this.Column.UseCData)
-            {
-                writer.WriteCData(text);
-            }
-            else
-            {
-                writer.WriteString(text);
-            }
-
-            writer.WriteEndElement();
-        }
-
-        /// <summary>
-        /// Returns the field data in a format usable in IDT files.
-        /// </summary>
-        /// <returns>Field data in string IDT format.</returns>
-        internal string ToIdtValue()
-        {
-            if (null == this.data)
-            {
-                return null;
-            }
-            else
-            {
-                string fieldData = Convert.ToString(this.data, CultureInfo.InvariantCulture);
-
-                // special idt-specific escaping
-                if (this.Column.EscapeIdtCharacters)
-                {
-                    fieldData = fieldData.Replace('\t', '\x10');
-                    fieldData = fieldData.Replace('\r', '\x11');
-                    fieldData = fieldData.Replace('\n', '\x19');
-                }
-
-                return fieldData;
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/ObjectField.cs b/src/WixToolset.Data.WindowsInstaller/ObjectField.cs
deleted file mode 100644
index 42ef111b..00000000
--- a/src/WixToolset.Data.WindowsInstaller/ObjectField.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Xml;
-
-    /// <summary>
-    /// Field containing data for an object column in a row.
-    /// </summary>
-    public sealed class ObjectField : Field
-    {
-        /// <summary>
-        /// Instantiates a new Field.
-        /// </summary>
-        /// <param name="columnDefinition">Column definition for this field.</param>
-        internal ObjectField(ColumnDefinition columnDefinition) :
-            base(columnDefinition)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the index of the embedded file in a library.
-        /// </summary>
-        /// <value>The index of the embedded file.</value>
-        public int? EmbeddedFileIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the previous index of the embedded file in the library.
-        /// </summary>
-        /// <value>The previous index of the embedded file.</value>
-        public int? PreviousEmbeddedFileIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path to the embedded cabinet of the previous file.
-        /// </summary>
-        /// <value>The path of the cabinet containing the previous file.</value>
-        public Uri PreviousBaseUri { get; set; }
-
-        /// <summary>
-        /// Gets the base URI of the object field.
-        /// </summary>
-        /// <value>The base URI of the object field.</value>
-        public Uri BaseUri { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the unresolved data for this field.
-        /// </summary>
-        /// <value>Unresolved Data in the field.</value>
-        public string UnresolvedData { get; set; }
-
-        /// <summary>
-        /// Gets or sets the unresolved previous data.
-        /// </summary>
-        /// <value>The unresolved previous data.</value>
-        public string UnresolvedPreviousData { get; set; }
-
-        /// <summary>
-        /// Parse a field from the xml.
-        /// </summary>
-        /// <param name="reader">XmlReader where the intermediate is persisted.</param>
-        internal override void Read(XmlReader reader)
-        {
-            Debug.Assert("field" == reader.LocalName);
-
-            bool empty = reader.IsEmptyElement;
-
-            this.BaseUri = new Uri(reader.BaseURI);
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "cabinetFileId":
-                        this.EmbeddedFileIndex = Convert.ToInt32(reader.Value);
-                        break;
-                    case "modified":
-                        this.Modified = reader.Value.Equals("yes");
-                        break;
-                    case "previousData":
-                        this.PreviousData = reader.Value;
-                        break;
-                    case "unresolvedPreviousData":
-                        this.UnresolvedPreviousData = reader.Value;
-                        break;
-                    case "unresolvedData":
-                        this.UnresolvedData = reader.Value;
-                        break;
-                    case "previousCabinetFileId":
-                        this.PreviousEmbeddedFileIndex = Convert.ToInt32(reader.Value);
-                        break;
-                }
-            }
-
-            if (!empty)
-            {
-                bool done = false;
-
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            throw new XmlException();
-                        case XmlNodeType.CDATA:
-                        case XmlNodeType.Text:
-                            if (0 < reader.Value.Length)
-                            {
-                                this.Data = reader.Value;
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Persists a field in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Field should persist itself as XML.</param>
-        internal override void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("field", Intermediate.XmlNamespaceUri);
-
-            if (this.EmbeddedFileIndex.HasValue)
-            {
-                writer.WriteStartAttribute("cabinetFileId");
-                writer.WriteValue(this.EmbeddedFileIndex);
-                writer.WriteEndAttribute();
-            }
-
-            if (this.Modified)
-            {
-                writer.WriteAttributeString("modified", "yes");
-            }
-
-            if (null != this.UnresolvedPreviousData)
-            {
-                writer.WriteAttributeString("unresolvedPreviousData", this.UnresolvedPreviousData);
-            }
-
-            if (null != this.PreviousData)
-            {
-                writer.WriteAttributeString("previousData", this.PreviousData);
-            }
-
-            if (null != this.UnresolvedData)
-            {
-                writer.WriteAttributeString("unresolvedData", this.UnresolvedData);
-            }
-
-            if (this.PreviousEmbeddedFileIndex.HasValue)
-            {
-                writer.WriteStartAttribute("previousCabinetFileId");
-                writer.WriteValue(this.PreviousEmbeddedFileIndex);
-                writer.WriteEndAttribute();
-            }
-
-            // Convert the data to a string that will persist nicely (nulls as String.Empty).
-            string text = Convert.ToString(this.Data, CultureInfo.InvariantCulture);
-            if (this.Column.UseCData)
-            {
-                writer.WriteCData(text);
-            }
-            else
-            {
-                writer.WriteString(text);
-            }
-
-            writer.WriteEndElement();
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Output.cs b/src/WixToolset.Data.WindowsInstaller/Output.cs
deleted file mode 100644
index 26772872..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Output.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Xml;
-
-    /// <summary>
-    /// Output is generated by the linker.
-    /// </summary>
-    public sealed class Output
-    {
-        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wixout";
-        private static readonly Version CurrentVersion = new Version("4.0.0.0");
-
-        /// <summary>
-        /// Creates a new empty output object.
-        /// </summary>
-        /// <param name="sourceLineNumbers">The source line information for the output.</param>
-        public Output(SourceLineNumber sourceLineNumbers)
-        {
-            this.SourceLineNumbers = sourceLineNumbers;
-            this.SubStorages = new List<SubStorage>();
-            this.Tables = new TableIndexedCollection();
-        }
-
-        /// <summary>
-        /// Gets the type of the output.
-        /// </summary>
-        /// <value>Type of the output.</value>
-        public OutputType Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the codepage for this output.
-        /// </summary>
-        /// <value>Codepage of the output.</value>
-        public int Codepage { get; set; }
-
-        /// <summary>
-        /// Gets the source line information for this output.
-        /// </summary>
-        /// <value>The source line information for this output.</value>
-        public SourceLineNumber SourceLineNumbers { get; private set; }
-
-        /// <summary>
-        /// Gets the substorages in this output.
-        /// </summary>
-        /// <value>The substorages in this output.</value>
-        public ICollection<SubStorage> SubStorages { get; private set; }
-
-        /// <summary>
-        /// Gets the tables contained in this output.
-        /// </summary>
-        /// <value>Collection of tables.</value>
-        public TableIndexedCollection Tables { get; private set; }
-
-        /// <summary>
-        /// Gets the output type corresponding to a given output filename extension.
-        /// </summary>
-        /// <param name="extension">Case-insensitive output filename extension.</param>
-        /// <returns>Output type for the extension.</returns>
-        public static OutputType GetOutputType(string extension)
-        {
-            if (extension.Equals(".exe", StringComparison.OrdinalIgnoreCase))
-            {
-                return OutputType.Bundle;
-            }
-            if (extension.Equals(".msi", StringComparison.OrdinalIgnoreCase))
-            {
-                return OutputType.Product;
-            }
-            else if (extension.Equals(".msm", StringComparison.OrdinalIgnoreCase))
-            {
-                return OutputType.Module;
-            }
-            else if (extension.Equals(".msp", StringComparison.OrdinalIgnoreCase))
-            {
-                return OutputType.Patch;
-            }
-            else if (extension.Equals(".mst", StringComparison.OrdinalIgnoreCase))
-            {
-                return OutputType.Transform;
-            }
-            else if (extension.Equals(".pcp", StringComparison.OrdinalIgnoreCase))
-            {
-                return OutputType.PatchCreation;
-            }
-            else
-            {
-                return OutputType.Unknown;
-            }
-        }
-
-        /// <summary>
-        /// Gets the filename extension corresponding to a given output type.
-        /// </summary>
-        /// <param name="type">One of the WiX output types.</param>
-        /// <returns>Filename extension for the output type, for example ".msi".</returns>
-        public static string GetExtension(OutputType type)
-        {
-            switch (type)
-            {
-                case OutputType.Bundle:
-                    return ".exe";
-                case OutputType.Product:
-                    return ".msi";
-                case OutputType.Module:
-                    return ".msm";
-                case OutputType.Patch:
-                    return ".msp";
-                case OutputType.Transform:
-                    return ".mst";
-                case OutputType.PatchCreation:
-                    return ".pcp";
-                default:
-                    return ".wix";
-            }
-        }
-
-        /// <summary>
-        /// Loads an output from a path on disk.
-        /// </summary>
-        /// <param name="path">Path to output file saved on disk.</param>
-        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
-        /// <returns>Output object.</returns>
-        public static Output Load(string path, bool suppressVersionCheck)
-        {
-            using (FileStream stream = File.OpenRead(path))
-            using (FileStructure fs = FileStructure.Read(stream))
-            {
-                if (FileFormat.Wixout != fs.FileFormat)
-                {
-                    throw new WixUnexpectedFileFormatException(path, FileFormat.Wixout, fs.FileFormat);
-                }
-
-                Uri uri = new Uri(Path.GetFullPath(path));
-                using (XmlReader reader = XmlReader.Create(fs.GetDataStream(), null, uri.AbsoluteUri))
-                {
-                    try
-                    {
-                        reader.MoveToContent();
-                        return Output.Read(reader, suppressVersionCheck);
-                    }
-                    catch (XmlException xe)
-                    {
-                        throw new WixCorruptFileException(path, fs.FileFormat, xe);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Saves an output to a path on disk.
-        /// </summary>
-        /// <param name="path">Path to save output file to on disk.</param>
-        public void Save(string path)
-        {
-            Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(path)));
-
-            using (FileStream stream = File.Create(path))
-            using (FileStructure fs = FileStructure.Create(stream, FileFormat.Wixout, null))
-            using (XmlWriter writer = XmlWriter.Create(fs.GetDataStream()))
-            {
-                writer.WriteStartDocument();
-                this.Write(writer);
-                writer.WriteEndDocument();
-            }
-        }
-
-        /// <summary>
-        /// Processes an XmlReader and builds up the output object.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
-        /// <returns>The Output represented by the Xml.</returns>
-        internal static Output Read(XmlReader reader, bool suppressVersionCheck)
-        {
-            if (!reader.LocalName.Equals("wixOutput"))
-            {
-                throw new XmlException();
-            }
-
-            bool empty = reader.IsEmptyElement;
-            Output output = new Output(SourceLineNumber.CreateFromUri(reader.BaseURI));
-            Version version = null;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "codepage":
-                        output.Codepage = Convert.ToInt32(reader.Value, CultureInfo.InvariantCulture.NumberFormat);
-                        break;
-                    case "type":
-                        switch (reader.Value)
-                        {
-                            case "Bundle":
-                                output.Type = OutputType.Bundle;
-                                break;
-                            case "Module":
-                                output.Type = OutputType.Module;
-                                break;
-                            case "Patch":
-                                output.Type = OutputType.Patch;
-                                break;
-                            case "PatchCreation":
-                                output.Type = OutputType.PatchCreation;
-                                break;
-                            case "Product":
-                                output.Type = OutputType.Product;
-                                break;
-                            case "Transform":
-                                output.Type = OutputType.Transform;
-                                break;
-                            default:
-                                throw new XmlException();
-                        }
-                        break;
-                    case "version":
-                        version = new Version(reader.Value);
-                        break;
-                }
-            }
-
-            if (!suppressVersionCheck && null != version && !Output.CurrentVersion.Equals(version))
-            {
-                throw new WixException(WixDataErrors.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixOutput", version.ToString(), Output.CurrentVersion.ToString()));
-            }
-
-            // loop through the rest of the xml building up the Output object
-            TableDefinitionCollection tableDefinitions = null;
-            List<Table> tables = new List<Table>();
-            if (!empty)
-            {
-                bool done = false;
-
-                // loop through all the fields in a row
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "subStorage":
-                                    output.SubStorages.Add(SubStorage.Read(reader));
-                                    break;
-                                case "table":
-                                    if (null == tableDefinitions)
-                                    {
-                                        throw new XmlException();
-                                    }
-                                    tables.Add(Table.Read(reader, tableDefinitions));
-                                    break;
-                                case "tableDefinitions":
-                                    tableDefinitions = TableDefinitionCollection.Read(reader);
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            output.Tables = new TableIndexedCollection(tables);
-            return output;
-        }
-
-        /// <summary>
-        /// Ensure this output contains a particular table.
-        /// </summary>
-        /// <param name="tableDefinition">Definition of the table that should exist.</param>
-        /// <param name="section">Optional section to use for the table. If one is not provided, the entry section will be used.</param>
-        /// <returns>The table in this output.</returns>
-        public Table EnsureTable(TableDefinition tableDefinition)
-        {
-            if (!this.Tables.TryGetTable(tableDefinition.Name, out Table table))
-            {
-                table = new Table(tableDefinition);
-                this.Tables.Add(table);
-            }
-
-            return table;
-        }
-
-        /// <summary>
-        /// Persists an output in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>
-        internal void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("wixOutput", XmlNamespaceUri);
-
-            writer.WriteAttributeString("type", this.Type.ToString());
-
-            if (0 != this.Codepage)
-            {
-                writer.WriteAttributeString("codepage", this.Codepage.ToString(CultureInfo.InvariantCulture));
-            }
-
-            writer.WriteAttributeString("version", Output.CurrentVersion.ToString());
-
-            // Collect all the table definitions and write them.
-            TableDefinitionCollection tableDefinitions = new TableDefinitionCollection();
-            foreach (Table table in this.Tables)
-            {
-                tableDefinitions.Add(table.Definition);
-            }
-            tableDefinitions.Write(writer);
-
-            foreach (Table table in this.Tables.OrderBy(t => t.Name))
-            {
-                table.Write(writer);
-            }
-
-            foreach (SubStorage subStorage in this.SubStorages)
-            {
-                subStorage.Write(writer);
-            }
-
-            writer.WriteEndElement();
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Pdb.cs b/src/WixToolset.Data.WindowsInstaller/Pdb.cs
deleted file mode 100644
index 03c3ddbb..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Pdb.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.IO;
-    using System.Xml;
-
-    /// <summary>
-    /// Pdb generated by the binder.
-    /// </summary>
-    public sealed class Pdb
-    {
-        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wixpdb";
-        private static readonly Version CurrentVersion = new Version("4.0.0.0");
-
-        /// <summary>
-        /// Creates a new empty pdb object.
-        /// </summary>
-        /// <param name="sourceLineNumbers">The source line information for the pdb.</param>
-        public Pdb()
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the output that is a part of this pdb.
-        /// </summary>
-        /// <value>Type of the output.</value>
-        public Output Output { get; set; }
-
-        /// <summary>
-        /// Loads a pdb from a path on disk.
-        /// </summary>
-        /// <param name="path">Path to pdb file saved on disk.</param>
-        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
-        /// <returns>Pdb pdb.</returns>
-        public static Pdb Load(string path, bool suppressVersionCheck)
-        {
-            using (FileStream stream = File.OpenRead(path))
-            using (FileStructure fs = FileStructure.Read(stream))
-            {
-                if (FileFormat.Wixpdb != fs.FileFormat)
-                {
-                    throw new WixUnexpectedFileFormatException(path, FileFormat.Wixpdb, fs.FileFormat);
-                }
-
-                Uri uri = new Uri(Path.GetFullPath(path));
-                using (XmlReader reader = XmlReader.Create(fs.GetDataStream(), null, uri.AbsoluteUri))
-                {
-                    try
-                    {
-                        reader.MoveToContent();
-                        return Pdb.Read(reader, suppressVersionCheck);
-                    }
-                    catch (XmlException xe)
-                    {
-                        throw new WixCorruptFileException(path, fs.FileFormat, xe);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Saves a pdb to a path on disk.
-        /// </summary>
-        /// <param name="path">Path to save pdb file to on disk.</param>
-        public void Save(string path)
-        {
-            Directory.CreateDirectory(Path.GetDirectoryName(Path.GetFullPath(path)));
-
-            using (FileStream stream = File.Create(path))
-            using (FileStructure fs = FileStructure.Create(stream, FileFormat.Wixpdb, null))
-            using (XmlWriter writer = XmlWriter.Create(fs.GetDataStream()))
-            {
-                writer.WriteStartDocument();
-                this.Write(writer);
-                writer.WriteEndDocument();
-            }
-        }
-
-        /// <summary>
-        /// Processes an XmlReader and builds up the pdb object.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <param name="suppressVersionCheck">Suppresses wix.dll version mismatch check.</param>
-        /// <returns>The Pdb represented by the Xml.</returns>
-        internal static Pdb Read(XmlReader reader, bool suppressVersionCheck)
-        {
-            if ("wixPdb" != reader.LocalName)
-            {
-                throw new XmlException();
-            }
-
-            bool empty = reader.IsEmptyElement;
-            Pdb pdb = new Pdb();
-            Version version = null;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "version":
-                        version = new Version(reader.Value);
-                        break;
-                }
-            }
-
-            if (!suppressVersionCheck && null != version && !Pdb.CurrentVersion.Equals(version))
-            {
-                throw new WixException(WixDataErrors.VersionMismatch(SourceLineNumber.CreateFromUri(reader.BaseURI), "wixPdb", version.ToString(), Pdb.CurrentVersion.ToString()));
-            }
-
-            // loop through the rest of the pdb building up the Output object
-            if (!empty)
-            {
-                bool done = false;
-
-                // loop through all the fields in a row
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "wixOutput":
-                                    pdb.Output = Output.Read(reader, suppressVersionCheck);
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            return pdb;
-        }
-
-        /// <summary>
-        /// Persists a pdb in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Pdb should persist itself as XML.</param>
-        internal void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("wixPdb", XmlNamespaceUri);
-
-            writer.WriteAttributeString("version", Pdb.CurrentVersion.ToString());
-
-            this.Output.Write(writer);
-
-            writer.WriteEndElement();
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Row.cs b/src/WixToolset.Data.WindowsInstaller/Row.cs
deleted file mode 100644
index 962ed0f4..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Row.cs
+++ /dev/null
@@ -1,620 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    using System.Xml;
-
-    /// <summary>
-    /// Row containing data for a table.
-    /// </summary>
-    public class Row
-    {
-        private static long rowCount;
-
-        private Field[] fields;
-
-        /// <summary>
-        /// Creates a row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        /// <remarks>The compiler should use this constructor exclusively.</remarks>
-        public Row(SourceLineNumber sourceLineNumbers, Table table)
-            : this(sourceLineNumbers, table.Definition)
-        {
-            this.Table = table;
-        }
-
-        /// <summary>
-        /// Creates a row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDefinition">TableDefinition this row should get its column definitions from.</param>
-        /// <remarks>This constructor is used in cases where there isn't a clear owner of the row.  The linker uses this constructor for the rows it generates.</remarks>
-        public Row(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
-        {
-            this.Number = rowCount++;
-            this.SourceLineNumbers = sourceLineNumbers;
-            this.fields = new Field[tableDefinition.Columns.Count];
-            this.TableDefinition = tableDefinition;
-
-            for (int i = 0; i < this.fields.Length; ++i)
-            {
-                this.fields[i] = Field.Create(this.TableDefinition.Columns[i]);
-            }
-        }
-
-        /// <summary>
-        /// Creates a shallow copy of a row from another row.
-        /// </summary>
-        /// <param name="source">The row the data is copied from.</param>
-        protected Row(Row source)
-        {
-            this.Table = source.Table;
-            this.TableDefinition = source.TableDefinition;
-            this.Number = source.Number;
-            this.Access = source.Access;
-            this.Operation = source.Operation;
-            this.Redundant = source.Redundant;
-            this.SectionId = source.SectionId;
-            this.SourceLineNumbers = source.SourceLineNumbers;
-            this.fields = source.fields;
-        }
-
-        /// <summary>
-        /// Gets or sets the access to the row's primary key.
-        /// </summary>
-        /// <value>The row access modifier.</value>
-        public AccessModifier Access { get; set; }
-
-        /// <summary>
-        /// Gets or sets the row transform operation.
-        /// </summary>
-        /// <value>The row transform operation.</value>
-        public RowOperation Operation { get; set; }
-
-        /// <summary>
-        /// Gets or sets wether the row is a duplicate of another row thus redundant.
-        /// </summary>
-        public bool Redundant { get; set; }
-
-        /// <summary>
-        /// Gets or sets the SectionId property on the row.
-        /// </summary>
-        /// <value>The SectionId property on the row.</value>
-        public string SectionId { get; set; }
-
-        /// <summary>
-        /// Gets the source file and line number for the row.
-        /// </summary>
-        /// <value>Source file and line number.</value>
-        public SourceLineNumber SourceLineNumbers { get; private set; }
-
-        /// <summary>
-        /// Gets the table this row belongs to.
-        /// </summary>
-        /// <value>null if Row does not belong to a Table, or owner Table otherwise.</value>
-        public Table Table { get; private set; }
-
-        /// <summary>
-        /// Gets the table definition for this row.
-        /// </summary>
-        /// <remarks>A Row always has a TableDefinition, even if the Row does not belong to a Table.</remarks>
-        /// <value>TableDefinition for Row.</value>
-        public TableDefinition TableDefinition { get; private set; }
-
-        /// <summary>
-        /// Gets the fields contained by this row.
-        /// </summary>
-        /// <value>Array of field objects</value>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public Field[] Fields
-        {
-            get { return this.fields; }
-        }
-
-        /// <summary>
-        /// Gets the unique number for the row.
-        /// </summary>
-        /// <value>Number for row.</value>
-        public long Number { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the value of a particular field in the row.
-        /// </summary>
-        /// <param name="field">field index.</param>
-        /// <value>Value of a field in the row.</value>
-        public object this[int field]
-        {
-            get { return this.fields[field].Data; }
-            set { this.fields[field].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the field as an integer.
-        /// </summary>
-        /// <returns>Field's data as an integer.</returns>
-        public int FieldAsInteger(int field)
-        {
-            return this.fields[field].AsInteger();
-        }
-
-        /// <summary>
-        /// Gets the field as an integer that could be null.
-        /// </summary>
-        /// <returns>Field's data as an integer that could be null.</returns>
-        public int? FieldAsNullableInteger(int field)
-        {
-            return this.fields[field].AsNullableInteger();
-        }
-
-        /// <summary>
-        /// Gets the field as a string.
-        /// </summary>
-        /// <returns>Field's data as a string.</returns>
-        public string FieldAsString(int field)
-        {
-            return this.fields[field].AsString();
-        }
-
-        /// <summary>
-        /// Sets the value of a particular field in the row without validating.
-        /// </summary>
-        /// <param name="field">field index.</param>
-        /// <param name="value">Value of a field in the row.</param>
-        /// <returns>True if successful, false if validation failed.</returns>
-        public bool BestEffortSetField(int field, object value)
-        {
-            return this.fields[field].BestEffortSet(value);
-        }
-
-        /// <summary>
-        /// Get the value used to represent the row in a keyed row collection.
-        /// </summary>
-        /// <returns>Primary key or row number if no primary key is available.</returns>
-        public string GetKey()
-        {
-            return this.GetPrimaryKey() ?? Convert.ToString(this.Number, CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Get the primary key of this row.
-        /// </summary>
-        /// <param name="delimiter">Delimiter character for multiple column primary keys.</param>
-        /// <returns>The primary key or null if the row's table has no primary key columns.</returns>
-        public string GetPrimaryKey(char delimiter = '/')
-        {
-            return this.GetPrimaryKey(delimiter, String.Empty);
-        }
-
-        /// <summary>
-        /// Get the primary key of this row.
-        /// </summary>
-        /// <param name="delimiter">Delimiter character for multiple column primary keys.</param>
-        /// <param name="nullReplacement">String to represent null values in the primary key.</param>
-        /// <returns>The primary key or null if the row's table has no primary key columns.</returns>
-        public string GetPrimaryKey(char delimiter, string nullReplacement)
-        {
-            bool foundPrimaryKey = false;
-            StringBuilder primaryKey = new StringBuilder();
-
-            foreach (Field field in this.fields)
-            {
-                if (field.Column.PrimaryKey)
-                {
-                    if (foundPrimaryKey)
-                    {
-                        primaryKey.Append(delimiter);
-                    }
-
-                    primaryKey.Append((null == field.Data) ? nullReplacement : Convert.ToString(field.Data, CultureInfo.InvariantCulture));
-
-                    foundPrimaryKey = true;
-                }
-                else // primary keys must be the first columns of a row so the first non-primary key means we can stop looking.
-                {
-                    break;
-                }
-            }
-
-            return foundPrimaryKey ? primaryKey.ToString() : null;
-        }
-
-        /// <summary>
-        /// Returns true if the specified field is null or an empty string.
-        /// </summary>
-        /// <param name="field">Index of the field to check.</param>
-        /// <returns>true if the specified field is null or an empty string, false otherwise.</returns>
-        public bool IsColumnEmpty(int field)
-        {
-            if (null == this.fields[field].Data)
-            {
-                return true;
-            }
-
-            string dataString = this.fields[field].Data as string;
-            if (null != dataString && 0 == dataString.Length)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Tests if the passed in row is identical.
-        /// </summary>
-        /// <param name="row">Row to compare against.</param>
-        /// <returns>True if two rows are identical.</returns>
-        public bool IsIdentical(Row row)
-        {
-            bool identical = (this.TableDefinition.Name == row.TableDefinition.Name && this.fields.Length == row.fields.Length);
-
-            for (int i = 0; identical && i < this.fields.Length; ++i)
-            {
-                if (!(this.fields[i].IsIdentical(row.fields[i])))
-                {
-                    identical = false;
-                }
-            }
-
-            return identical;
-        }
-
-        /// <summary>
-        /// Returns a string representation of the Row.
-        /// </summary>
-        /// <returns>A string representation of the Row.</returns>
-        public override string ToString()
-        {
-            return String.Join("/", (object[])this.fields);
-        }
-
-        /// <summary>
-        /// Creates a Row from the XmlReader.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <param name="table">Table for this row.</param>
-        /// <returns>New row object.</returns>
-        internal static Row Read(XmlReader reader, Table table)
-        {
-            Debug.Assert("row" == reader.LocalName);
-
-            bool empty = reader.IsEmptyElement;
-            AccessModifier access = AccessModifier.Public;
-            RowOperation operation = RowOperation.None;
-            bool redundant = false;
-            string sectionId = null;
-            SourceLineNumber sourceLineNumbers = null;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "access":
-                        access = (AccessModifier)Enum.Parse(typeof(AccessModifier), reader.Value, true);
-                        break;
-                    case "op":
-                        operation = (RowOperation)Enum.Parse(typeof(RowOperation), reader.Value, true);
-                        break;
-                    case "redundant":
-                        redundant = reader.Value.Equals("yes");
-                        break;
-                    case "sectionId":
-                        sectionId = reader.Value;
-                        break;
-                    case "sourceLineNumber":
-                        sourceLineNumbers = SourceLineNumber.CreateFromEncoded(reader.Value);
-                        break;
-                }
-            }
-
-            Row row = table.CreateRow(sourceLineNumbers);
-            row.Access = access;
-            row.Operation = operation;
-            row.Redundant = redundant;
-            row.SectionId = sectionId;
-
-            // loop through all the fields in a row
-            if (!empty)
-            {
-                bool done = false;
-                int field = 0;
-
-                // loop through all the fields in a row
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "field":
-                                    if (row.Fields.Length <= field)
-                                    {
-                                        if (!reader.IsEmptyElement)
-                                        {
-                                            throw new XmlException();
-                                        }
-                                    }
-                                    else
-                                    {
-                                        row.fields[field].Read(reader);
-                                    }
-                                    ++field;
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            return row;
-        }
-
-        /// <summary>
-        /// Returns the row in a format usable in IDT files.
-        /// </summary>
-        /// <param name="keepAddedColumns">Whether to keep columns added in a transform.</param>
-        /// <returns>String with tab delimited field values.</returns>
-        internal string ToIdtDefinition(bool keepAddedColumns)
-        {
-            bool first = true;
-            StringBuilder sb = new StringBuilder();
-
-            foreach (Field field in this.fields)
-            {
-                // Conditionally keep columns added in a transform; otherwise,
-                // break because columns can only be added at the end.
-                if (field.Column.Added && !keepAddedColumns)
-                {
-                    break;
-                }
-
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    sb.Append('\t');
-                }
-
-                sb.Append(field.ToIdtValue());
-            }
-            sb.Append("\r\n");
-
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Gets the modularized version of the field data.
-        /// </summary>
-        /// <param name="field">The field to modularize.</param>
-        /// <param name="modularizationGuid">String containing the GUID of the Merge Module to append the the field value, if appropriate.</param>
-        /// <param name="suppressModularizationIdentifiers">Optional collection of identifiers that should not be modularized.</param>
-        /// <remarks>moduleGuid is expected to be null when not being used to compile a Merge Module.</remarks>
-        /// <returns>The modularized version of the field data.</returns>
-        internal string GetModularizedValue(Field field, string modularizationGuid, ISet<string> suppressModularizationIdentifiers)
-        {
-            Debug.Assert(null != field.Data && 0 < ((string)field.Data).Length);
-            string fieldData = Convert.ToString(field.Data, CultureInfo.InvariantCulture);
-
-            if (null != modularizationGuid && ColumnModularizeType.None != field.Column.ModularizeType && !(WindowsInstallerStandard.IsStandardAction(fieldData) || WindowsInstallerStandard.IsStandardProperty(fieldData)))
-            {
-                StringBuilder sb;
-                int start;
-                ColumnModularizeType modularizeType = field.Column.ModularizeType;
-
-                // special logic for the ControlEvent table's Argument column
-                // this column requires different modularization methods depending upon the value of the Event column
-                if (ColumnModularizeType.ControlEventArgument == field.Column.ModularizeType)
-                {
-                    switch (this[2].ToString())
-                    {
-                        case "CheckExistingTargetPath": // redirectable property name
-                        case "CheckTargetPath":
-                        case "DoAction": // custom action name
-                        case "NewDialog": // dialog name
-                        case "SelectionBrowse":
-                        case "SetTargetPath":
-                        case "SpawnDialog":
-                        case "SpawnWaitDialog":
-                            if (Common.IsIdentifier(fieldData))
-                            {
-                                modularizeType = ColumnModularizeType.Column;
-                            }
-                            else
-                            {
-                                modularizeType = ColumnModularizeType.Property;
-                            }
-                            break;
-                        default: // formatted
-                            modularizeType = ColumnModularizeType.Property;
-                            break;
-                    }
-                }
-                else if (ColumnModularizeType.ControlText == field.Column.ModularizeType)
-                {
-                    // icons are stored in the Binary table, so they get column-type modularization
-                    if (("Bitmap" == this[2].ToString() || "Icon" == this[2].ToString()) && Common.IsIdentifier(fieldData))
-                    {
-                        modularizeType = ColumnModularizeType.Column;
-                    }
-                    else
-                    {
-                        modularizeType = ColumnModularizeType.Property;
-                    }
-                }
-
-                switch (modularizeType)
-                {
-                    case ColumnModularizeType.Column:
-                        // ensure the value is an identifier (otherwise it shouldn't be modularized this way)
-                        if (!Common.IsIdentifier(fieldData))
-                        {
-                            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_CannotModularizeIllegalID, fieldData));
-                        }
-
-                        // if we're not supposed to suppress modularization of this identifier
-                        if (null == suppressModularizationIdentifiers || !suppressModularizationIdentifiers.Contains(fieldData))
-                        {
-                            fieldData = String.Concat(fieldData, ".", modularizationGuid);
-                        }
-                        break;
-
-                    case ColumnModularizeType.Property:
-                    case ColumnModularizeType.Condition:
-                        Regex regex;
-                        if (ColumnModularizeType.Property == modularizeType)
-                        {
-                            regex = new Regex(@"\[(?<identifier>[#$!]?[a-zA-Z_][a-zA-Z0-9_\.]*)]", RegexOptions.Singleline | RegexOptions.ExplicitCapture);
-                        }
-                        else
-                        {
-                            Debug.Assert(ColumnModularizeType.Condition == modularizeType);
-
-                            // This heinous looking regular expression is actually quite an elegant way 
-                            // to shred the entire condition into the identifiers that need to be 
-                            // modularized.  Let's break it down piece by piece:
-                            //
-                            // 1. Look for the operators: NOT, EQV, XOR, OR, AND, IMP (plus a space).  Note that the
-                            //    regular expression is case insensitive so we don't have to worry about
-                            //    all the permutations of these strings.
-                            // 2. Look for quoted strings.  Quoted strings are just text and are ignored 
-                            //    outright.
-                            // 3. Look for environment variables.  These look like identifiers we might 
-                            //    otherwise be interested in but start with a percent sign.  Like quoted 
-                            //    strings these enviroment variable references are ignored outright.
-                            // 4. Match all identifiers that are things that need to be modularized.  Note
-                            //    the special characters (!, $, ?, &) that denote Component and Feature states.
-                            regex = new Regex(@"NOT\s|EQV\s|XOR\s|OR\s|AND\s|IMP\s|"".*?""|%[a-zA-Z_][a-zA-Z0-9_\.]*|(?<identifier>[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
-
-                            // less performant version of the above with captures showing where everything lives
-                            // regex = new Regex(@"(?<operator>NOT|EQV|XOR|OR|AND|IMP)|(?<string>"".*?"")|(?<environment>%[a-zA-Z_][a-zA-Z0-9_\.]*)|(?<identifier>[!$\?&]?[a-zA-Z_][a-zA-Z0-9_\.]*)",RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
-                        }
-
-                        MatchCollection matches = regex.Matches(fieldData);
-
-                        sb = new StringBuilder(fieldData);
-
-                        // notice how this code walks backward through the list
-                        // because it modifies the string as we through it
-                        for (int i = matches.Count - 1; 0 <= i; i--)
-                        {
-                            Group group = matches[i].Groups["identifier"];
-                            if (group.Success)
-                            {
-                                string identifier = group.Value;
-                                if (!WindowsInstallerStandard.IsStandardProperty(identifier) && (null == suppressModularizationIdentifiers || !suppressModularizationIdentifiers.Contains(identifier)))
-                                {
-                                    sb.Insert(group.Index + group.Length, '.');
-                                    sb.Insert(group.Index + group.Length + 1, modularizationGuid);
-                                }
-                            }
-                        }
-
-                        fieldData = sb.ToString();
-                        break;
-
-                    case ColumnModularizeType.CompanionFile:
-                        // if we're not supposed to ignore this identifier and the value does not start with
-                        // a digit, we must have a companion file so modularize it
-                        if ((null == suppressModularizationIdentifiers || !suppressModularizationIdentifiers.Contains(fieldData)) &&
-                            0 < fieldData.Length && !Char.IsDigit(fieldData, 0))
-                        {
-                            fieldData = String.Concat(fieldData, ".", modularizationGuid);
-                        }
-                        break;
-
-                    case ColumnModularizeType.Icon:
-                        if (null == suppressModularizationIdentifiers || !suppressModularizationIdentifiers.Contains(fieldData))
-                        {
-                            start = fieldData.LastIndexOf(".", StringComparison.Ordinal);
-                            if (-1 == start)
-                            {
-                                fieldData = String.Concat(fieldData, ".", modularizationGuid);
-                            }
-                            else
-                            {
-                                fieldData = String.Concat(fieldData.Substring(0, start), ".", modularizationGuid, fieldData.Substring(start));
-                            }
-                        }
-                        break;
-
-                    case ColumnModularizeType.SemicolonDelimited:
-                        string[] keys = fieldData.Split(';');
-                        for (int i = 0; i < keys.Length; ++i)
-                        {
-                            keys[i] = String.Concat(keys[i], ".", modularizationGuid);
-                        }
-                        fieldData = String.Join(";", keys);
-                        break;
-                }
-            }
-
-            return fieldData;
-        }
-
-        /// <summary>
-        /// Persists a row in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Row should persist itself as XML.</param>
-        [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "Changing the way this string normalizes would result " +
-                         "in a change to the way intermediate files are generated, potentially causing extra churn in patches on an MSI built from an older version of WiX. " +
-                         "Furthermore, there is no security hole here, as the strings won't need to make a round trip")]
-        internal void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("row", Intermediate.XmlNamespaceUri);
-
-            if (AccessModifier.Public != this.Access)
-            {
-                writer.WriteAttributeString("access", this.Access.ToString().ToLowerInvariant());
-            }
-
-            if (RowOperation.None != this.Operation)
-            {
-                writer.WriteAttributeString("op", this.Operation.ToString().ToLowerInvariant());
-            }
-
-            if (this.Redundant)
-            {
-                writer.WriteAttributeString("redundant", "yes");
-            }
-
-            if (null != this.SectionId)
-            {
-                writer.WriteAttributeString("sectionId", this.SectionId);
-            }
-
-            if (null != this.SourceLineNumbers)
-            {
-                writer.WriteAttributeString("sourceLineNumber", this.SourceLineNumbers.GetEncoded());
-            }
-
-            for (int i = 0; i < this.fields.Length; ++i)
-            {
-                this.fields[i].Write(writer);
-            }
-
-            writer.WriteEndElement();
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/RowOperation.cs b/src/WixToolset.Data.WindowsInstaller/RowOperation.cs
deleted file mode 100644
index 30dadd4e..00000000
--- a/src/WixToolset.Data.WindowsInstaller/RowOperation.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.Data
-{
-    /// <summary>
-    /// The row transform operations.
-    /// </summary>
-    public enum RowOperation
-    {
-        /// <summary>
-        /// No operation.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Added row.
-        /// </summary>
-        Add,
-
-        /// <summary>
-        /// Deleted row.
-        /// </summary>
-        Delete,
-
-        /// <summary>
-        /// Modified row.
-        /// </summary>
-        Modify
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/BBControlRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/BBControlRow.cs
deleted file mode 100644
index d0f08662..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/BBControlRow.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// 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.Data.Rows
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// Specialization of a row for the Control table.
-    /// </summary>
-    public sealed class BBControlRow : Row
-    {
-        /// <summary>
-        /// Creates a Control row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Control row belongs to and should get its column definitions from.</param>
-        public BBControlRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the dialog of the Control row.
-        /// </summary>
-        /// <value>Primary key of the Control row.</value>
-        public string Billboard
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifier for this Control row.
-        /// </summary>
-        /// <value>Identifier for this Control row.</value>
-        public string BBControl
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of the BBControl.
-        /// </summary>
-        /// <value>Name of the BBControl.</value>
-        [SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")]
-        public string Type
-        {
-            get { return this.Fields[2].AsString(); }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the X location of the BBControl.
-        /// </summary>
-        /// <value>X location of the BBControl.</value>
-        public string X
-        {
-            get { return this.Fields[3].AsString(); }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the Y location of the BBControl.
-        /// </summary>
-        /// <value>Y location of the BBControl.</value>
-        public string Y
-        {
-            get { return this.Fields[4].AsString(); }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the BBControl.
-        /// </summary>
-        /// <value>Width of the BBControl.</value>
-        public string Width
-        {
-            get { return this.Fields[5].AsString(); }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the BBControl.
-        /// </summary>
-        /// <value>Height of the BBControl.</value>
-        public string Height
-        {
-            get { return this.Fields[6].AsString(); }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the attributes for the BBControl.
-        /// </summary>
-        /// <value>Attributes for the BBControl.</value>
-        public int Attributes
-        {
-            get { return (int)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the text of the BBControl.
-        /// </summary>
-        /// <value>Text of the BBControl.</value>
-        public string Text
-        {
-            get { return (string)this.Fields[8].Data; }
-            set { this.Fields[8].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/ComponentRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/ComponentRow.cs
deleted file mode 100644
index 3ff10175..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/ComponentRow.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using WixToolset.Data.Msi;
-
-    /// <summary>
-    /// Specialization of a row for the Component table.
-    /// </summary>
-    public sealed class ComponentRow : Row
-    {
-        private string sourceFile;
-
-        /// <summary>
-        /// Creates a Control row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Component row belongs to and should get its column definitions from.</param>
-        public ComponentRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the identifier for this Component row.
-        /// </summary>
-        /// <value>Identifier for this Component row.</value>
-        public string Component
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the ComponentId for this Component row.
-        /// </summary>
-        /// <value>guid for this Component row.</value>
-        public string Guid
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the Directory_ of the Component.
-        /// </summary>
-        /// <value>Directory of the Component.</value>
-        public string Directory
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the local only attribute of the Component.
-        /// </summary>
-        /// <value>Local only attribute of the component.</value>
-        public bool IsLocalOnly
-        {
-            get { return MsiInterop.MsidbComponentAttributesLocalOnly == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesLocalOnly); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesLocalOnly;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesLocalOnly;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the source only attribute of the Component.
-        /// </summary>
-        /// <value>Source only attribute of the component.</value>
-        public bool IsSourceOnly
-        {
-            get { return MsiInterop.MsidbComponentAttributesSourceOnly == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesSourceOnly); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesSourceOnly;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesSourceOnly;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the optional attribute of the Component.
-        /// </summary>
-        /// <value>Optional attribute of the component.</value>
-        public bool IsOptional
-        {
-            get { return MsiInterop.MsidbComponentAttributesOptional == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesOptional); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesOptional;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesOptional;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the registry key path attribute of the Component.
-        /// </summary>
-        /// <value>Registry key path attribute of the component.</value>
-        public bool IsRegistryKeyPath
-        {
-            get { return MsiInterop.MsidbComponentAttributesRegistryKeyPath == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesRegistryKeyPath); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesRegistryKeyPath;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesRegistryKeyPath;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the shared dll ref count attribute of the Component.
-        /// </summary>
-        /// <value>Shared dll ref countattribute of the component.</value>
-        public bool IsSharedDll
-        {
-            get { return MsiInterop.MsidbComponentAttributesSharedDllRefCount == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesSharedDllRefCount); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesSharedDllRefCount;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesSharedDllRefCount;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the permanent attribute of the Component.
-        /// </summary>
-        /// <value>Permanent attribute of the component.</value>
-        public bool IsPermanent
-        {
-            get { return MsiInterop.MsidbComponentAttributesPermanent == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesPermanent); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesPermanent;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesPermanent;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ODBC data source key path attribute of the Component.
-        /// </summary>
-        /// <value>ODBC data source key path attribute of the component.</value>
-        public bool IsOdbcDataSourceKeyPath
-        {
-            get { return MsiInterop.MsidbComponentAttributesODBCDataSource == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributesODBCDataSource); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributesODBCDataSource;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributesODBCDataSource;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 64 bit attribute of the Component.
-        /// </summary>
-        /// <value>64-bitness of the component.</value>
-        public bool Is64Bit
-        {
-            get { return MsiInterop.MsidbComponentAttributes64bit == ((int)this.Fields[3].Data & MsiInterop.MsidbComponentAttributes64bit); }
-            set
-            {
-                if (value)
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data | MsiInterop.MsidbComponentAttributes64bit;
-                }
-                else
-                {
-                    this.Fields[3].Data = (int)this.Fields[3].Data & ~MsiInterop.MsidbComponentAttributes64bit;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the condition of the Component.
-        /// </summary>
-        /// <value>Condition of the Component.</value>
-        public string Condition
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the key path of the Component.
-        /// </summary>
-        /// <value>Key path of the Component.</value>
-        public string KeyPath
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the source location to the file to fill in the Text of the control.
-        /// </summary>
-        /// <value>Source location to the file to fill in the Text of the control.</value>
-        public string SourceFile
-        {
-            get { return this.sourceFile; }
-            set { this.sourceFile = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/ContainerType.cs b/src/WixToolset.Data.WindowsInstaller/Rows/ContainerType.cs
deleted file mode 100644
index 55a74235..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/ContainerType.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Types of bundle packages.
-    /// </summary>
-    public enum ContainerType
-    {
-        Attached,
-        Detached,
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/ControlRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/ControlRow.cs
deleted file mode 100644
index 8fa3f633..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/ControlRow.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// 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.Data.Rows
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// Specialization of a row for the Control table.
-    /// </summary>
-    public sealed class ControlRow : Row
-    {
-        /// <summary>
-        /// Creates a Control row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Control row belongs to and should get its column definitions from.</param>
-        public ControlRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the dialog of the Control row.
-        /// </summary>
-        /// <value>Primary key of the Control row.</value>
-        public string Dialog
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifier for this Control row.
-        /// </summary>
-        /// <value>Identifier for this Control row.</value>
-        public string Control
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of the control.
-        /// </summary>
-        /// <value>Name of the control.</value>
-        [SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")]
-        public string Type
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the X location of the control.
-        /// </summary>
-        /// <value>X location of the control.</value>
-        public string X
-        {
-            get { return this.Fields[3].AsString(); }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the Y location of the control.
-        /// </summary>
-        /// <value>Y location of the control.</value>
-        public string Y
-        {
-            get { return this.Fields[4].AsString(); }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the width of the control.
-        /// </summary>
-        /// <value>Width of the control.</value>
-        public string Width
-        {
-            get { return this.Fields[5].AsString(); }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the height of the control.
-        /// </summary>
-        /// <value>Height of the control.</value>
-        public string Height
-        {
-            get { return this.Fields[6].AsString(); }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the attributes for the control.
-        /// </summary>
-        /// <value>Attributes for the control.</value>
-        public int Attributes
-        {
-            get { return (int)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the Property associated with the control.
-        /// </summary>
-        /// <value>Property associated with the control.</value>
-        public string Property
-        {
-            get { return (string)this.Fields[8].Data; }
-            set { this.Fields[8].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the text of the control.
-        /// </summary>
-        /// <value>Text of the control.</value>
-        public string Text
-        {
-            get { return (string)this.Fields[9].Data; }
-            set { this.Fields[9].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the next control.
-        /// </summary>
-        /// <value>Next control.</value>
-        public string Next
-        {
-            get { return (string)this.Fields[10].Data; }
-            set { this.Fields[10].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the help for the control.
-        /// </summary>
-        /// <value>Help for the control.</value>
-        public string Help
-        {
-            get { return (string)this.Fields[11].Data; }
-            set { this.Fields[11].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/FileRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/FileRow.cs
deleted file mode 100644
index de5d5652..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/FileRow.cs
+++ /dev/null
@@ -1,640 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using WixToolset.Data.Msi;
-
-    /// <summary>
-    /// Specialization of a row for the file table.
-    /// </summary>
-    public sealed class FileRow : Row //, IComparable
-    {
-        //private string assemblyApplication;
-        //private string assemblyManifest;
-        //private FileAssemblyType assemblyType;
-        //private string directory;
-        //private int diskId;
-        //private bool fromModule;
-        //private bool isGeneratedShortFileName;
-        //private int patchGroup;
-        //private string processorArchitecture;
-        //private string source;
-        //private Row hashRow;
-        //private List<Row> assemblyNameRows;
-        //private string[] previousSource;
-        //private string symbols;
-        //private string[] previousSymbols;
-        //private PatchAttributeType patchAttributes;
-        //private string retainOffsets;
-        //private string retainLengths;
-        //private string ignoreOffsets;
-        //private string ignoreLengths;
-        //private string[] previousRetainOffsets;
-        //private string[] previousRetainLengths;
-        //private string[] previousIgnoreOffsets;
-        //private string[] previousIgnoreLengths;
-        //private string patch;
-
-        /// <summary>
-        /// Creates a File row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this File row belongs to and should get its column definitions from.</param>
-        public FileRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-            //this.assemblyType = FileAssemblyType.NotAnAssembly;
-            //this.previousSource = new string[1];
-            //this.previousSymbols = new string[1];
-            //this.previousRetainOffsets = new string[1];
-            //this.previousRetainLengths = new string[1];
-            //this.previousIgnoreOffsets = new string[1];
-            //this.previousIgnoreLengths = new string[1];
-        }
-
-        /// <summary>
-        /// Creates a File row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDefinition">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public FileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition)
-            : base(sourceLineNumbers, tableDefinition)
-        {
-            //this.assemblyType = FileAssemblyType.NotAnAssembly;
-            //this.previousSource = new string[1];
-            //this.previousSymbols = new string[1];
-            //this.previousRetainOffsets = new string[1];
-            //this.previousRetainLengths = new string[1];
-            //this.previousIgnoreOffsets = new string[1];
-            //this.previousIgnoreLengths = new string[1];
-        }
-
-        /// <summary>
-        /// Gets or sets the primary key of the file row.
-        /// </summary>
-        /// <value>Primary key of the file row.</value>
-        public string File
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the component this file row belongs to.
-        /// </summary>
-        /// <value>Component this file row belongs to.</value>
-        public string Component
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the file.
-        /// </summary>
-        /// <value>Name of the file.</value>
-        public string FileName
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the real filesystem name of the file (without a pipe). This is typically the long name of the file.
-        /// However, if no long name is available, falls back to the short name.
-        /// </summary>
-        /// <value>Long Name of the file - or if no long name is available, falls back to the short name.</value>
-        public string LongFileName
-        {
-            get
-            {
-                string fileName = this.FileName;
-                int index = fileName.IndexOf('|');
-
-                // If it doesn't contain a pipe, just return the whole string
-                if (-1 == index)
-                {
-                    return fileName;
-                }
-                else // otherwise, extract the part of the string after the pipe
-                {
-                    return fileName.Substring(index + 1);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the size of the file.
-        /// </summary>
-        /// <value>Size of the file.</value>
-        public int FileSize
-        {
-            get { return (int)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the version of the file.
-        /// </summary>
-        /// <value>Version of the file.</value>
-        public string Version
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the LCID of the file.
-        /// </summary>
-        /// <value>LCID of the file.</value>
-        public string Language
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the attributes on a file.
-        /// </summary>
-        /// <value>Attributes on a file.</value>
-        public int Attributes
-        {
-            get { return Convert.ToInt32(this.Fields[6].Data, CultureInfo.InvariantCulture); }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether this file should be compressed.
-        /// </summary>
-        /// <value>Whether this file should be compressed.</value>
-        public YesNoType Compressed
-        {
-            get
-            {
-                bool compressedFlag = (0 < (this.Attributes & MsiInterop.MsidbFileAttributesCompressed));
-                bool noncompressedFlag = (0 < (this.Attributes & MsiInterop.MsidbFileAttributesNoncompressed));
-
-                if (compressedFlag && noncompressedFlag)
-                {
-                    throw new WixException(WixDataErrors.IllegalFileCompressionAttributes(this.SourceLineNumbers));
-                }
-                else if (compressedFlag)
-                {
-                    return YesNoType.Yes;
-                }
-                else if (noncompressedFlag)
-                {
-                    return YesNoType.No;
-                }
-                else
-                {
-                    return YesNoType.NotSet;
-                }
-            }
-
-            set
-            {
-                if (YesNoType.Yes == value)
-                {
-                    // these are mutually exclusive
-                    this.Attributes |= MsiInterop.MsidbFileAttributesCompressed;
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed;
-                }
-                else if (YesNoType.No == value)
-                {
-                    // these are mutually exclusive
-                    this.Attributes |= MsiInterop.MsidbFileAttributesNoncompressed;
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesCompressed;
-                }
-                else // not specified
-                {
-                    Debug.Assert(YesNoType.NotSet == value);
-
-                    // clear any compression bits
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesCompressed;
-                    this.Attributes &= ~MsiInterop.MsidbFileAttributesNoncompressed;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the sequence of the file row.
-        /// </summary>
-        /// <value>Sequence of the file row.</value>
-        public int Sequence
-        {
-            get { return (int)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        /////// <summary>
-        /////// Gets or sets the type of assembly of file row.
-        /////// </summary>
-        /////// <value>Assembly type for file row.</value>
-        ////public FileAssemblyType AssemblyType
-        ////{
-        ////    get { return this.assemblyType; }
-        ////    set { this.assemblyType = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the identifier for the assembly application.
-        /////// </summary>
-        /////// <value>Identifier for the assembly application.</value>
-        ////public string AssemblyApplication
-        ////{
-        ////    get { return this.assemblyApplication; }
-        ////    set { this.assemblyApplication = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the identifier for the assembly manifest.
-        /////// </summary>
-        /////// <value>Identifier for the assembly manifest.</value>
-        ////public string AssemblyManifest
-        ////{
-        ////    get { return this.assemblyManifest; }
-        ////    set { this.assemblyManifest = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the directory of the file.
-        /////// </summary>
-        /////// <value>Directory of the file.</value>
-        ////public string Directory
-        ////{
-        ////    get { return this.directory; }
-        ////    set { this.directory = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the disk id for this file.
-        /////// </summary>
-        /////// <value>Disk id for the file.</value>
-        ////public int DiskId
-        ////{
-        ////    get { return this.diskId; }
-        ////    set { this.diskId = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the source location to the file.
-        /////// </summary>
-        /////// <value>Source location to the file.</value>
-        ////public string Source
-        ////{
-        ////    get { return this.source; }
-        ////    set { this.source = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the source location to the previous file.
-        /////// </summary>
-        /////// <value>Source location to the previous file.</value>
-        ////public string PreviousSource
-        ////{
-        ////    get { return this.previousSource[0]; }
-        ////    set { this.previousSource[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the source location to the previous files.
-        /////// </summary>
-        /////// <value>Source location to the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousSourceArray
-        ////{
-        ////    get { return this.previousSource; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the architecture the file executes on.
-        /////// </summary>
-        /////// <value>Architecture the file executes on.</value>
-        ////public string ProcessorArchitecture
-        ////{
-        ////    get { return this.processorArchitecture; }
-        ////    set { this.processorArchitecture = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets of sets the patch group of a patch-added file.
-        /////// </summary>
-        /////// <value>The patch group of a patch-added file.</value>
-        ////public int PatchGroup
-        ////{
-        ////    get { return this.patchGroup; }
-        ////    set { this.patchGroup = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the patch header of the file.
-        /////// </summary>
-        /////// <value>Patch header of the file.</value>
-        ////public string Patch
-        ////{
-        ////    get { return this.patch; }
-        ////    set { this.patch = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the locations to find the file's symbols.
-        /////// </summary>
-        /////// <value>Symbol paths for the file.</value>
-        ////public string Symbols
-        ////{
-        ////    get { return this.symbols; }
-        ////    set { this.symbols = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the locations to find the file's previous symbols.
-        /////// </summary>
-        /////// <value>Symbol paths for the previous file.</value>
-        ////public string PreviousSymbols
-        ////{
-        ////    get { return this.previousSymbols[0]; }
-        ////    set { this.previousSymbols[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the locations to find the files' previous symbols.
-        /////// </summary>
-        /////// <value>Symbol paths for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousSymbolsArray
-        ////{
-        ////    get { return this.previousSymbols; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the generated short file name attribute.
-        /////// </summary>
-        /////// <value>The generated short file name attribute.</value>
-        ////public bool IsGeneratedShortFileName
-        ////{
-        ////    get { return this.isGeneratedShortFileName; }
-
-        ////    set { this.isGeneratedShortFileName = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets whether this row came from a merge module.
-        /////// </summary>
-        /////// <value>Whether this row came from a merge module.</value>
-        ////public bool FromModule
-        ////{
-        ////    get { return this.fromModule; }
-        ////    set { this.fromModule = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the MsiFileHash row created for this FileRow.
-        /////// </summary>
-        /////// <value>Row for MsiFileHash table.</value>
-        ////public Row HashRow
-        ////{
-        ////    get { return this.hashRow; }
-        ////    set { this.hashRow = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the set of MsiAssemblyName rows created for this FileRow.
-        /////// </summary>
-        /////// <value>RowCollection of MsiAssemblyName table.</value>
-        ////[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        ////public List<Row> AssemblyNameRows
-        ////{
-        ////    get { return this.assemblyNameRows; }
-        ////    set { this.assemblyNameRows = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the patching attributes to the file.
-        /////// </summary>
-        /////// <value>Patching attributes of the file.</value>
-        ////public PatchAttributeType PatchAttributes
-        ////{
-        ////    get { return this.patchAttributes; }
-        ////    set { this.patchAttributes = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-length list for the file.
-        /////// </summary>
-        /////// <value>RetainLength list for the file.</value>
-        ////public string RetainLengths
-        ////{
-        ////    get { return this.retainLengths; }
-        ////    set { this.retainLengths = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-offset list for the file.
-        /////// </summary>
-        /////// <value>IgnoreOffset list for the file.</value>
-        ////public string IgnoreOffsets
-        ////{
-        ////    get { return this.ignoreOffsets; }
-        ////    set { this.ignoreOffsets = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-length list for the file.
-        /////// </summary>
-        /////// <value>IgnoreLength list for the file.</value>
-        ////public string IgnoreLengths
-        ////{
-        ////    get { return this.ignoreLengths; }
-        ////    set { this.ignoreLengths = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-offset list for the file.
-        /////// </summary>
-        /////// <value>RetainOffset list for the file.</value>
-        ////public string RetainOffsets
-        ////{
-        ////    get { return this.retainOffsets; }
-        ////    set { this.retainOffsets = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-length list for the previous file.
-        /////// </summary>
-        /////// <value>RetainLength list for the previous file.</value>
-        ////public string PreviousRetainLengths
-        ////{
-        ////    get { return this.previousRetainLengths[0]; }
-        ////    set { this.previousRetainLengths[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch retain-length list for the previous files.
-        /////// </summary>
-        /////// <value>RetainLength list for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousRetainLengthsArray
-        ////{
-        ////    get { return this.previousRetainLengths; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-offset list for the previous file.
-        /////// </summary>
-        /////// <value>IgnoreOffset list for the previous file.</value>
-        ////public string PreviousIgnoreOffsets
-        ////{
-        ////    get { return this.previousIgnoreOffsets[0]; }
-        ////    set { this.previousIgnoreOffsets[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch ignore-offset list for the previous files.
-        /////// </summary>
-        /////// <value>IgnoreOffset list for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousIgnoreOffsetsArray
-        ////{
-        ////    get { return this.previousIgnoreOffsets; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch ignore-length list for the previous file.
-        /////// </summary>
-        /////// <value>IgnoreLength list for the previous file.</value>
-        ////public string PreviousIgnoreLengths
-        ////{
-        ////    get { return this.previousIgnoreLengths[0]; }
-        ////    set { this.previousIgnoreLengths[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch ignore-length list for the previous files.
-        /////// </summary>
-        /////// <value>IgnoreLength list for the previous files.</value>
-        ////[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousIgnoreLengthsArray
-        ////{
-        ////    get { return this.previousIgnoreLengths; }
-        ////}
-
-        /////// <summary>
-        /////// Gets or sets the delta patch retain-offset list for the previous file.
-        /////// </summary>
-        /////// <value>RetainOffset list for the previous file.</value>
-        ////public string PreviousRetainOffsets
-        ////{
-        ////    get { return this.previousRetainOffsets[0]; }
-        ////    set { this.previousRetainOffsets[0] = value; }
-        ////}
-
-        /////// <summary>
-        /////// Gets the delta patch retain-offset list for the previous files.
-        /////// </summary>
-        /////// <value>RetainOffset list for the previous files.</value>
-        ////[SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        ////public string[] PreviousRetainOffsetsArray
-        ////{
-        ////    get { return this.previousRetainOffsets; }
-        ////}
-
-        /////// <summary>
-        /////// Compares the current FileRow with another object of the same type.
-        /////// </summary>
-        /////// <param name="obj">An object to compare with this instance.</param>
-        /////// <returns>An integer that indicates the relative order of the comparands.</returns>
-        ////[SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.ArgumentException.#ctor(System.String)")]
-        ////[SuppressMessage("Microsoft.Globalization", "CA1309:UseOrdinalStringComparison")]
-        ////public int CompareTo(object obj)
-        ////{
-        ////    if (this == obj)
-        ////    {
-        ////        return 0;
-        ////    }
-
-        ////    FileRow fileRow = obj as FileRow;
-        ////    if (null == fileRow)
-        ////    {
-        ////        throw new ArgumentException(WixDataStrings.EXP_OtherObjectIsNotFileRow);
-        ////    }
-
-        ////    int compared = this.DiskId - fileRow.DiskId;
-        ////    if (0 == compared)
-        ////    {
-        ////        compared = this.patchGroup - fileRow.patchGroup;
-
-        ////        if (0 == compared)
-        ////        {
-        ////            compared = String.Compare(this.File, fileRow.File, StringComparison.InvariantCulture);
-        ////        }
-        ////    }
-
-        ////    return compared;
-        ////}
-
-        /////// <summary>
-        /////// Copies data from another FileRow object.
-        /////// </summary>
-        /////// <param name="src">An row to get data from.</param>
-        ////public void CopyFrom(FileRow src)
-        ////{
-        ////    for (int i = 0; i < src.Fields.Length; i++)
-        ////    {
-        ////        this[i] = src[i];
-        ////    }
-        ////    this.assemblyManifest = src.assemblyManifest;
-        ////    this.assemblyType = src.assemblyType;
-        ////    this.directory = src.directory;
-        ////    this.diskId = src.diskId;
-        ////    this.fromModule = src.fromModule;
-        ////    this.isGeneratedShortFileName = src.isGeneratedShortFileName;
-        ////    this.patchGroup = src.patchGroup;
-        ////    this.processorArchitecture = src.processorArchitecture;
-        ////    this.source = src.source;
-        ////    this.PreviousSource = src.PreviousSource;
-        ////    this.Operation = src.Operation;
-        ////    this.symbols = src.symbols;
-        ////    this.PreviousSymbols = src.PreviousSymbols;
-        ////    this.patchAttributes = src.patchAttributes;
-        ////    this.retainOffsets = src.retainOffsets;
-        ////    this.retainLengths = src.retainLengths;
-        ////    this.ignoreOffsets = src.ignoreOffsets;
-        ////    this.ignoreLengths = src.ignoreLengths;
-        ////    this.PreviousRetainOffsets = src.PreviousRetainOffsets;
-        ////    this.PreviousRetainLengths = src.PreviousRetainLengths;
-        ////    this.PreviousIgnoreOffsets = src.PreviousIgnoreOffsets;
-        ////    this.PreviousIgnoreLengths = src.PreviousIgnoreLengths;
-        ////}
-
-        /////// <summary>
-        /////// Appends previous data from another FileRow object.
-        /////// </summary>
-        /////// <param name="src">An row to get data from.</param>
-        ////public void AppendPreviousDataFrom(FileRow src)
-        ////{
-        ////    AppendStringToArray(ref this.previousSource, src.previousSource[0]);
-        ////    AppendStringToArray(ref this.previousSymbols, src.previousSymbols[0]);
-        ////    AppendStringToArray(ref this.previousRetainOffsets, src.previousRetainOffsets[0]);
-        ////    AppendStringToArray(ref this.previousRetainLengths, src.previousRetainLengths[0]);
-        ////    AppendStringToArray(ref this.previousIgnoreOffsets, src.previousIgnoreOffsets[0]);
-        ////    AppendStringToArray(ref this.previousIgnoreLengths, src.previousIgnoreLengths[0]);
-        ////}
-
-        /////// <summary>
-        /////// Helper method for AppendPreviousDataFrom.
-        /////// </summary>
-        /////// <param name="source">Destination array.</param>
-        /////// <param name="destination">Source string.</param>
-        ////private static void AppendStringToArray(ref string[] destination, string source)
-        ////{
-        ////    string[] result = new string[destination.Length + 1];
-        ////    destination.CopyTo(result, 0);
-        ////    result[destination.Length] = source;
-        ////    destination = result;
-        ////}
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/MediaRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/MediaRow.cs
deleted file mode 100644
index f387a8d2..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/MediaRow.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the Media table.
-    /// </summary>
-    public sealed class MediaRow : Row
-    {
-        /// <summary>
-        /// Creates a Media row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public MediaRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the disk id for this media row.
-        /// </summary>
-        /// <value>Disk id.</value>
-        public int DiskId
-        {
-            get { return (int)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the last sequence number for this media row.
-        /// </summary>
-        /// <value>Last sequence number.</value>
-        public int LastSequence
-        {
-            get { return (int)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the disk prompt for this media row.
-        /// </summary>
-        /// <value>Disk prompt.</value>
-        public string DiskPrompt
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the cabinet name for this media row.
-        /// </summary>
-        /// <value>Cabinet name.</value>
-        public string Cabinet
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the volume label for this media row.
-        /// </summary>
-        /// <value>Volume label.</value>
-        public string VolumeLabel
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the source for this media row.
-        /// </summary>
-        /// <value>Source.</value>
-        public string Source
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/PropertyRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/PropertyRow.cs
deleted file mode 100644
index 558df760..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/PropertyRow.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-
-    /// <summary>
-    /// Specialization of a row for the upgrade table.
-    /// </summary>
-    public sealed class PropertyRow : Row
-    {
-        /// <summary>
-        /// Creates an Upgrade row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Upgrade row belongs to and should get its column definitions from.</param>
-        public PropertyRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets and sets the upgrade code for the row.
-        /// </summary>
-        /// <value>Property identifier for the row.</value>
-        public string Property
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the value for the row.
-        /// </summary>
-        /// <value>Property value for the row.</value>
-        public string Value
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/SummaryInfoRowCollection.cs b/src/WixToolset.Data.WindowsInstaller/Rows/SummaryInfoRowCollection.cs
deleted file mode 100644
index bc931f15..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/SummaryInfoRowCollection.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Collections;
-    using System.Collections.ObjectModel;
-
-    /// <summary>
-    /// Indexed container class for summary information rows.
-    /// </summary>
-    public sealed class SummaryInfoRowCollection : KeyedCollection<int, Row>
-    {
-        /// <summary>
-        /// Creates the keyed collection from existing rows in a table.
-        /// </summary>
-        /// <param name="table">The summary information table to index.</param>
-        public SummaryInfoRowCollection(Table table)
-        {
-            if (0 != String.CompareOrdinal("_SummaryInformation", table.Name))
-            {
-                string message = string.Format(WixDataStrings.EXP_UnsupportedTable, table.Name);
-                throw new ArgumentException(message, "table");
-            }
-
-            foreach (Row row in table.Rows)
-            {
-                this.Add(row);
-            }
-        }
-
-        /// <summary>
-        /// Gets the summary property ID for the <paramref name="row"/>.
-        /// </summary>
-        /// <param name="row">The row to index.</param>
-        /// <returns>The summary property ID for the <paramref name="row"/>.
-        protected override int GetKeyForItem(Row row)
-        {
-            return (int)row[0];
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/UpgradeRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/UpgradeRow.cs
deleted file mode 100644
index 807a9f93..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/UpgradeRow.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the upgrade table.
-    /// </summary>
-    public sealed class UpgradeRow : Row
-    {
-        /// <summary>
-        /// Creates an Upgrade row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Upgrade row belongs to and should get its column definitions from.</param>
-        public UpgradeRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets and sets the upgrade code for the row.
-        /// </summary>
-        /// <value>Upgrade code for the row.</value>
-        public string UpgradeCode
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the version minimum for the row.
-        /// </summary>
-        /// <value>Version minimum for the row.</value>
-        public string VersionMin
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the version maximum for the row.
-        /// </summary>
-        /// <value>Version maximum for the row.</value>
-        public string VersionMax
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the language for the row.
-        /// </summary>
-        /// <value>Language for the row.</value>
-        public string Language
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the attributes for the row.
-        /// </summary>
-        /// <value>Attributes for the row.</value>
-        public int Attributes
-        {
-            get { return (int)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the remove code for the row.
-        /// </summary>
-        /// <value>Remove code for the row.</value>
-        public string Remove
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the action property for the row.
-        /// </summary>
-        /// <value>Action property for the row.</value>
-        public string ActionProperty
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs
deleted file mode 100644
index d1be706e..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixActionRow.cs
+++ /dev/null
@@ -1,378 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Xml;
-    using System.Xml.Schema;
-    using WixToolset.Data.Tuples;
-
-    /// <summary>
-    /// The Sequence tables that actions may belong to.
-    /// </summary>
-    //public enum SequenceTable
-    //{
-    //    /// <summary>AdminUISequence</summary>
-    //    AdminUISequence,
-
-    //    /// <summary>AdminExecuteSequence</summary>
-    //    AdminExecuteSequence,
-
-    //    /// <summary>AdvtExecuteSequence</summary>
-    //    AdvtExecuteSequence,
-
-    //    /// <summary>InstallUISequence</summary>
-    //    InstallUISequence,
-
-    //    /// <summary>InstallExecuteSequence</summary>
-    //    InstallExecuteSequence
-    //}
-
-    /// <summary>
-    /// Specialization of a row for the sequence tables.
-    /// </summary>
-    public sealed class WixActionRow : Row, IComparable
-    {
-        private WixActionRowCollection previousActionRows;
-        private WixActionRowCollection nextActionRows;
-
-        /// <summary>
-        /// Instantiates an ActionRow that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Action row belongs to and should get its column definitions from.</param>
-        public WixActionRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Instantiates a standard ActionRow.
-        /// </summary>
-        /// <param name="sequenceTable">The sequence table of the standard action.</param>
-        /// <param name="action">The name of the standard action.</param>
-        /// <param name="condition">The condition of the standard action.</param>
-        /// <param name="sequence">The suggested sequence number of the standard action.</param>
-        //private WixActionRow(SequenceTable sequenceTable, string action, string condition, int sequence) :
-        //    base(null, WindowsInstallerStandard.GetTableDefinitions()["WixAction"])
-        //{
-        //    this.SequenceTable = sequenceTable;
-        //    this.Action = action;
-        //    this.Condition = condition;
-        //    this.Sequence = sequence;
-        //    this.Overridable = true; // all standard actions are overridable by default
-        //}
-
-        /// <summary>
-        /// Instantiates an ActionRow by copying data from another ActionRow.
-        /// </summary>
-        /// <param name="source">The row the data is copied from.</param>
-        /// <remarks>The previous and next action collections are not copied.</remarks>
-        private WixActionRow(WixActionRow source)
-            : base(source)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the action.
-        /// </summary>
-        /// <value>The name of the action.</value>
-        public string Action
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the name of the action this action should be scheduled after.
-        /// </summary>
-        /// <value>The name of the action this action should be scheduled after.</value>
-        public string After
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the name of the action this action should be scheduled before.
-        /// </summary>
-        /// <value>The name of the action this action should be scheduled before.</value>
-        public string Before
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the condition of the action.
-        /// </summary>
-        /// <value>The condition of the action.</value>
-        public string Condition
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether this action is overridable.
-        /// </summary>
-        /// <value>Whether this action is overridable.</value>
-        public bool Overridable
-        {
-            get { return (1 == Convert.ToInt32(this.Fields[6].Data, CultureInfo.InvariantCulture)); }
-            set { this.Fields[6].Data = (value ? 1 : 0); }
-        }
-
-        /// <summary>
-        /// Gets or sets the sequence number of this action.
-        /// </summary>
-        /// <value>The sequence number of this action.</value>
-        public int Sequence
-        {
-            get { return Convert.ToInt32(this.Fields[3].Data, CultureInfo.InvariantCulture); }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets of sets the sequence table of this action.
-        /// </summary>
-        /// <value>The sequence table of this action.</value>
-        public SequenceTable SequenceTable
-        {
-            get { return (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[0].Data); }
-            set { this.Fields[0].Data = value.ToString(); }
-        }
-
-        /// <summary>
-        /// Gets the actions that should be scheduled after this action.
-        /// </summary>
-        /// <value>The actions that should be scheduled after this action.</value>
-        public WixActionRowCollection NextActionRows
-        {
-            get
-            {
-                if (null == this.nextActionRows)
-                {
-                    this.nextActionRows = new WixActionRowCollection();
-                }
-
-                return this.nextActionRows;
-            }
-        }
-
-        /// <summary>
-        /// Gets the actions that should be scheduled before this action.
-        /// </summary>
-        /// <value>The actions that should be scheduled before this action.</value>
-        public WixActionRowCollection PreviousActionRows
-        {
-            get
-            {
-                if (null == this.previousActionRows)
-                {
-                    this.previousActionRows = new WixActionRowCollection();
-                }
-
-                return this.previousActionRows;
-            }
-        }
-
-        /// <summary>
-        /// Creates a clone of the action row.
-        /// </summary>
-        /// <returns>A shallow copy of the source object.</returns>
-        /// <remarks>The previous and next action collections are not copied.</remarks>
-        public WixActionRow Clone()
-        {
-            return new WixActionRow(this);
-        }
-
-        /// <summary>
-        /// Compares the current instance with another object of the same type.
-        /// </summary>
-        /// <param name="obj">Other reference to compare this one to.</param>
-        /// <returns>Returns less than 0 for less than, 0 for equals, and greater than 0 for greater.</returns>
-        public int CompareTo(object obj)
-        {
-            WixActionRow otherActionRow = (WixActionRow)obj;
-
-            return this.Sequence.CompareTo(otherActionRow.Sequence);
-        }
-
-        /// <summary>
-        /// Parses ActionRows from the Xml reader.
-        /// </summary>
-        /// <param name="reader">Xml reader that contains serialized ActionRows.</param>
-        /// <returns>The parsed ActionRows.</returns>
-        internal static WixActionRow[] Parse(XmlReader reader)
-        {
-            Debug.Assert("action" == reader.LocalName);
-
-            string id = null;
-            string condition = null;
-            bool empty = reader.IsEmptyElement;
-            int sequence = int.MinValue;
-            int sequenceCount = 0;
-            SequenceTable[] sequenceTables = new SequenceTable[Enum.GetValues(typeof(SequenceTable)).Length];
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.Name)
-                {
-                    case "name":
-                        id = reader.Value;
-                        break;
-                    case "AdminExecuteSequence":
-                        if (reader.Value.Equals("yes"))
-                        {
-                            sequenceTables[sequenceCount] = SequenceTable.AdminExecuteSequence;
-                            ++sequenceCount;
-                        }
-                        break;
-                    case "AdminUISequence":
-                        if (reader.Value.Equals("yes"))
-                        {
-                            sequenceTables[sequenceCount] = SequenceTable.AdminUISequence;
-                            ++sequenceCount;
-                        }
-                        break;
-                    case "AdvtExecuteSequence":
-                        if (reader.Value.Equals("yes"))
-                        {
-                            sequenceTables[sequenceCount] = SequenceTable.AdvtExecuteSequence;
-                            ++sequenceCount;
-                        }
-                        break;
-                    case "condition":
-                        condition = reader.Value;
-                        break;
-                    case "InstallExecuteSequence":
-                        if (reader.Value.Equals("yes"))
-                        {
-                            sequenceTables[sequenceCount] = SequenceTable.InstallExecuteSequence;
-                            ++sequenceCount;
-                        }
-                        break;
-                    case "InstallUISequence":
-                        if (reader.Value.Equals("yes"))
-                        {
-                            sequenceTables[sequenceCount] = SequenceTable.InstallUISequence;
-                            ++sequenceCount;
-                        }
-                        break;
-                    case "sequence":
-                        sequence = Convert.ToInt32(reader.Value, CultureInfo.InvariantCulture);
-                        break;
-                }
-            }
-
-            if (null == id)
-            {
-                throw new XmlException();
-            }
-
-            if (int.MinValue == sequence)
-            {
-                throw new XmlException();
-            }
-            else if (1 > sequence)
-            {
-                throw new XmlException();
-            }
-
-            if (0 == sequenceCount)
-            {
-                throw new XmlException();
-            }
-
-            if (!empty && reader.Read() && XmlNodeType.EndElement != reader.MoveToContent())
-            {
-                throw new XmlException();
-            }
-
-            // create the actions
-            WixActionRow[] actionRows = new WixActionRow[sequenceCount];
-            for (int i = 0; i < sequenceCount; i++)
-            {
-                //WixActionRow actionRow = new WixActionRow(sequenceTables[i], id, condition, sequence);
-                //actionRows[i] = actionRow;
-                throw new NotImplementedException();
-            }
-
-            return actionRows;
-        }
-
-#if DEAD_CODE
-        /// <summary>
-        /// Determines whether this ActionRow contains the specified ActionRow as a child in its dependency tree.
-        /// </summary>
-        /// <param name="actionRow">The possible child ActionRow.</param>
-        /// <returns>true if the ActionRow is a child of this ActionRow; false otherwise.</returns>
-        public bool ContainsChildActionRow(WixActionRow actionRow)
-        {
-            if (null != this.previousActionRows)
-            {
-                if (this.previousActionRows.Contains(actionRow.SequenceTable, actionRow.Action))
-                {
-                    return true;
-                }
-            }
-
-            if (null != this.nextActionRows)
-            {
-                if (this.nextActionRows.Contains(actionRow.SequenceTable, actionRow.Action))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Get all the actions scheduled before this one in a particular sequence table.
-        /// </summary>
-        /// <param name="sequenceTable">The sequence table.</param>
-        /// <param name="allPreviousActionRows">A RowCollection which will contain all the previous actions.</param>
-        public void GetAllPreviousActionRows(SequenceTable sequenceTable, IList<WixActionRow> allPreviousActionRows)
-        {
-            if (null != this.previousActionRows)
-            {
-                foreach (WixActionRow actionRow in this.previousActionRows)
-                {
-                    if (sequenceTable == actionRow.SequenceTable)
-                    {
-                        actionRow.GetAllPreviousActionRows(sequenceTable, allPreviousActionRows);
-                        allPreviousActionRows.Add(actionRow);
-                        actionRow.GetAllNextActionRows(sequenceTable, allPreviousActionRows);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get all the actions scheduled after this one in a particular sequence table.
-        /// </summary>
-        /// <param name="sequenceTable">The sequence table.</param>
-        /// <param name="allNextActionRows">A RowCollection which will contain all the next actions.</param>
-        public void GetAllNextActionRows(SequenceTable sequenceTable, IList<WixActionRow> allNextActionRows)
-        {
-            if (null != this.nextActionRows)
-            {
-                foreach (WixActionRow actionRow in this.nextActionRows)
-                {
-                    if (sequenceTable == actionRow.SequenceTable)
-                    {
-                        actionRow.GetAllPreviousActionRows(sequenceTable, allNextActionRows);
-                        allNextActionRows.Add(actionRow);
-                        actionRow.GetAllNextActionRows(sequenceTable, allNextActionRows);
-                    }
-                }
-            }
-        }
-#endif
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs
deleted file mode 100644
index c10a39ab..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixApprovedExeForElevationRow.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 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.Data.Rows
-{
-
-    /// <summary>
-    /// Specialization of a row for the WixApprovedExeForElevation table.
-    /// </summary>
-    public class WixApprovedExeForElevationRow : Row
-    {
-        /// <summary>
-        /// Creates an ApprovedExeForElevation row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this ApprovedExeForElevation row belongs to and should get its column definitions from.</param>
-        public WixApprovedExeForElevationRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates an ApprovedExeForElevation row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this ApprovedExeForElevation row belongs to and should get its column definitions from.</param>
-        public WixApprovedExeForElevationRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the ApprovedExeForElevation identifier.
-        /// </summary>
-        /// <value>The ApprovedExeForElevation identifier.</value>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the Key path.
-        /// </summary>
-        /// <value>The Key path.</value>
-        public string Key
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the Value name.
-        /// </summary>
-        /// <value>The Value name.</value>
-        public string ValueName
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the attibutes.
-        /// </summary>
-        /// <value>The BundleApprovedExeForElevationAttributes.</value>
-        public BundleApprovedExeForElevationAttributes Attributes
-        {
-            get { return (BundleApprovedExeForElevationAttributes)this.Fields[3].Data; }
-            set { this.Fields[3].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets whether this row is 64-bit.
-        /// </summary>
-        public bool Win64
-        {
-            get { return BundleApprovedExeForElevationAttributes.Win64 == (this.Attributes & BundleApprovedExeForElevationAttributes.Win64); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleCatalogRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleCatalogRow.cs
deleted file mode 100644
index 05c1e597..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleCatalogRow.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixCatalog table.
-    /// </summary>
-    public sealed class WixBundleCatalogRow : Row
-    {
-        /// <summary>
-        /// Creates a Catalog row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Catalog row belongs to and should get its column definitions from.</param>
-        public WixBundleCatalogRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a Catalog row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Catalog row belongs to and should get its column definitions from.</param>
-        public WixBundleCatalogRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the catalog identifier.
-        /// </summary>
-        /// <value>The catalog identifier.</value>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the payload identifier.
-        /// </summary>
-        /// <value>The payload identifier.</value>
-        public string Payload
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleContainerRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleContainerRow.cs
deleted file mode 100644
index 7b03dcc5..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleContainerRow.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the Container table.
-    /// </summary>
-    public class WixBundleContainerRow : Row
-    {
-        /// <summary>
-        /// Creates a ContainerRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleContainerRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a ContainerRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleContainerRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Name
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public ContainerType Type
-        {
-            get { return (ContainerType)this.Fields[2].Data; }
-            set { this.Fields[2].Data = (int)value; }
-        }
-
-        public string DownloadUrl
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        public long Size
-        {
-            get { return (long)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        public string Hash
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        public int AttachedContainerIndex
-        {
-            get { return (null == this.Fields[6].Data) ? -1 : (int)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        public string WorkingPath
-        {
-            get { return (string)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleExePackageRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleExePackageRow.cs
deleted file mode 100644
index 3bf06d49..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleExePackageRow.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 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.
-
-using WixToolset.Data.Tuples;
-
-namespace WixToolset.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixBundleExePackage table.
-    /// </summary>
-    public sealed class WixBundleExePackageRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundleExePackage row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixBundleExePackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixBundleExePackageRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixBundleExePackageRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the raw Exe attributes of a patch.
-        /// </summary>
-        public WixBundleExePackageAttributes Attributes
-        {
-            get { return (WixBundleExePackageAttributes)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the protcol for the executable package.
-        /// </summary>
-        public string DetectCondition
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the install command for the executable package.
-        /// </summary>
-        public string InstallCommand
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the repair command for the executable package.
-        /// </summary>
-        public string RepairCommand
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the uninstall command for the executable package.
-        /// </summary>
-        public string UninstallCommand
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the protcol for the executable package.
-        /// </summary>
-        public string ExeProtocol
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets whether the executable package is repairable.
-        /// </summary>
-        public bool Repairable
-        {
-            get { return 0 != (this.Attributes & WixBundleExePackageAttributes.Repairable); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiFeatureRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiFeatureRow.cs
deleted file mode 100644
index 551eae20..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiFeatureRow.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the MsiFeature table.
-    /// </summary>
-    public class WixBundleMsiFeatureRow : Row
-    {
-        /// <summary>
-        /// Creates a MsiFeatureRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleMsiFeatureRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a MsiFeatureRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleMsiFeatureRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Name
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public long Size
-        {
-            get { return (long)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        public string Parent
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        public string Title
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        public string Description
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        public int Display
-        {
-            get { return (int)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        public int Level
-        {
-            get { return (int)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        public string Directory
-        {
-            get { return (string)this.Fields[8].Data; }
-            set { this.Fields[8].Data = value; }
-        }
-
-        public int Attributes
-        {
-            get { return (int)this.Fields[9].Data; }
-            set { this.Fields[9].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiPackageRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiPackageRow.cs
deleted file mode 100644
index 70d85e26..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiPackageRow.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Globalization;
-    using WixToolset.Data.Tuples;
-
-    /// <summary>
-    /// Specialization of a row for the WixBundleMsiPackage table.
-    /// </summary>
-    public sealed class WixBundleMsiPackageRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundleMsiPackage row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixBundleMsiPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixBundleMsiPackageRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixBundleMsiPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the raw MSI attributes of a package.
-        /// </summary>
-        public WixBundleMsiPackageAttributes Attributes
-        {
-            get { return (WixBundleMsiPackageAttributes)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the MSI package's product code.
-        /// </summary>
-        public string ProductCode
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the MSI package's upgrade code.
-        /// </summary>
-        public string UpgradeCode
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the product version of the MSI package.
-        /// </summary>
-        public string ProductVersion
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the language of the MSI package.
-        /// </summary>
-        public int ProductLanguage
-        {
-            get { return Convert.ToInt32(this.Fields[5].Data, CultureInfo.InvariantCulture); }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the product name of the MSI package.
-        /// </summary>
-        public string ProductName
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the MSI package's manufacturer.
-        /// </summary>
-        public string Manufacturer
-        {
-            get { return (string)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the display internal UI of a package.
-        /// </summary>
-        public bool DisplayInternalUI
-        {
-            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.DisplayInternalUI); }
-        }
-
-        /// <summary>
-        /// Gets the display internal UI of a package.
-        /// </summary>
-        public bool EnableFeatureSelection
-        {
-            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection); }
-        }
-
-        /// <summary>
-        /// Gets the display internal UI of a package.
-        /// </summary>
-        public bool ForcePerMachine
-        {
-            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.ForcePerMachine); }
-        }
-
-        /// <summary>
-        /// Gets the suppress loose file payload generation of a package.
-        /// </summary>
-        public bool SuppressLooseFilePayloadGeneration
-        {
-            get { return 0 != (this.Attributes & WixBundleMsiPackageAttributes.SuppressLooseFilePayloadGeneration); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiPropertyRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiPropertyRow.cs
deleted file mode 100644
index 524f7929..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsiPropertyRow.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixBundleMsiProperty table.
-    /// </summary>
-    public sealed class WixBundleMsiPropertyRow : Row
-    {
-        /// <summary>
-        /// Creates an WixBundleMsiProperty row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this WixBundleMsiProperty row belongs to and should get its column definitions from.</param>
-        public WixBundleMsiPropertyRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the property identity.
-        /// </summary>
-        public string Name
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the value for the row.
-        /// </summary>
-        /// <value>MsiProperty value for the row.</value>
-        public string Value
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the condition for the row.
-        /// </summary>
-        /// <value>MsiProperty condition for the row.</value>
-        public string Condition
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMspPackageRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMspPackageRow.cs
deleted file mode 100644
index 053fc915..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMspPackageRow.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// 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.
-
-using WixToolset.Data.Tuples;
-
-namespace WixToolset.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the ChainMspPackage table.
-    /// </summary>
-    public sealed class WixBundleMspPackageRow : Row
-    {
-        /// <summary>
-        /// Creates a ChainMspPackage row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixBundleMspPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixBundleMspPackage row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixBundleMspPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the raw MSP attributes of a patch.
-        /// </summary>
-        public WixBundleMspPackageAttributes Attributes
-        {
-            get { return (WixBundleMspPackageAttributes)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the patch code.
-        /// </summary>
-        public string PatchCode
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the patch's manufacturer.
-        /// </summary>
-        public string Manufacturer
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the patch's xml.
-        /// </summary>
-        public string PatchXml
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the display internal UI of a patch.
-        /// </summary>
-        public bool DisplayInternalUI
-        {
-            get { return 0 != (this.Attributes & WixBundleMspPackageAttributes.DisplayInternalUI); }
-        }
-
-        /// <summary>
-        /// Gets whether to slipstream the patch.
-        /// </summary>
-        public bool Slipstream
-        {
-            get { return 0 != (this.Attributes & WixBundleMspPackageAttributes.Slipstream); }
-        }
-
-        /// <summary>
-        /// Gets whether the patch targets an unspecified number of packages.
-        /// </summary>
-        public bool TargetUnspecified
-        {
-            get { return 0 != (this.Attributes & WixBundleMspPackageAttributes.TargetUnspecified); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsuPackageRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsuPackageRow.cs
deleted file mode 100644
index 0df635c2..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleMsuPackageRow.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixBundleMsuPackage table.
-    /// </summary>
-    public sealed class WixBundleMsuPackageRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundleMsuPackage row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixBundleMsuPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixBundleMsuPackage row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixBundleMsuPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the detection condition the package.
-        /// </summary>
-        public string DetectCondition
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the KB of the package.
-        /// </summary>
-        public string MsuKB
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageCommandLineRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageCommandLineRow.cs
deleted file mode 100644
index eba647d5..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageCommandLineRow.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-
-    /// <summary>
-    /// Specialization of a row for the WixBundlePackageCommandLine table.
-    /// </summary>
-    public class WixBundlePackageCommandLineRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundlePackageCommandLineRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this WixBundlePackageCommandLineRow row belongs to and should get its column definitions from.</param>
-        public WixBundlePackageCommandLineRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates an WixBundlePackageCommandLineRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this WixBundlePackageCommandLineRow row belongs to and should get its column definitions from.</param>
-        public WixBundlePackageCommandLineRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the package identifier.
-        /// </summary>
-        /// <value>The package identifier.</value>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the command-line argument for installation.
-        /// </summary>
-        /// <value>The command-line argument.</value>
-        public string InstallArgument
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the command-line argument for uninstallation.
-        /// </summary>
-        /// <value>The command-line argument.</value>
-        public string UninstallArgument
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the command-line argument for repair.
-        /// </summary>
-        /// <value>The command-line argument.</value>
-        public string RepairArgument
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the condition.
-        /// </summary>
-        /// <value>The condition.</value>
-        public string Condition
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageExitCodeRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageExitCodeRow.cs
deleted file mode 100644
index 2beed8da..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageExitCodeRow.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// 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.
-
-using WixToolset.Data.Tuples;
-
-namespace WixToolset.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the ExitCode table.
-    /// </summary>
-    public class WixBundlePackageExitCodeRow : Row
-    {
-        /// <summary>
-        /// Creates a ExitCodeRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixBundlePackageExitCodeRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a ExitCodeRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixBundlePackageExitCodeRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public int? Code
-        {
-            get { return (null == this.Fields[1].Data) ? (int?)null : (int?)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public ExitCodeBehaviorType Behavior
-        {
-            get { return (ExitCodeBehaviorType)this.Fields[2].Data; }
-            set { this.Fields[2].Data = (int)value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageRow.cs
deleted file mode 100644
index 973c43b9..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePackageRow.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// 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.
-
-using WixToolset.Data.Tuples;
-
-namespace WixToolset.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixBundlePackage table.
-    /// </summary>
-    public sealed class WixBundlePackageRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundlePackage row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixBundlePackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixBundlePackage row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixBundlePackageRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key to the WixChainItem.
-        /// </summary>
-        public string WixChainItemId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the item type.
-        /// </summary>
-        public WixBundlePackageType Type
-        {
-            get { return (WixBundlePackageType)this.Fields[1].Data; }
-            set { this.Fields[1].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the indentifier of the package's payload.
-        /// </summary>
-        public string PackagePayload
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the raw attributes of a package.
-        /// </summary>
-        public WixBundlePackageAttributes Attributes
-        {
-            get { return (WixBundlePackageAttributes)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the install condition of the package.
-        /// </summary>
-        public string InstallCondition
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the language of the package.
-        /// </summary>
-        public YesNoAlwaysType Cache
-        {
-            get { return (null == this.Fields[5].Data) ? YesNoAlwaysType.NotSet : (YesNoAlwaysType)this.Fields[5].Data; }
-            set { this.Fields[5].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the indentifier of the package's cache.
-        /// </summary>
-        public string CacheId
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether the package is vital.
-        /// </summary>
-        public YesNoType Vital
-        {
-            get { return (null == this.Fields[7].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[7].Data; }
-            set { this.Fields[7].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether the package is per-machine.
-        /// </summary>
-        public YesNoDefaultType PerMachine
-        {
-            get { return (null == this.Fields[8].Data) ? YesNoDefaultType.NotSet : (YesNoDefaultType)this.Fields[8].Data; }
-            set { this.Fields[8].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable that points to the log for the package.
-        /// </summary>
-        public string LogPathVariable
-        {
-            get { return (string)this.Fields[9].Data; }
-            set { this.Fields[9].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable that points to the rollback log for the package.
-        /// </summary>
-        public string RollbackLogPathVariable
-        {
-            get { return (string)this.Fields[10].Data; }
-            set { this.Fields[10].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the size of the package.
-        /// </summary>
-        public long Size
-        {
-            get { return (long)this.Fields[11].Data; }
-            set { this.Fields[11].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the install size of the package.
-        /// </summary>
-        public long? InstallSize
-        {
-            get { return (long?)this.Fields[12].Data; }
-            set { this.Fields[12].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the version of the package.
-        /// </summary>
-        public string Version
-        {
-            get { return (string)this.Fields[13].Data; }
-            set { this.Fields[13].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the language of the package.
-        /// </summary>
-        public int Language
-        {
-            get { return (int)this.Fields[14].Data; }
-            set { this.Fields[14].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the display name of the package.
-        /// </summary>
-        public string DisplayName
-        {
-            get { return (string)this.Fields[15].Data; }
-            set { this.Fields[15].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the description of the package.
-        /// </summary>
-        public string Description
-        {
-            get { return (string)this.Fields[16].Data; }
-            set { this.Fields[16].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the rollback boundary identifier for the package.
-        /// </summary>
-        public string RollbackBoundary
-        {
-            get { return (string)this.Fields[17].Data; }
-            set { this.Fields[17].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the backward rollback boundary identifier for the package.
-        /// </summary>
-        public string RollbackBoundaryBackward
-        {
-            get { return (string)this.Fields[18].Data; }
-            set { this.Fields[18].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether the package is x64.
-        /// </summary>
-        public YesNoType x64
-        {
-            get { return (null == this.Fields[19].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[19].Data; }
-            set { this.Fields[19].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets whether the package is permanent.
-        /// </summary>
-        public bool Permanent
-        {
-            get { return 0 != (this.Attributes & WixBundlePackageAttributes.Permanent); }
-        }
-
-        /// <summary>
-        /// Gets whether the package is visible.
-        /// </summary>
-        public bool Visible
-        {
-            get { return 0 != (this.Attributes & WixBundlePackageAttributes.Visible); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs
deleted file mode 100644
index e25f4a55..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePatchTargetCodeRow.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
-    /// <summary>
-    /// Attributes for the PatchTargetCode table.
-    /// </summary>
-    [Flags]
-    public enum WixBundlePatchTargetCodeAttributes : int
-    {
-        None = 0,
-
-        /// <summary>
-        /// The transform targets a specific ProductCode.
-        /// </summary>
-        TargetsProductCode = 1,
-
-        /// <summary>
-        /// The transform targets a specific UpgradeCode.
-        /// </summary>
-        TargetsUpgradeCode = 2,
-    }
-
-    /// <summary>
-    /// Specialization of a row for the PatchTargetCode table.
-    /// </summary>
-    public class WixBundlePatchTargetCodeRow : Row
-    {
-        /// <summary>
-        /// Creates a PatchTargetCodeRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this PatchTargetCode row belongs to and should get its column definitions from.</param>
-        public WixBundlePatchTargetCodeRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a PatchTargetCodeRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this PatchTargetCode row belongs to and should get its column definitions from.</param>
-        public WixBundlePatchTargetCodeRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        public string MspPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string TargetCode
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public WixBundlePatchTargetCodeAttributes Attributes
-        {
-            get { return (WixBundlePatchTargetCodeAttributes)this.Fields[2].Data; }
-            set { this.Fields[2].Data = (int)value; }
-        }
-
-        public bool TargetsProductCode
-        {
-            get { return 0 != (WixBundlePatchTargetCodeAttributes.TargetsProductCode & this.Attributes); }
-        }
-
-        public bool TargetsUpgradeCode
-        {
-            get { return 0 != (WixBundlePatchTargetCodeAttributes.TargetsUpgradeCode & this.Attributes); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePayloadRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePayloadRow.cs
deleted file mode 100644
index 8aac8aa0..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundlePayloadRow.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Specialization of a row for the PayloadInfo table.
-    /// </summary>
-    public class WixBundlePayloadRow : Row
-    {
-        /// <summary>
-        /// Creates a PayloadRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixBundlePayloadRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a PayloadRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixBundlePayloadRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Name
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public string SourceFile
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        public string DownloadUrl
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        public YesNoDefaultType Compressed
-        {
-            get { return (YesNoDefaultType)this.Fields[4].Data; }
-            set { this.Fields[4].Data = (int)value; }
-        }
-
-        public string UnresolvedSourceFile
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        public string DisplayName
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        public string Description
-        {
-            get { return (string)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        public bool EnableSignatureValidation
-        {
-            get { return (null != this.Fields[8].Data) && (1 == (int)this.Fields[8].Data); }
-            set { this.Fields[8].Data = value ? 1 : 0; }
-        }
-
-        public int FileSize
-        {
-            get { return (int)this.Fields[9].Data; }
-            set { this.Fields[9].Data = value; }
-        }
-
-        public string Version
-        {
-            get { return (string)this.Fields[10].Data; }
-            set { this.Fields[10].Data = value; }
-        }
-
-        public string Hash
-        {
-            get { return (string)this.Fields[11].Data; }
-            set { this.Fields[11].Data = value; }
-        }
-
-        public string PublicKey
-        {
-            get { return (string)this.Fields[12].Data; }
-            set { this.Fields[12].Data = value; }
-        }
-
-        public string Thumbprint
-        {
-            get { return (string)this.Fields[13].Data; }
-            set { this.Fields[13].Data = value; }
-        }
-
-        public string Catalog
-        {
-            get { return (string)this.Fields[14].Data; }
-            set { this.Fields[14].Data = value; }
-        }
-
-        public string Container
-        {
-            get { return (string)this.Fields[15].Data; }
-            set { this.Fields[15].Data = value; }
-        }
-
-        public string Package
-        {
-            get { return (string)this.Fields[16].Data; }
-            set { this.Fields[16].Data = value; }
-        }
-
-        public bool ContentFile
-        {
-            get { return (null != this.Fields[17].Data) && (1 == (int)this.Fields[17].Data); }
-            set { this.Fields[17].Data = value ? 1 : 0; }
-        }
-
-        public string EmbeddedId
-        {
-            get { return (string)this.Fields[18].Data; }
-            set { this.Fields[18].Data = value; }
-        }
-
-        public bool LayoutOnly
-        {
-            get { return (null != this.Fields[19].Data) && (1 == (int)this.Fields[19].Data); }
-            set { this.Fields[19].Data = value ? 1 : 0; }
-        }
-
-        public PackagingType Packaging
-        {
-            get
-            {
-                object data = this.Fields[20].Data;
-                return (null == data) ? PackagingType.Unknown : (PackagingType)data;
-            }
-
-            set
-            {
-                if (PackagingType.Unknown == value)
-                {
-                    this.Fields[20].Data = null;
-                }
-                else
-                {
-                    this.Fields[20].Data = (int)value;
-                }
-            }
-        }
-
-        public string ParentPackagePayload
-        {
-            get { return (string)this.Fields[21].Data; }
-            set { this.Fields[21].Data = value; }
-        }
-
-        public string FullFileName
-        {
-            get { return String.IsNullOrEmpty(this.SourceFile) ? String.Empty : Path.GetFullPath(this.SourceFile); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRelatedPackageRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRelatedPackageRow.cs
deleted file mode 100644
index ea9ff99e..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRelatedPackageRow.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the RelatedPackage table.
-    /// </summary>
-    public class WixBundleRelatedPackageRow : Row
-    {
-        /// <summary>
-        /// Creates a RelatedPackageRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleRelatedPackageRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a RelatedPackageRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleRelatedPackageRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Id
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public string MinVersion
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        public string MaxVersion
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        public string Languages
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        public bool MinInclusive
-        {
-            get { return 1 == (int)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value ? 1 : 0; }
-        }
-
-        public bool MaxInclusive
-        {
-            get { return 1 == (int)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value ? 1 : 0; }
-        }
-
-        public bool LangInclusive
-        {
-            get { return 1 == (int)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value ? 1 : 0; }
-        }
-
-        public bool OnlyDetect
-        {
-            get { return 1 == (int)this.Fields[8].Data; }
-            set { this.Fields[8].Data = value ? 1 : 0; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRollbackBoundaryRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRollbackBoundaryRow.cs
deleted file mode 100644
index d0a994c0..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRollbackBoundaryRow.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixBundleRollbackBoundary table.
-    /// </summary>
-    public sealed class WixBundleRollbackBoundaryRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundleRollbackBoundary row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixBundleRollbackBoundaryRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a RollbackBoundaryRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixBundleRollbackBoundaryRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether the package is vital.
-        /// </summary>
-        /// <value>Vitality of the package.</value>
-        public YesNoType Vital
-        {
-            get { return (null == this.Fields[1].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[1].Data; }
-            set { this.Fields[1].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether the rollback-boundary should be installed as an MSI transaction.
-        /// </summary>
-        /// <value>Vitality of the package.</value>
-        public YesNoType Transaction
-        {
-            get { return (null == this.Fields[2].Data) ? YesNoType.NotSet : (YesNoType)this.Fields[2].Data; }
-            set { this.Fields[2].Data = (int)value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRow.cs
deleted file mode 100644
index 4c96d6cc..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleRow.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-
-    /// <summary>
-    /// Bundle info for binding Bundles.
-    /// </summary>
-    public class WixBundleRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundleRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this WixBundleRow row belongs to and should get its column definitions from.</param>
-        public WixBundleRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixBundleRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this WixBundleRow row belongs to and should get its column definitions from.</param>
-        public WixBundleRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        public string Version
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Copyright
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public string Name
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        public string AboutUrl
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        public int DisableModify
-        {
-            get { return (null == this.Fields[4].Data) ? 0 : (int)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        public bool DisableRemove
-        {
-            get { return (null != this.Fields[5].Data && 0 != (int)this.Fields[5].Data); }
-            set { this.Fields[5].Data = value ? 1 : 0; }
-        }
-
-        // There is no 6. It used to be DisableRepair.
-
-        public string HelpTelephone
-        {
-            get { return (string)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        public string HelpLink
-        {
-            get { return (string)this.Fields[8].Data; }
-            set { this.Fields[8].Data = value; }
-        }
-
-        public string Publisher
-        {
-            get { return (string)this.Fields[9].Data; }
-            set { this.Fields[9].Data = value; }
-        }
-
-        public string UpdateUrl
-        {
-            get { return (string)this.Fields[10].Data; }
-            set { this.Fields[10].Data = value; }
-        }
-
-        public YesNoDefaultType Compressed
-        {
-            get { return (null == this.Fields[11].Data) ? YesNoDefaultType.Default : (0 == (int)this.Fields[11].Data) ? YesNoDefaultType.No : YesNoDefaultType.Yes; }
-            set { this.Fields[11].Data = (int)value; }
-        }
-
-        public PackagingType DefaultPackagingType
-        {
-            get { return (YesNoDefaultType.No == this.Compressed) ? PackagingType.External : PackagingType.Embedded; }
-        }
-
-        public string LogPathPrefixExtension
-        {
-            get { return (string)this.Fields[12].Data ?? String.Empty; }
-            set { this.Fields[12].Data = value; }
-        }
-
-        public string LogPathVariable
-        {
-            get
-            {
-                string[] logVariableAndPrefixExtension = this.LogPathPrefixExtension.Split(':');
-                return logVariableAndPrefixExtension[0];
-            }
-        }
-
-        public string LogPrefix
-        {
-            get
-            {
-                string[] logVariableAndPrefixExtension = this.LogPathPrefixExtension.Split(':');
-                if (2 > logVariableAndPrefixExtension.Length)
-                {
-                    return String.Empty;
-                }
-                string logPrefixAndExtension = logVariableAndPrefixExtension[1];
-                int extensionIndex = logPrefixAndExtension.LastIndexOf('.');
-                return logPrefixAndExtension.Substring(0, extensionIndex);
-            }
-        }
-
-        public string LogExtension
-        {
-            get
-            {
-                string[] logVariableAndPrefixExtension = this.LogPathPrefixExtension.Split(':');
-                if (2 > logVariableAndPrefixExtension.Length)
-                {
-                    return String.Empty;
-                }
-                string logPrefixAndExtension = logVariableAndPrefixExtension[1];
-                int extensionIndex = logPrefixAndExtension.LastIndexOf('.');
-                return logPrefixAndExtension.Substring(extensionIndex + 1);
-            }
-        }
-
-        public string IconPath
-        {
-            get { return (string)this.Fields[13].Data; }
-            set { this.Fields[13].Data = value; }
-        }
-
-        public string SplashScreenBitmapPath
-        {
-            get { return (string)this.Fields[14].Data; }
-            set { this.Fields[14].Data = value; }
-        }
-
-        public string Condition
-        {
-            get { return (string)this.Fields[15].Data; }
-            set { this.Fields[15].Data = value; }
-        }
-
-        public string Tag
-        {
-            get { return (string)this.Fields[16].Data; }
-            set { this.Fields[16].Data = value; }
-        }
-
-        public Platform Platform
-        {
-            get { return (Platform)Enum.Parse(typeof(Platform), (string)this.Fields[17].Data); }
-            set { this.Fields[17].Data = value.ToString(); }
-        }
-
-        public string ParentName
-        {
-            get { return (string)this.Fields[18].Data; }
-            set { this.Fields[18].Data = value; }
-        }
-
-        public string UpgradeCode
-        {
-            get { return (string)this.Fields[19].Data; }
-            set { this.Fields[19].Data = value; }
-        }
-
-        public Guid BundleId
-        {
-            get
-            {
-                if (null == this.Fields[20].Data)
-                {
-                    this.Fields[20].Data = Guid.NewGuid().ToString("B");
-                }
-
-                return new Guid((string)this.Fields[20].Data);
-            }
-
-            set { this.Fields[20].Data = value.ToString(); }
-        }
-
-        public string ProviderKey
-        {
-            get
-            {
-                if (null == this.Fields[21].Data)
-                {
-                    this.Fields[21].Data = this.BundleId.ToString("B");
-                }
-
-                return (string)this.Fields[21].Data;
-            }
-
-            set { this.Fields[21].Data = value; }
-        }
-
-        public bool PerMachine
-        {
-            get { return (null != this.Fields[22].Data && 0 != (int)this.Fields[22].Data); }
-            set { this.Fields[22].Data = value ? 1 : 0; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleSlipstreamMspRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleSlipstreamMspRow.cs
deleted file mode 100644
index d11b23ef..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleSlipstreamMspRow.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the SlipstreamMsp table.
-    /// </summary>
-    public class WixBundleSlipstreamMspRow : Row
-    {
-        /// <summary>
-        /// Creates a SlipstreamMspRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleSlipstreamMspRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a SlipstreamMspRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleSlipstreamMspRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row.
-        /// </summary>
-        public string ChainPackageId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the foreign key identifier to the ChainPackage row for the MSP package.
-        /// </summary>
-        public string MspPackageId
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleUpdateRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleUpdateRow.cs
deleted file mode 100644
index e0150685..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleUpdateRow.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-
-    /// <summary>
-    /// Bundle update info for binding Bundles.
-    /// </summary>
-    public class WixBundleUpdateRow : Row
-    {
-        /// <summary>
-        /// Creates a WixBundleUpdateRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this WixBundleUpdateRow row belongs to and should get its column definitions from.</param>
-        public WixBundleUpdateRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixBundleUpdateRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this WixBundleUpdateRow row belongs to and should get its column definitions from.</param>
-        public WixBundleUpdateRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        public string Location
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleVariableRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleVariableRow.cs
deleted file mode 100644
index e7ff1a4d..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixBundleVariableRow.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the Variable table.
-    /// </summary>
-    public sealed class WixBundleVariableRow : Row
-    {
-        /// <summary>
-        /// Creates a Variable row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleVariableRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a Variable row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixBundleVariableRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the variable identifier.
-        /// </summary>
-        /// <value>The variable identifier.</value>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable's value.
-        /// </summary>
-        /// <value>The variable's value.</value>
-        public string Value
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable's type.
-        /// </summary>
-        /// <value>The variable's type.</value>
-        public string Type
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether this variable is hidden.
-        /// </summary>
-        /// <value>Whether this variable is hidden.</value>
-        public bool Hidden
-        {
-            get { return (null == this.Fields[3].Data || 0 == ((int)this.Fields[3].Data)) ? false : true; }
-            set { this.Fields[3].Data = value ? 1 : 0; }
-        }
-
-        /// <summary>
-        /// Gets or sets whether this variable is persisted.
-        /// </summary>
-        /// <value>Whether this variable is persisted.</value>
-        public bool Persisted
-        {
-            get { return (null == this.Fields[4].Data || 0 == ((int)this.Fields[4].Data)) ? false : true; }
-            set { this.Fields[4].Data = value ? 1 : 0; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixChainItemRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixChainItemRow.cs
deleted file mode 100644
index 12538d71..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixChainItemRow.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixChainItem table.
-    /// </summary>
-    public sealed class WixChainItemRow : Row
-    {
-        /// <summary>
-        /// Creates a WixChainItem row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this ChainItem row belongs to and should get its column definitions from.</param>
-        public WixChainItemRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixChainItem row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this ChainItem row belongs to and should get its column definitions from.</param>
-        public WixChainItemRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the WixChainItem identifier.
-        /// </summary>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixChainRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixChainRow.cs
deleted file mode 100644
index 54fff72c..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixChainRow.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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.
-
-using WixToolset.Data.Tuples;
-
-namespace WixToolset.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixChain table.
-    /// </summary>
-    public sealed class WixChainRow : Row
-    {
-        /// <summary>
-        /// Creates a WixChain row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixChainRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixChainRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixChainRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the raw chain attributes.
-        /// </summary>
-        public WixChainAttributes Attributes
-        {
-            get { return (WixChainAttributes)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the disable rollback state of a chain.
-        /// </summary>
-        public bool DisableRollback
-        {
-            get { return 0 != (this.Attributes & WixChainAttributes.DisableRollback); }
-        }
-
-        /// <summary>
-        /// Gets disable system restore state of a chain.
-        /// </summary>
-        public bool DisableSystemRestore
-        {
-            get { return 0 != (this.Attributes & WixChainAttributes.DisableSystemRestore); }
-        }
-
-        /// <summary>
-        /// Gets parallel cache of a chain.
-        /// </summary>
-        public bool ParallelCache
-        {
-            get { return 0 != (this.Attributes & WixChainAttributes.ParallelCache); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixComplexReferenceRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixComplexReferenceRow.cs
deleted file mode 100644
index 40ca4592..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixComplexReferenceRow.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Xml;
-
-    /// <summary>
-    /// Specialization of a row for the WixComplexReference table.
-    /// </summary>
-    public sealed class WixComplexReferenceRow : Row, IComparable
-    {
-        /// <summary>
-        /// Creates a WixComplexReferenceRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixComplexReferenceRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets the parent type of the complex reference.
-        /// </summary>
-        /// <value>Parent type of the complex reference.</value>
-        public ComplexReferenceParentType ParentType
-        {
-            get { return (ComplexReferenceParentType)Enum.ToObject(typeof(ComplexReferenceParentType), (int)this.Fields[1].Data); }
-            set { this.Fields[1].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the parent identifier of the complex reference.
-        /// </summary>
-        /// <value>Parent identifier of the complex reference.</value>
-        public string ParentId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the parent language of the complex reference.
-        /// </summary>
-        /// <value>Parent language of the complex reference.</value>
-        public string ParentLanguage
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the child type of the complex reference.
-        /// </summary>
-        /// <value>Child type of the complex reference.</value>
-        public ComplexReferenceChildType ChildType
-        {
-            get { return (ComplexReferenceChildType)Enum.ToObject(typeof(ComplexReferenceChildType), (int)this.Fields[4].Data); }
-            set { this.Fields[4].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets the child identifier of the complex reference.
-        /// </summary>
-        /// <value>Child identifier of the complex reference.</value>
-        public string ChildId
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets if this is the primary complex reference.
-        /// </summary>
-        /// <value>true if primary complex reference.</value>
-        public bool IsPrimary
-        {
-            get
-            {
-                return (0x1 == ((int)this.Fields[5].Data & 0x1));
-            }
-
-            set
-            {
-                if (null == this.Fields[5].Data)
-                {
-                    this.Fields[5].Data = 0;
-                }
-
-                if (value)
-                {
-                    this.Fields[5].Data = (int)this.Fields[5].Data | 0x1;
-                }
-                else
-                {
-                    this.Fields[5].Data = (int)this.Fields[5].Data & ~0x1;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Determines if two complex references are equivalent.
-        /// </summary>
-        /// <param name="obj">Complex reference to compare.</param>
-        /// <returns>True if complex references are equivalent.</returns>
-        public override bool Equals(object obj)
-        {
-            return 0 == this.CompareTo(obj);
-        }
-
-        /// <summary>
-        /// Gets the hash code for the complex reference.
-        /// </summary>
-        /// <returns>Hash code for the complex reference.</returns>
-        public override int GetHashCode()
-        {
-            return this.ChildType.GetHashCode() ^ this.ChildId.GetHashCode() ^ this.ParentType.GetHashCode() ^ this.ParentLanguage.GetHashCode() ^ this.ParentId.GetHashCode() ^ this.IsPrimary.GetHashCode();
-        }
-
-        /// <summary>
-        /// Compares two complex references.
-        /// </summary>
-        /// <param name="obj">Complex reference to compare to.</param>
-        /// <returns>Zero if the objects are equivalent, negative number if the provided object is less, positive if greater.</returns>
-        public int CompareTo(object obj)
-        {
-            int comparison = this.CompareToWithoutConsideringPrimary(obj);
-            if (0 == comparison)
-            {
-                comparison = ((WixComplexReferenceRow)obj).IsPrimary.CompareTo(this.IsPrimary); // Note: the order of these is purposely switched to ensure that "Yes" is lower than "No" and "NotSet"
-            }
-            return comparison;
-        }
-
-        /// <summary>
-        /// Compares two complex references without considering the primary bit.
-        /// </summary>
-        /// <param name="obj">Complex reference to compare to.</param>
-        /// <returns>Zero if the objects are equivalent, negative number if the provided object is less, positive if greater.</returns>
-        [SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.ArgumentException.#ctor(System.String,System.String)")]
-        public int CompareToWithoutConsideringPrimary(object obj)
-        {
-            var other = obj as WixComplexReferenceRow ?? throw new ArgumentNullException(nameof(obj));
-
-            int comparison = this.ChildType - other.ChildType;
-            if (0 == comparison)
-            {
-                comparison = String.Compare(this.ChildId, other.ChildId, StringComparison.Ordinal);
-                if (0 == comparison)
-                {
-                    comparison = this.ParentType - other.ParentType;
-                    if (0 == comparison)
-                    {
-                        string thisParentLanguage = null == this.ParentLanguage ? String.Empty : this.ParentLanguage;
-                        string otherParentLanguage = null == other.ParentLanguage ? String.Empty : other.ParentLanguage;
-                        comparison = String.Compare(thisParentLanguage, otherParentLanguage, StringComparison.Ordinal);
-                        if (0 == comparison)
-                        {
-                            comparison = String.Compare(this.ParentId, other.ParentId, StringComparison.Ordinal);
-                        }
-                    }
-                }
-            }
-
-            return comparison;
-        }
-
-        /// <summary>
-        /// Creates a shallow copy of the ComplexReference.
-        /// </summary>
-        /// <returns>A shallow copy of the ComplexReference.</returns>
-        public WixComplexReferenceRow Clone()
-        {
-            WixComplexReferenceRow wixComplexReferenceRow = new WixComplexReferenceRow(this.SourceLineNumbers, this.Table);
-            wixComplexReferenceRow.ParentType = this.ParentType;
-            wixComplexReferenceRow.ParentId = this.ParentId;
-            wixComplexReferenceRow.ParentLanguage = this.ParentLanguage;
-            wixComplexReferenceRow.ChildType = this.ChildType;
-            wixComplexReferenceRow.ChildId = this.ChildId;
-            wixComplexReferenceRow.IsPrimary = this.IsPrimary;
-
-            return wixComplexReferenceRow;
-        }
-
-        /// <summary>
-        /// Changes all of the parent references to point to the passed in parent reference.
-        /// </summary>
-        /// <param name="parent">New parent complex reference.</param>
-        public void Reparent(WixComplexReferenceRow parent)
-        {
-            this.ParentId = parent.ParentId;
-            this.ParentLanguage = parent.ParentLanguage;
-            this.ParentType = parent.ParentType;
-
-            if (!this.IsPrimary)
-            {
-                this.IsPrimary = parent.IsPrimary;
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchFileRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchFileRow.cs
deleted file mode 100644
index 000779d9..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchFileRow.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixDeltaPatchFile table.
-    /// </summary>
-    public sealed class WixDeltaPatchFileRow : Row
-    {
-        /// <summary>
-        /// Creates a WixDeltaPatchFile row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixDeltaPatchFileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixDeltaPatchFile row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this File row belongs to and should get its column definitions from.</param>
-        public WixDeltaPatchFileRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the primary key of the file row.
-        /// </summary>
-        /// <value>Primary key of the file row.</value>
-        public string File
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the delta patch retain-length list for the file.
-        /// </summary>
-        /// <value>RetainLength list for the file.</value>
-        public string RetainLengths
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the previous delta patch retain-length list for the file.
-        /// </summary>
-        /// <value>Previous RetainLength list for the file.</value>
-        public string PreviousRetainLengths
-        {
-            get { return this.Fields[1].PreviousData; }
-            set { this.Fields[1].PreviousData = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the delta patch ignore-offset list for the file.
-        /// </summary>
-        /// <value>IgnoreOffset list for the file.</value>
-        public string IgnoreOffsets
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the previous delta patch ignore-offset list for the file.
-        /// </summary>
-        /// <value>Previous IgnoreOffset list for the file.</value>
-        public string PreviousIgnoreOffsets
-        {
-            get { return this.Fields[2].PreviousData; }
-            set { this.Fields[2].PreviousData = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the delta patch ignore-length list for the file.
-        /// </summary>
-        /// <value>IgnoreLength list for the file.</value>
-        public string IgnoreLengths
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the previous delta patch ignore-length list for the file.
-        /// </summary>
-        /// <value>Previous IgnoreLength list for the file.</value>
-        public string PreviousIgnoreLengths
-        {
-            get { return this.Fields[3].PreviousData; }
-            set { this.Fields[3].PreviousData = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the delta patch retain-offset list for the file.
-        /// </summary>
-        /// <value>RetainOffset list for the file.</value>
-        public string RetainOffsets
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the previous delta patch retain-offset list for the file.
-        /// </summary>
-        /// <value>PreviousRetainOffset list for the file.</value>
-        public string PreviousRetainOffsets
-        {
-            get { return this.Fields[4].PreviousData; }
-            set { this.Fields[4].PreviousData = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the symbol paths for the file.
-        /// </summary>
-        /// <value>SymbolPath list for the file.</value>
-        /// <remarks>This is set during binding.</remarks>
-        public string Symbols
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the previous symbol paths for the file.
-        /// </summary>
-        /// <value>PreviousSymbolPath list for the file.</value>
-        /// <remarks>This is set during binding.</remarks>
-        public string PreviousSymbols
-        {
-            get { return (string)this.Fields[5].PreviousData; }
-            set { this.Fields[5].PreviousData = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs
deleted file mode 100644
index 3be5a56d..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixDeltaPatchSymbolPathsRow.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.Data.Rows
-{
-    using WixToolset.Data.Tuples;
-
-    /// <summary>
-    /// Specialization of a row for the WixDeltaPatchSymbolPaths table.
-    /// </summary>
-    public sealed class WixDeltaPatchSymbolPathsRow : Row
-    {
-        /// <summary>
-        /// Creates a WixDeltaPatchSymbolPaths row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixDeltaPatchSymbolPathsRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixDeltaPatchSymbolPaths row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixDeltaPatchSymbolPathsRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the identifier the symbol paths apply to.
-        /// </summary>
-        /// <value>RetainLength list for the file.</value>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of the identifier.
-        /// </summary>
-        public SymbolPathType Type
-        {
-            get { return (SymbolPathType)this.Fields[1].AsInteger(); }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the delta patch symbol paths.
-        /// </summary>
-        public string SymbolPaths
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixFileRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixFileRow.cs
deleted file mode 100644
index c006355a..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixFileRow.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// 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.
-
-using WixToolset.Data.Tuples;
-
-namespace WixToolset.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixFile table.
-    /// </summary>
-    public sealed class WixFileRow : Row
-    {
-        /// <summary>
-        /// Creates a WixFile row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this row belongs to and should get its column definitions from.</param>
-        public WixFileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixFile row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixFileRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the primary key of the file row.
-        /// </summary>
-        /// <value>Primary key of the file row.</value>
-        public string File
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the assembly type of the file row.
-        /// </summary>
-        /// <value>Assembly type of the file row.</value>
-        public FileAssemblyType AssemblyType
-        {
-            get { return (null == this.Fields[1]) ? FileAssemblyType.NotAnAssembly : (FileAssemblyType)this.Fields[1].AsInteger(); }
-            set { this.Fields[1].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifier for the assembly manifest.
-        /// </summary>
-        /// <value>Identifier for the assembly manifest.</value>
-        public string AssemblyManifest
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the application for the assembly.
-        /// </summary>
-        /// <value>Application for the assembly.</value>
-        public string AssemblyApplication
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the directory of the file.
-        /// </summary>
-        /// <value>Directory of the file.</value>
-        public string Directory
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the disk id for this file.
-        /// </summary>
-        /// <value>Disk id for the file.</value>
-        public int DiskId
-        {
-            get { return (int)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the source location to the file.
-        /// </summary>
-        /// <value>Source location to the file.</value>
-        public string Source
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the source location to the file.
-        /// </summary>
-        /// <value>Source location to the file.</value>
-        public string PreviousSource
-        {
-            get { return (string)this.Fields[6].PreviousData; }
-            set { this.Fields[6].PreviousData = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the architecture the file executes on.
-        /// </summary>
-        /// <value>Architecture the file executes on.</value>
-        public string ProcessorArchitecture
-        {
-            get { return (string)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the patch group of a patch-added file.
-        /// </summary>
-        /// <value>The patch group of a patch-added file.</value>
-        public int PatchGroup
-        {
-            get { return (null == this.Fields[8].Data) ? 0 : (int)this.Fields[8].Data; }
-            set { this.Fields[8].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the attributes on a file.
-        /// </summary>
-        /// <value>Attributes on a file.</value>
-        public int Attributes
-        {
-            get { return (int)this.Fields[9].Data; }
-            set { this.Fields[9].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the patching attributes to the file.
-        /// </summary>
-        /// <value>Patching attributes of the file.</value>
-        public PatchAttributeType PatchAttributes
-        {
-            get { return (PatchAttributeType)this.Fields[10].AsInteger(); }
-            set { this.Fields[10].Data = (int)value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the path to the delta patch header.
-        /// </summary>
-        /// <value>Patch header path.</value>
-        /// <remarks>Set by the binder only when doing delta patching.</remarks>
-        public string DeltaPatchHeaderSource
-        {
-            get { return (string)this.Fields[11].Data; }
-            set { this.Fields[11].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixGroupRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixGroupRow.cs
deleted file mode 100644
index d36338d1..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixGroupRow.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-
-    /// <summary>
-    /// Specialization of a row for the WixGroup table.
-    /// </summary>
-    public sealed class WixGroupRow : Row
-    {
-        /// <summary>
-        /// Creates a WixGroupRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixGroupRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the parent identifier of the complex reference.
-        /// </summary>
-        /// <value>Parent identifier of the complex reference.</value>
-        public string ParentId
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the parent type of the complex reference.
-        /// </summary>
-        /// <value>Parent type of the complex reference.</value>
-        public ComplexReferenceParentType ParentType
-        {
-            get { return (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[1].Data); }
-            set { this.Fields[1].Data = value.ToString(); }
-        }
-
-        /// <summary>
-        /// Gets the child identifier of the complex reference.
-        /// </summary>
-        /// <value>Child identifier of the complex reference.</value>
-        public string ChildId
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the child type of the complex reference.
-        /// </summary>
-        /// <value>Child type of the complex reference.</value>
-        public ComplexReferenceChildType ChildType
-        {
-            get { return (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[3].Data); }
-            set { this.Fields[3].Data = value.ToString(); }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixMediaRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixMediaRow.cs
deleted file mode 100644
index c1b3e155..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixMediaRow.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the WixMedia table.
-    /// </summary>
-    public sealed class WixMediaRow : Row
-    {
-        /// <summary>
-        /// Creates a WixMedia row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Media row belongs to and should get its column definitions from.</param>
-        public WixMediaRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixMedia row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Media row belongs to and should get its column definitions from.</param>
-        public WixMediaRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the disk id for this media.
-        /// </summary>
-        /// <value>Disk id for the media.</value>
-        public int DiskId
-        {
-            get { return (int)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the compression level for this media row.
-        /// </summary>
-        /// <value>Compression level.</value>
-        public CompressionLevel? CompressionLevel
-        {
-            get { return (CompressionLevel?)this.Fields[1].AsNullableInteger(); }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the layout location for this media row.
-        /// </summary>
-        /// <value>Layout location to the root of the media.</value>
-        public string Layout
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixMediaTemplateRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixMediaTemplateRow.cs
deleted file mode 100644
index 27c5ccce..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixMediaTemplateRow.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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.Data.Rows
-{
-    /// <summary>
-    /// Specialization of a row for the MediaTemplate table.
-    /// </summary>
-    public sealed class WixMediaTemplateRow : Row
-    {
-        /// <summary>
-        /// Creates a MediaTemplate row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this MediaTeplate row belongs to and should get its column definitions from.</param>
-        public WixMediaTemplateRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the cabinet template name for this media template row.
-        /// </summary>
-        /// <value>Cabinet name.</value>
-        public string CabinetTemplate
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the compression level for this media template row.
-        /// </summary>
-        /// <value>Compression level.</value>
-        public CompressionLevel? CompressionLevel
-        {
-            get { return (CompressionLevel?)this.Fields[1].AsNullableInteger(); }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the disk prompt for this media template row.
-        /// </summary>
-        /// <value>Disk prompt.</value>
-        public string DiskPrompt
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-
-        /// <summary>
-        /// Gets or sets the volume label for this media template row.
-        /// </summary>
-        /// <value>Volume label.</value>
-        public string VolumeLabel
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum uncompressed media size for this media template row.
-        /// </summary>
-        /// <value>Disk id.</value>
-        public int MaximumUncompressedMediaSize
-        {
-            get { return (int)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the Maximum Cabinet Size For Large File Splitting for this media template row.
-        /// </summary>
-        /// <value>Disk id.</value>
-        public int MaximumCabinetSizeForLargeFileSplitting
-        {
-            get { return (int)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixMergeRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixMergeRow.cs
deleted file mode 100644
index 54f2125c..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixMergeRow.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-    using System.Xml;
-
-    /// <summary>
-    /// Specialization of a row for tracking merge statements.
-    /// </summary>
-    public sealed class WixMergeRow : Row
-    {
-        /// <summary>
-        /// Creates a Merge row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this Merge row belongs to and should get its column definitions from.</param>
-        public WixMergeRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>Creates a Merge row that belongs to a table.</summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this Merge row belongs to and should get its column definitions from.</param>
-        public WixMergeRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets and sets the id for a merge row.
-        /// </summary>
-        /// <value>Id for the row.</value>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the language for a merge row.
-        /// </summary>
-        /// <value>Language for the row.</value>
-        public string Language
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the directory for a merge row.
-        /// </summary>
-        /// <value>Direcotory for the row.</value>
-        public string Directory
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the path to the merge module for a merge row.
-        /// </summary>
-        /// <value>Source path for the row.</value>
-        public string SourceFile
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the disk id the merge module should be placed on for a merge row.
-        /// </summary>
-        /// <value>Disk identifier for row.</value>
-        public int DiskId
-        {
-            get { return (int)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the compression value for a merge row.
-        /// </summary>
-        /// <value>Compression for a merge row.</value>
-        public YesNoType FileCompression
-        {
-            get
-            {
-                if (null == this.Fields[5].Data)
-                {
-                    return YesNoType.NotSet;
-                }
-                else if (1 == (int)this.Fields[5].Data)
-                {
-                    return YesNoType.Yes;
-                }
-                else if (0 == (int)this.Fields[5].Data)
-                {
-                    return YesNoType.No;
-                }
-                else
-                {
-                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_MergeTableFileCompressionColumnContainsInvalidValue, this.Fields[5].Data));
-                }
-            }
-            set
-            {
-                if (YesNoType.Yes == value)
-                {
-                    this.Fields[5].Data = 1;
-                }
-                else if (YesNoType.No == value)
-                {
-                    this.Fields[5].Data = 0;
-                }
-                else if (YesNoType.NotSet == value)
-                {
-                    this.Fields[5].Data = null;
-                }
-                else
-                {
-                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, WixDataStrings.EXP_CannotSetMergeTableFileCompressionColumnToInvalidValue, value));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets and sets the configuration data for a merge row.
-        /// </summary>
-        /// <value>Comma delimited string of "name=value" pairs.</value>
-        public string ConfigurationData
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets the primary feature for a merge row.
-        /// </summary>
-        /// <value>The primary feature for a merge row.</value>
-        public string Feature
-        {
-            get { return (string)this.Fields[7].Data; }
-            set { this.Fields[7].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixPayloadPropertiesRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixPayloadPropertiesRow.cs
deleted file mode 100644
index 2e5f53ad..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixPayloadPropertiesRow.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//-------------------------------------------------------------------------------------------------
-// <copyright file="WixPayloadPropertiesRow.cs" company="Outercurve Foundation">
-//   Copyright (c) 2004, Outercurve Foundation.
-//   This software is released under Microsoft Reciprocal License (MS-RL).
-//   The license and further copyright text can be found in the file
-//   LICENSE.TXT at the root directory of the distribution.
-// </copyright>
-//-------------------------------------------------------------------------------------------------
-
-namespace WixToolset.Data.Rows
-{
-    using System;
-
-    /// <summary>
-    /// Specialization of a row for the WixPayloadProperties table.
-    /// </summary>
-    public class WixPayloadPropertiesRow : Row
-    {
-        /// <summary>
-        /// Creates a WixPayloadProperties row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this WixPayloadProperties row belongs to and should get its column definitions from.</param>
-        public WixPayloadPropertiesRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixPayloadProperties row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this WixPayloadProperties row belongs to and should get its column definitions from.</param>
-        public WixPayloadPropertiesRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Package
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public string Container
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        public string Name
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        public string Size
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-
-        public string DownloadUrl
-        {
-            get { return (string)this.Fields[5].Data; }
-            set { this.Fields[5].Data = value; }
-        }
-
-        public string LayoutOnly
-        {
-            get { return (string)this.Fields[6].Data; }
-            set { this.Fields[6].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixPropertyRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixPropertyRow.cs
deleted file mode 100644
index 5285195c..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixPropertyRow.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Specialization of a row for the WixProperty table.
-    /// </summary>
-    public sealed class WixPropertyRow : Row
-    {
-        /// <summary>Creates a WixProperty row that belongs to a table.</summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this WixProperty row belongs to and should get its column definitions from.</param>
-        public WixPropertyRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets and sets the id for this property row.
-        /// </summary>
-        /// <value>Id for the property.</value>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets and sets if this is an admin property row.
-        /// </summary>
-        /// <value>Flag if this is an admin property.</value>
-        public bool Admin
-        {
-            get
-            {
-                return (0x1 == (Convert.ToInt32(this.Fields[1].Data, CultureInfo.InvariantCulture) & 0x1));
-            }
-
-            set
-            {
-                if (null == this.Fields[1].Data)
-                {
-                    this.Fields[1].Data = 0;
-                }
-
-                if (value)
-                {
-                    this.Fields[1].Data = (int)this.Fields[1].Data | 0x1;
-                }
-                else
-                {
-                    this.Fields[1].Data = (int)this.Fields[1].Data & ~0x1;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets and sets if this is a hidden property row.
-        /// </summary>
-        /// <value>Flag if this is a hidden property.</value>
-        public bool Hidden
-        {
-            get
-            {
-                return (0x2 == (Convert.ToInt32(this.Fields[1].Data, CultureInfo.InvariantCulture) & 0x2));
-            }
-
-            set
-            {
-                if (null == this.Fields[1].Data)
-                {
-                    this.Fields[1].Data = 0;
-                }
-
-                if (value)
-                {
-                    this.Fields[1].Data = (int)this.Fields[1].Data | 0x2;
-                }
-                else
-                {
-                    this.Fields[1].Data = (int)this.Fields[1].Data & ~0x2;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets and sets if this is a secure property row.
-        /// </summary>
-        /// <value>Flag if this is a secure property.</value>
-        public bool Secure
-        {
-            get
-            {
-                return (0x4 == (Convert.ToInt32(this.Fields[1].Data, CultureInfo.InvariantCulture) & 0x4));
-            }
-
-            set
-            {
-                if (null == this.Fields[1].Data)
-                {
-                    this.Fields[1].Data = 0;
-                }
-
-                if (value)
-                {
-                    this.Fields[1].Data = (int)this.Fields[1].Data | 0x4;
-                }
-                else
-                {
-                    this.Fields[1].Data = (int)this.Fields[1].Data & ~0x4;
-                }
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixRelatedBundleRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixRelatedBundleRow.cs
deleted file mode 100644
index 95fffde5..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixRelatedBundleRow.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// 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.Data.Rows
-{
-    using Serialize = WixToolset.Data.Serialize;
-
-    /// <summary>
-    /// Specialization of a row for the RelatedBundle table.
-    /// </summary>
-    public sealed class WixRelatedBundleRow : Row
-    {
-        /// <summary>
-        /// Creates a RelatedBundle row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this RelatedBundle row belongs to and should get its column definitions from.</param>
-        public WixRelatedBundleRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a RelatedBundle row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this RelatedBundle row belongs to and should get its column definitions from.</param>
-        public WixRelatedBundleRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the related bundle identifier.
-        /// </summary>
-        /// <value>The related bundle identifier.</value>
-        public string Id
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the related bundle action.
-        /// </summary>
-        /// <value>The related bundle action.</value>
-        public Serialize.RelatedBundle.ActionType Action
-        {
-            get { return (Serialize.RelatedBundle.ActionType)this.Fields[1].Data; }
-            set { this.Fields[1].Data = (int)value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixSimpleReferenceRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixSimpleReferenceRow.cs
deleted file mode 100644
index 3a2cf8f1..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixSimpleReferenceRow.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-    using System.Diagnostics;
-    using System.Xml;
-
-    /// <summary>
-    /// Specialization of a row for the WixSimpleReference table.
-    /// </summary>
-    public sealed class WixSimpleReferenceRow : Row
-    {
-        /// <summary>
-        /// Creates a WixSimpleReferenceRow that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this row belongs to and should get its column definitions from.</param>
-        public WixSimpleReferenceRow(SourceLineNumber sourceLineNumbers, Table table)
-            : base(sourceLineNumbers, table)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixSimpleReferenceRow that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDefinitions">Table definitions for this row.</param>
-        public WixSimpleReferenceRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDefinitions)
-            : base(sourceLineNumbers, tableDefinitions)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the primary keys of the simple reference.
-        /// </summary>
-        /// <value>The primary keys of the simple reference.</value>
-        public string PrimaryKeys
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        /// <summary>
-        /// Gets the symbolic name.
-        /// </summary>
-        /// <value>Symbolic name.</value>
-        public string SymbolicName
-        {
-            get { return String.Concat(this.TableName, ":", this.PrimaryKeys); }
-        }
-
-        /// <summary>
-        /// Gets or sets the table name of the simple reference.
-        /// </summary>
-        /// <value>The table name of the simple reference.</value>
-        public string TableName
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Rows/WixUpdateRegistrationRow.cs b/src/WixToolset.Data.WindowsInstaller/Rows/WixUpdateRegistrationRow.cs
deleted file mode 100644
index 8d86f970..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Rows/WixUpdateRegistrationRow.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.Data.Rows
-{
-    using System;
-
-    /// <summary>
-    /// Update registration information for Binding.
-    /// </summary>
-    public class WixUpdateRegistrationRow : Row
-    {
-        /// <summary>
-        /// Creates a WixUpdateRegistrationRow row that does not belong to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="tableDef">TableDefinition this WixUpdateRegistrationRow row belongs to and should get its column definitions from.</param>
-        public WixUpdateRegistrationRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) :
-            base(sourceLineNumbers, tableDef)
-        {
-        }
-
-        /// <summary>
-        /// Creates a WixUpdateRegistrationRow row that belongs to a table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="table">Table this WixUpdateRegistrationRow row belongs to and should get its column definitions from.</param>
-        public WixUpdateRegistrationRow(SourceLineNumber sourceLineNumbers, Table table) :
-            base(sourceLineNumbers, table)
-        {
-        }
-
-        public string Manufacturer
-        {
-            get { return (string)this.Fields[0].Data; }
-            set { this.Fields[0].Data = value; }
-        }
-
-        public string Department
-        {
-            get { return (string)this.Fields[1].Data; }
-            set { this.Fields[1].Data = value; }
-        }
-
-        public string ProductFamily
-        {
-            get { return (string)this.Fields[2].Data; }
-            set { this.Fields[2].Data = value; }
-        }
-
-        public string Name
-        {
-            get { return (string)this.Fields[3].Data; }
-            set { this.Fields[3].Data = value; }
-        }
-
-        public string Classification
-        {
-            get { return (string)this.Fields[4].Data; }
-            set { this.Fields[4].Data = value; }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/SubStorage.cs b/src/WixToolset.Data.WindowsInstaller/SubStorage.cs
deleted file mode 100644
index e136bfe9..00000000
--- a/src/WixToolset.Data.WindowsInstaller/SubStorage.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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.Data
-{
-    using System.Xml;
-
-    /// <summary>
-    /// Substorage inside an output.
-    /// </summary>
-    public sealed class SubStorage
-    {
-        /// <summary>
-        /// Instantiate a new substorage.
-        /// </summary>
-        /// <param name="name">The substorage name.</param>
-        /// <param name="data">The substorage data.</param>
-        public SubStorage(string name, Output data)
-        {
-            this.Name = name;
-            this.Data = data;
-        }
-
-        /// <summary>
-        /// Gets the substorage name.
-        /// </summary>
-        /// <value>The substorage name.</value>
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets the substorage data.
-        /// </summary>
-        /// <value>The substorage data.</value>
-        public Output Data { get; private set; }
-
-        /// <summary>
-        /// Creates a SubStorage from the XmlReader.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <returns>New SubStorage object.</returns>
-        internal static SubStorage Read(XmlReader reader)
-        {
-            if (!reader.LocalName.Equals("subStorage" == reader.LocalName))
-            {
-                throw new XmlException();
-            }
-
-            Output data = null;
-            bool empty = reader.IsEmptyElement;
-            string name = null;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "name":
-                        name = reader.Value;
-                        break;
-                }
-            }
-
-            if (!empty)
-            {
-                bool done = false;
-
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "wixOutput":
-                                    data = Output.Read(reader, true);
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            return new SubStorage(name, data);
-        }
-
-        /// <summary>
-        /// Persists a SubStorage in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the SubStorage should persist itself as XML.</param>
-        internal void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("subStorage", Output.XmlNamespaceUri);
-
-            writer.WriteAttributeString("name", this.Name);
-
-            this.Data.Write(writer);
-
-            writer.WriteEndElement();
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/Table.cs b/src/WixToolset.Data.WindowsInstaller/Table.cs
deleted file mode 100644
index 4c0df0ad..00000000
--- a/src/WixToolset.Data.WindowsInstaller/Table.cs
+++ /dev/null
@@ -1,435 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using System.Xml;
-    using WixToolset.Data.Rows;
-
-    /// <summary>
-    /// Object that represents a table in a database.
-    /// </summary>
-    public sealed class Table
-    {
-        /// <summary>
-        /// Creates a table in a section.
-        /// </summary>
-        /// <param name="section">Section to add table to.</param>
-        /// <param name="tableDefinition">Definition of the table.</param>
-        public Table(TableDefinition tableDefinition)
-        {
-            this.Definition = tableDefinition;
-            this.Rows = new List<Row>();
-        }
-
-        /// <summary>
-        /// Gets the table definition.
-        /// </summary>
-        /// <value>Definition of the table.</value>
-        public TableDefinition Definition { get; private set; }
-
-        /// <summary>
-        /// Gets the name of the table.
-        /// </summary>
-        /// <value>Name of the table.</value>
-        public string Name
-        {
-            get { return this.Definition.Name; }
-        }
-
-        /// <summary>
-        /// Gets or sets the table transform operation.
-        /// </summary>
-        /// <value>The table transform operation.</value>
-        public TableOperation Operation { get; set; }
-
-        /// <summary>
-        /// Gets the rows contained in the table.
-        /// </summary>
-        /// <value>Rows contained in the table.</value>
-        public IList<Row> Rows { get; private set; }
-
-        /// <summary>
-        /// Creates a new row in the table.
-        /// </summary>
-        /// <param name="sourceLineNumbers">Original source lines for this row.</param>
-        /// <param name="add">Specifies whether to only create the row or add it to the table automatically.</param>
-        /// <returns>Row created in table.</returns>
-        public Row CreateRow(SourceLineNumber sourceLineNumbers, bool add = true)
-        {
-            Row row;
-
-            switch (this.Name)
-            {
-                case "BBControl":
-                    row = new BBControlRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundlePackage":
-                    row = new WixBundlePackageRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleExePackage":
-                    row = new WixBundleExePackageRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleMsiPackage":
-                    row = new WixBundleMsiPackageRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleMspPackage":
-                    row = new WixBundleMspPackageRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleMsuPackage":
-                    row = new WixBundleMsuPackageRow(sourceLineNumbers, this);
-                    break;
-                case "Component":
-                    row = new ComponentRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleContainer":
-                    row = new WixBundleContainerRow(sourceLineNumbers, this);
-                    break;
-                case "Control":
-                    row = new ControlRow(sourceLineNumbers, this);
-                    break;
-                case "File":
-                    row = new FileRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleMsiFeature":
-                    row = new WixBundleMsiFeatureRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleMsiProperty":
-                    row = new WixBundleMsiPropertyRow(sourceLineNumbers, this);
-                    break;
-                case "Media":
-                    row = new MediaRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundlePayload":
-                    row = new WixBundlePayloadRow(sourceLineNumbers, this);
-                    break;
-                case "Property":
-                    row = new PropertyRow(sourceLineNumbers, this);
-                    break;
-                case "WixRelatedBundle":
-                    row = new WixRelatedBundleRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleRelatedPackage":
-                    row = new WixBundleRelatedPackageRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleRollbackBoundary":
-                    row = new WixBundleRollbackBoundaryRow(sourceLineNumbers, this);
-                    break;
-                case "Upgrade":
-                    row = new UpgradeRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleVariable":
-                    row = new WixBundleVariableRow(sourceLineNumbers, this);
-                    break;
-                case "WixAction":
-                    row = new WixActionRow(sourceLineNumbers, this);
-                    break;
-                case "WixApprovedExeForElevation":
-                    row = new WixApprovedExeForElevationRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundle":
-                    row = new WixBundleRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundlePackageExitCode":
-                    row = new WixBundlePackageExitCodeRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundlePatchTargetCode":
-                    row = new WixBundlePatchTargetCodeRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleSlipstreamMsp":
-                    row = new WixBundleSlipstreamMspRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleUpdate":
-                    row = new WixBundleUpdateRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundleCatalog":
-                    row = new WixBundleCatalogRow(sourceLineNumbers, this);
-                    break;
-                case "WixChain":
-                    row = new WixChainRow(sourceLineNumbers, this);
-                    break;
-                case "WixChainItem":
-                    row = new WixChainItemRow(sourceLineNumbers, this);
-                    break;
-                case "WixBundlePackageCommandLine":
-                    row = new WixBundlePackageCommandLineRow(sourceLineNumbers, this);
-                    break;
-                case "WixComplexReference":
-                    row = new WixComplexReferenceRow(sourceLineNumbers, this);
-                    break;
-                case "WixDeltaPatchFile":
-                    row = new WixDeltaPatchFileRow(sourceLineNumbers, this);
-                    break;
-                case "WixDeltaPatchSymbolPaths":
-                    row = new WixDeltaPatchSymbolPathsRow(sourceLineNumbers, this);
-                    break;
-                case "WixFile":
-                    row = new WixFileRow(sourceLineNumbers, this);
-                    break;
-                case "WixGroup":
-                    row = new WixGroupRow(sourceLineNumbers, this);
-                    break;
-                case "WixMedia":
-                    row = new WixMediaRow(sourceLineNumbers, this);
-                    break;
-                case "WixMediaTemplate":
-                    row = new WixMediaTemplateRow(sourceLineNumbers, this);
-                    break;
-                case "WixMerge":
-                    row = new WixMergeRow(sourceLineNumbers, this);
-                    break;
-                case "WixPayloadProperties":
-                    row = new WixPayloadPropertiesRow(sourceLineNumbers, this);
-                    break;
-                case "WixProperty":
-                    row = new WixPropertyRow(sourceLineNumbers, this);
-                    break;
-                case "WixSimpleReference":
-                    row = new WixSimpleReferenceRow(sourceLineNumbers, this);
-                    break;
-                case "WixUpdateRegistration":
-                    row = new WixUpdateRegistrationRow(sourceLineNumbers, this);
-                    break;
-
-                default:
-                    row = new Row(sourceLineNumbers, this);
-                    break;
-            }
-
-            if (add)
-            {
-                this.Rows.Add(row);
-            }
-
-            return row;
-        }
-
-        /// <summary>
-        /// Parse a table from the xml.
-        /// </summary>
-        /// <param name="reader">XmlReader where the intermediate is persisted.</param>
-        /// <param name="section">Section to populate with persisted data.</param>
-        /// <param name="tableDefinitions">TableDefinitions to use in the intermediate.</param>
-        /// <returns>The parsed table.</returns>
-        internal static Table Read(XmlReader reader, TableDefinitionCollection tableDefinitions)
-        {
-            Debug.Assert("table" == reader.LocalName);
-
-            bool empty = reader.IsEmptyElement;
-            TableOperation operation = TableOperation.None;
-            string name = null;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "name":
-                        name = reader.Value;
-                        break;
-                    case "op":
-                        switch (reader.Value)
-                        {
-                            case "add":
-                                operation = TableOperation.Add;
-                                break;
-                            case "drop":
-                                operation = TableOperation.Drop;
-                                break;
-                            default:
-                                throw new XmlException();
-                        }
-                        break;
-                }
-            }
-
-            if (null == name)
-            {
-                throw new XmlException();
-            }
-
-            TableDefinition tableDefinition = tableDefinitions[name];
-            Table table = new Table(tableDefinition);
-            table.Operation = operation;
-
-            if (!empty)
-            {
-                bool done = false;
-
-                // loop through all the rows in a table
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "row":
-                                    Row.Read(reader, table);
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            return table;
-        }
-
-        /// <summary>
-        /// Modularize the table.
-        /// </summary>
-        /// <param name="modularizationGuid">String containing the GUID of the Merge Module, if appropriate.</param>
-        /// <param name="suppressModularizationIdentifiers">Optional collection of identifiers that should not be modularized.</param>
-        public void Modularize(string modularizationGuid, ISet<string> suppressModularizationIdentifiers)
-        {
-            List<int> modularizedColumns = new List<int>();
-
-            // find the modularized columns
-            for (int i = 0; i < this.Definition.Columns.Count; i++)
-            {
-                if (ColumnModularizeType.None != this.Definition.Columns[i].ModularizeType)
-                {
-                    modularizedColumns.Add(i);
-                }
-            }
-
-            if (0 < modularizedColumns.Count)
-            {
-                foreach (Row row in this.Rows)
-                {
-                    foreach (int modularizedColumn in modularizedColumns)
-                    {
-                        Field field = row.Fields[modularizedColumn];
-
-                        if (null != field.Data)
-                        {
-                            field.Data = row.GetModularizedValue(field, modularizationGuid, suppressModularizationIdentifiers);
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Persists a row in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Row should persist itself as XML.</param>
-        [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "Changing the way this string normalizes would result " +
-                         "in a change to the way the intermediate files are generated, potentially causing extra churn in patches on an MSI built from an older version of WiX. " +
-                         "Furthermore, there is no security hole here, as the strings won't need to make a round trip")]
-        internal void Write(XmlWriter writer)
-        {
-            if (null == writer)
-            {
-                throw new ArgumentNullException("writer");
-            }
-
-            writer.WriteStartElement("table", Intermediate.XmlNamespaceUri);
-            writer.WriteAttributeString("name", this.Name);
-
-            if (TableOperation.None != this.Operation)
-            {
-                writer.WriteAttributeString("op", this.Operation.ToString().ToLowerInvariant());
-            }
-
-            foreach (Row row in this.Rows)
-            {
-                row.Write(writer);
-            }
-
-            writer.WriteEndElement();
-        }
-
-        /// <summary>
-        /// Writes the table in IDT format to the provided stream.
-        /// </summary>
-        /// <param name="writer">Stream to write the table to.</param>
-        /// <param name="keepAddedColumns">Whether to keep columns added in a transform.</param>
-        public void ToIdtDefinition(StreamWriter writer, bool keepAddedColumns)
-        {
-            if (this.Definition.Unreal)
-            {
-                return;
-            }
-
-            if (TableDefinition.MaxColumnsInRealTable < this.Definition.Columns.Count)
-            {
-                throw new WixException(WixDataErrors.TooManyColumnsInRealTable(this.Definition.Name, this.Definition.Columns.Count, TableDefinition.MaxColumnsInRealTable));
-            }
-
-            // Tack on the table header, and flush before we start writing bytes directly to the stream.
-            writer.Write(this.Definition.ToIdtDefinition(keepAddedColumns));
-            writer.Flush();
-
-            using (var binary = new BinaryWriter(writer.BaseStream, writer.Encoding, true))
-            {
-                // Create an encoding that replaces characters with question marks, and doesn't throw. We'll 
-                // use this in case of errors
-                Encoding convertEncoding = Encoding.GetEncoding(writer.Encoding.CodePage);
-
-                foreach (Row row in this.Rows)
-                {
-                    if (row.Redundant)
-                    {
-                        continue;
-                    }
-
-                    string rowString = row.ToIdtDefinition(keepAddedColumns);
-                    byte[] rowBytes;
-
-                    try
-                    {
-                        // GetBytes will throw an exception if any character doesn't match our current encoding
-                        rowBytes = writer.Encoding.GetBytes(rowString);
-                    }
-                    catch (EncoderFallbackException)
-                    {
-                        Messaging.Instance.OnMessage(WixDataErrors.InvalidStringForCodepage(row.SourceLineNumbers, Convert.ToString(writer.Encoding.WindowsCodePage, CultureInfo.InvariantCulture)));
-
-                        rowBytes = convertEncoding.GetBytes(rowString);
-                    }
-
-                    binary.Write(rowBytes, 0, rowBytes.Length);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Validates the rows of this OutputTable and throws if it collides on
-        /// primary keys.
-        /// </summary>
-        public void ValidateRows()
-        {
-            Dictionary<string, SourceLineNumber> primaryKeys = new Dictionary<string, SourceLineNumber>();
-
-            foreach (Row row in this.Rows)
-            {
-                string primaryKey = row.GetPrimaryKey();
-
-                SourceLineNumber collisionSourceLineNumber;
-                if (primaryKeys.TryGetValue(primaryKey, out collisionSourceLineNumber))
-                {
-                    throw new WixException(WixDataErrors.DuplicatePrimaryKey(collisionSourceLineNumber, primaryKey, this.Definition.Name));
-                }
-
-                primaryKeys.Add(primaryKey, row.SourceLineNumbers);
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data.WindowsInstaller/TableDefinition.cs
deleted file mode 100644
index 40aaac84..00000000
--- a/src/WixToolset.Data.WindowsInstaller/TableDefinition.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Text;
-    using System.Xml;
-
-    /// <summary>
-    /// Definition of a table in a database.
-    /// </summary>
-    public sealed class TableDefinition : IComparable<TableDefinition>
-    {
-        /// <summary>
-        /// Tracks the maximum number of columns supported in a real table.
-        /// This is a Windows Installer limitation.
-        /// </summary>
-        public const int MaxColumnsInRealTable = 32;
-
-        /// <summary>
-        /// Creates a table definition.
-        /// </summary>
-        /// <param name="name">Name of table to create.</param>
-        /// <param name="createSymbols">Flag if rows in this table create symbols.</param>
-        /// <param name="unreal">Flag if table is unreal.</param>
-        /// <param name="bootstrapperApplicationData">Flag if table is part of UX Manifest.</param>
-        public TableDefinition(string name, IList<ColumnDefinition> columns, bool createSymbols, bool unreal, bool bootstrapperApplicationData = false)
-        {
-            this.Name = name;
-            this.CreateSymbols = createSymbols;
-            this.Unreal = unreal;
-            this.BootstrapperApplicationData = bootstrapperApplicationData;
-
-            this.Columns = new ReadOnlyCollection<ColumnDefinition>(columns);
-        }
-
-        /// <summary>
-        /// Gets if rows in this table create symbols.
-        /// </summary>
-        /// <value>Flag if rows in this table create symbols.</value>
-        public bool CreateSymbols { get; private set; }
-
-        /// <summary>
-        /// Gets the name of the table.
-        /// </summary>
-        /// <value>Name of the table.</value>
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets if the table is unreal.
-        /// </summary>
-        /// <value>Flag if table is unreal.</value>
-        public bool Unreal { get; private set; }
-
-        /// <summary>
-        /// Gets if the table is a part of the bootstrapper application data manifest.
-        /// </summary>
-        /// <value>Flag if table is a part of the bootstrapper application data manifest.</value>
-        public bool BootstrapperApplicationData { get; private set; }
-
-        /// <summary>
-        /// Gets the collection of column definitions for this table.
-        /// </summary>
-        /// <value>Collection of column definitions for this table.</value>
-        public IList<ColumnDefinition> Columns { get; private set; }
-
-        /// <summary>
-        /// Gets the column definition in the table by index.
-        /// </summary>
-        /// <param name="columnIndex">Index of column to locate.</param>
-        /// <value>Column definition in the table by index.</value>
-        public ColumnDefinition this[int columnIndex]
-        {
-            get { return this.Columns[columnIndex]; }
-        }
-
-        /// <summary>
-        /// Gets the table definition in IDT format.
-        /// </summary>
-        /// <param name="keepAddedColumns">Whether to keep columns added in a transform.</param>
-        /// <returns>Table definition in IDT format.</returns>
-        public string ToIdtDefinition(bool keepAddedColumns)
-        {
-            bool first = true;
-            StringBuilder columnString = new StringBuilder();
-            StringBuilder dataString = new StringBuilder();
-            StringBuilder tableString = new StringBuilder();
-
-            tableString.Append(this.Name);
-            foreach (ColumnDefinition column in this.Columns)
-            {
-                // conditionally keep columns added in a transform; otherwise,
-                // break because columns can only be added at the end
-                if (column.Added && !keepAddedColumns)
-                {
-                    break;
-                }
-
-                if (!first)
-                {
-                    columnString.Append('\t');
-                    dataString.Append('\t');
-                }
-
-                columnString.Append(column.Name);
-                dataString.Append(column.IdtType);
-
-                if (column.PrimaryKey)
-                {
-                    tableString.AppendFormat("\t{0}", column.Name);
-                }
-
-                first = false;
-            }
-            columnString.Append("\r\n");
-            columnString.Append(dataString);
-            columnString.Append("\r\n");
-            columnString.Append(tableString);
-            columnString.Append("\r\n");
-
-            return columnString.ToString();
-        }
-
-        /// <summary>
-        /// Adds the validation rows to the _Validation table.
-        /// </summary>
-        /// <param name="validationTable">The _Validation table.</param>
-        public void AddValidationRows(Table validationTable)
-        {
-            foreach (ColumnDefinition columnDef in this.Columns)
-            {
-                Row row = validationTable.CreateRow(null);
-
-                row[0] = this.Name;
-
-                row[1] = columnDef.Name;
-
-                if (columnDef.Nullable)
-                {
-                    row[2] = "Y";
-                }
-                else
-                {
-                    row[2] = "N";
-                }
-
-                if (columnDef.IsMinValueSet)
-                {
-                    row[3] = columnDef.MinValue;
-                }
-
-                if (columnDef.IsMaxValueSet)
-                {
-                    row[4] = columnDef.MaxValue;
-                }
-
-                row[5] = columnDef.KeyTable;
-
-                if (columnDef.IsKeyColumnSet)
-                {
-                    row[6] = columnDef.KeyColumn;
-                }
-
-                if (ColumnCategory.Unknown != columnDef.Category)
-                {
-                    row[7] = columnDef.Category.ToString();
-                }
-
-                row[8] = columnDef.Possibilities;
-
-                row[9] = columnDef.Description;
-            }
-        }
-
-        /// <summary>
-        /// Compares this table definition to another table definition.
-        /// </summary>
-        /// <remarks>
-        /// Only Windows Installer traits are compared, allowing for updates to WiX-specific table definitions.
-        /// </remarks>
-        /// <param name="updated">The updated <see cref="TableDefinition"/> to compare with this target definition.</param>
-        /// <returns>0 if the tables' core properties are the same; otherwise, non-0.</returns>
-        public int CompareTo(TableDefinition updated)
-        {
-            // by definition, this object is greater than null
-            if (null == updated)
-            {
-                return 1;
-            }
-
-            // compare the table names
-            int ret = String.Compare(this.Name, updated.Name, StringComparison.Ordinal);
-
-            // compare the column count
-            if (0 == ret)
-            {
-                // transforms can only add columns
-                ret = Math.Min(0, updated.Columns.Count - this.Columns.Count);
-
-                // compare name, type, and length of each column
-                for (int i = 0; 0 == ret && this.Columns.Count > i; i++)
-                {
-                    ColumnDefinition thisColumnDef = this.Columns[i];
-                    ColumnDefinition updatedColumnDef = updated.Columns[i];
-
-                    ret = thisColumnDef.CompareTo(updatedColumnDef);
-                }
-            }
-
-            return ret;
-        }
-
-        /// <summary>
-        /// Parses table definition from xml reader.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <returns>The TableDefintion represented by the Xml.</returns>
-        internal static TableDefinition Read(XmlReader reader)
-        {
-            bool empty = reader.IsEmptyElement;
-            bool createSymbols = false;
-            string name = null;
-            bool unreal = false;
-            bool bootstrapperApplicationData = false;
-
-            while (reader.MoveToNextAttribute())
-            {
-                switch (reader.LocalName)
-                {
-                    case "createSymbols":
-                        createSymbols = reader.Value.Equals("yes");
-                        break;
-                    case "name":
-                        name = reader.Value;
-                        break;
-                    case "unreal":
-                        unreal = reader.Value.Equals("yes");
-                        break;
-                    case "bootstrapperApplicationData":
-                        bootstrapperApplicationData = reader.Value.Equals("yes");
-                        break;
-                }
-            }
-
-            if (null == name)
-            {
-                throw new XmlException();
-            }
-
-            List<ColumnDefinition> columns = new List<ColumnDefinition>();
-            bool hasPrimaryKeyColumn = false;
-
-            // parse the child elements
-            if (!empty)
-            {
-                bool done = false;
-
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "columnDefinition":
-                                    ColumnDefinition columnDefinition = ColumnDefinition.Read(reader);
-                                    columns.Add(columnDefinition);
-
-                                    if (columnDefinition.PrimaryKey)
-                                    {
-                                        hasPrimaryKeyColumn = true;
-                                    }
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!unreal && !bootstrapperApplicationData && !hasPrimaryKeyColumn)
-                {
-                    throw new WixException(WixDataErrors.RealTableMissingPrimaryKeyColumn(SourceLineNumber.CreateFromUri(reader.BaseURI), name));
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            TableDefinition tableDefinition = new TableDefinition(name, columns, createSymbols, unreal, bootstrapperApplicationData);
-            return tableDefinition;
-        }
-
-        /// <summary>
-        /// Persists an output in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the Output should persist itself as XML.</param>
-        internal void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("tableDefinition", TableDefinitionCollection.XmlNamespaceUri);
-
-            writer.WriteAttributeString("name", this.Name);
-
-            if (this.CreateSymbols)
-            {
-                writer.WriteAttributeString("createSymbols", "yes");
-            }
-
-            if (this.Unreal)
-            {
-                writer.WriteAttributeString("unreal", "yes");
-            }
-
-            if (this.BootstrapperApplicationData)
-            {
-                writer.WriteAttributeString("bootstrapperApplicationData", "yes");
-            }
-
-            foreach (ColumnDefinition columnDefinition in this.Columns)
-            {
-                columnDefinition.Write(writer);
-            }
-
-            writer.WriteEndElement();
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/TableDefinitionCollection.cs b/src/WixToolset.Data.WindowsInstaller/TableDefinitionCollection.cs
deleted file mode 100644
index 26d56387..00000000
--- a/src/WixToolset.Data.WindowsInstaller/TableDefinitionCollection.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Xml;
-
-    /// <summary>
-    /// Collection for table definitions indexed by table name.
-    /// </summary>
-    public sealed class TableDefinitionCollection : ICollection<TableDefinition>
-    {
-        public const string XmlNamespaceUri = "http://wixtoolset.org/schemas/v4/wi/tables";
-
-        private Dictionary<string, TableDefinition> collection;
-
-        /// <summary>
-        /// Instantiate a new TableDefinitionCollection class.
-        /// </summary>
-        public TableDefinitionCollection()
-        {
-            this.collection = new Dictionary<string,TableDefinition>();
-        }
-
-        /// <summary>
-        /// Creates a shallow copy of the provided table definition collection.
-        /// </summary>
-        public TableDefinitionCollection(TableDefinitionCollection tableDefinitions)
-        {
-            this.collection = new Dictionary<string, TableDefinition>(tableDefinitions.collection);
-        }
-
-        /// <summary>
-        /// Gets the number of items in the collection.
-        /// </summary>
-        /// <value>Number of items in collection.</value>
-        public int Count
-        {
-            get { return this.collection.Count; }
-        }
-
-        /// <summary>
-        /// Table definition collections are never read-only.
-        /// </summary>
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Gets a table definition by name.
-        /// </summary>
-        /// <param name="tableName">Name of table to locate.</param>
-        public TableDefinition this[string tableName]
-        {
-            get
-            {
-                TableDefinition table;
-                if (!this.collection.TryGetValue(tableName, out table))
-                {
-                    throw new WixMissingTableDefinitionException(WixDataErrors.MissingTableDefinition(tableName));
-                }
-
-                return table;
-            }
-        }
-
-        /// <summary>
-        /// Tries to get a table definition by name.
-        /// </summary>
-        /// <param name="tableName">Name of table to locate.</param>
-        /// <param name="table">Table definition if found.</param>
-        /// <returns>True if table definition was found otherwise false.</returns>
-        public bool TryGet(string tableName, out TableDefinition table)
-        {
-            return this.collection.TryGetValue(tableName, out table);
-        }
-
-        /// <summary>
-        /// Load a table definition collection from an XmlReader.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <param name="suppressSchema">Suppress xml schema validation while loading.</param>
-        /// <returns>The TableDefinitionCollection represented by the xml.</returns>
-        public static TableDefinitionCollection Load(XmlReader reader)
-        {
-            reader.MoveToContent();
-
-            return Read(reader);
-        }
-
-        /// <summary>
-        /// Adds a table definition to the collection.
-        /// </summary>
-        /// <param name="tableDefinition">Table definition to add to the collection.</param>
-        /// <value>Indexes by table definition name.</value>
-        public void Add(TableDefinition tableDefinition)
-        {
-            this.collection.Add(tableDefinition.Name, tableDefinition);
-        }
-
-        /// <summary>
-        /// Removes all table definitions from the collection.
-        /// </summary>
-        public void Clear()
-        {
-            this.collection.Clear();
-        }
-
-        /// <summary>
-        /// Checks if the collection contains a table name.
-        /// </summary>
-        /// <param name="tableName">The table to check in the collection.</param>
-        /// <returns>True if collection contains the table.</returns>
-        public bool Contains(string tableName)
-        {
-            return this.collection.ContainsKey(tableName);
-        }
-
-        /// <summary>
-        /// Checks if the collection contains a table.
-        /// </summary>
-        /// <param name="table">The table to check in the collection.</param>
-        /// <returns>True if collection contains the table.</returns>
-        public bool Contains(TableDefinition table)
-        {
-            return this.collection.ContainsKey(table.Name);
-        }
-
-        /// <summary>
-        /// Copies table definitions to an arry.
-        /// </summary>
-        /// <param name="array">Array to copy the table definitions to.</param>
-        /// <param name="index">Index in the array to start copying at.</param>
-        public void CopyTo(TableDefinition[] array, int index)
-        {
-            this.collection.Values.CopyTo(array, index);
-        }
-
-        /// <summary>
-        /// Removes a table definition from the collection.
-        /// </summary>
-        /// <param name="table">Table to remove from the collection.</param>
-        /// <returns>True if the table definition existed in the collection and was removed.</returns>
-        public bool Remove(TableDefinition table)
-        {
-            return this.collection.Remove(table.Name);
-        }
-
-        /// <summary>
-        /// Gets enumerator for the collection.
-        /// </summary>
-        /// <returns>Enumerator for the collection.</returns>
-        public IEnumerator<TableDefinition> GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Gets the untyped enumerator for the collection.
-        /// </summary>
-        /// <returns>Untyped enumerator for the collection.</returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Loads a collection of table definitions from a XmlReader in memory.
-        /// </summary>
-        /// <param name="reader">Reader to get data from.</param>
-        /// <returns>The TableDefinitionCollection represented by the xml.</returns>
-        internal static TableDefinitionCollection Read(XmlReader reader)
-        {
-            if ("tableDefinitions" != reader.LocalName)
-            {
-                throw new XmlException();
-            }
-
-            bool empty = reader.IsEmptyElement;
-            TableDefinitionCollection tableDefinitionCollection = new TableDefinitionCollection();
-
-            while (reader.MoveToNextAttribute())
-            {
-            }
-
-            // parse the child elements
-            if (!empty)
-            {
-                bool done = false;
-
-                while (!done && reader.Read())
-                {
-                    switch (reader.NodeType)
-                    {
-                        case XmlNodeType.Element:
-                            switch (reader.LocalName)
-                            {
-                                case "tableDefinition":
-                                    tableDefinitionCollection.Add(TableDefinition.Read(reader));
-                                    break;
-                                default:
-                                    throw new XmlException();
-                            }
-                            break;
-                        case XmlNodeType.EndElement:
-                            done = true;
-                            break;
-                    }
-                }
-
-                if (!done)
-                {
-                    throw new XmlException();
-                }
-            }
-
-            return tableDefinitionCollection;
-        }
-
-        /// <summary>
-        /// Persists a TableDefinitionCollection in an XML format.
-        /// </summary>
-        /// <param name="writer">XmlWriter where the TableDefinitionCollection should persist itself as XML.</param>
-        internal void Write(XmlWriter writer)
-        {
-            writer.WriteStartElement("tableDefinitions", XmlNamespaceUri);
-
-            foreach (TableDefinition tableDefinition in this.collection.Values.OrderBy(t => t.Name))
-            {
-                tableDefinition.Write(writer);
-            }
-
-            writer.WriteEndElement();
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/TableIndexedCollection.cs b/src/WixToolset.Data.WindowsInstaller/TableIndexedCollection.cs
deleted file mode 100644
index 9f85efff..00000000
--- a/src/WixToolset.Data.WindowsInstaller/TableIndexedCollection.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Collection for tables.
-    /// </summary>
-    public sealed class TableIndexedCollection : ICollection<Table>
-    {
-        private Dictionary<string, Table> collection;
-
-        /// <summary>
-        /// Instantiate a new empty collection.
-        /// </summary>
-        public TableIndexedCollection()
-        {
-            this.collection = new Dictionary<string,Table>();
-        }
-
-        /// <summary>
-        /// Instantiate a new collection populated with a set of tables.
-        /// </summary>
-        /// <param name="tables">Set of tables.</param>
-        public TableIndexedCollection(IEnumerable<Table> tables)
-        {
-            this.collection = tables.ToDictionary(t => t.Name);
-        }
-
-        /// <summary>
-        /// Gets the number of items in the collection.
-        /// </summary>
-        /// <value>Number of items in collection.</value>
-        public int Count
-        {
-            get { return this.collection.Count; }
-        }
-
-        /// <summary>
-        /// Table indexed collection is never read only.
-        /// </summary>
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// Adds a table to the collection.
-        /// </summary>
-        /// <param name="table">Table to add to the collection.</param>
-        /// <remarks>Indexes the table by name.</remarks>
-        public void Add(Table table)
-        {
-            this.collection.Add(table.Name, table);
-        }
-
-        /// <summary>
-        /// Clear the tables from the collection.
-        /// </summary>
-        public void Clear()
-        {
-            this.collection.Clear();
-        }
-
-        /// <summary>
-        /// Determines if a table is in the collection.
-        /// </summary>
-        /// <param name="table">Table to check if it is in the collection.</param>
-        /// <returns>True if the table name is in the collection, otherwise false.</returns>
-        public bool Contains(Table table)
-        {
-            return this.collection.ContainsKey(table.Name);
-        }
-
-        /// <summary>
-        /// Copies the collection into an array.
-        /// </summary>
-        /// <param name="array">Array to copy the collection into.</param>
-        /// <param name="arrayIndex">Index to start copying from.</param>
-        public void CopyTo(Table[] array, int arrayIndex)
-        {
-            this.collection.Values.CopyTo(array, arrayIndex);
-        }
-
-        /// <summary>
-        /// Remove a table from the collection by name.
-        /// </summary>
-        /// <param name="tableName">Table name to remove from the collection.</param>
-        public void Remove(string tableName)
-        {
-            this.collection.Remove(tableName);
-        }
-
-        /// <summary>
-        /// Remove a table from the collection.
-        /// </summary>
-        /// <param name="table">Table with matching name to remove from the collection.</param>
-        public bool Remove(Table table)
-        {
-            return this.collection.Remove(table.Name);
-        }
-
-        /// <summary>
-        /// Gets an enumerator over the whole collection.
-        /// </summary>
-        /// <returns>Collection enumerator.</returns>
-        public IEnumerator<Table> GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Gets an untyped enumerator over the whole collection.
-        /// </summary>
-        /// <returns>Untyped collection enumerator.</returns>
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return this.collection.Values.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Gets a table by name.
-        /// </summary>
-        /// <param name="tableName">Name of table to locate.</param>
-        public Table this[string tableName]
-        {
-            get
-            {
-                Table table;
-                return this.collection.TryGetValue(tableName, out table) ? table : null;
-            }
-
-            set
-            {
-                this.collection[tableName] = value;
-            }
-        }
-
-        /// <summary>
-        /// Tries to find a table by name.
-        /// </summary>
-        /// <param name="tableName">Table name to locate.</param>
-        /// <param name="table">Found table.</param>
-        /// <returns>True if table with table name was found, otherwise false.</returns>
-        public bool TryGetTable(string tableName, out Table table)
-        {
-            return this.collection.TryGetValue(tableName, out table);
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/TableOperation.cs b/src/WixToolset.Data.WindowsInstaller/TableOperation.cs
deleted file mode 100644
index 8df44e73..00000000
--- a/src/WixToolset.Data.WindowsInstaller/TableOperation.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.Data
-{
-    /// <summary>
-    /// The table transform operations.
-    /// </summary>
-    public enum TableOperation
-    {
-        /// <summary>
-        /// No operation.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Added table.
-        /// </summary>
-        Add,
-
-        /// <summary>
-        /// Dropped table.
-        /// </summary>
-        Drop,
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/WixMissingTableDefinitionException.cs b/src/WixToolset.Data.WindowsInstaller/WixMissingTableDefinitionException.cs
deleted file mode 100644
index 6295813b..00000000
--- a/src/WixToolset.Data.WindowsInstaller/WixMissingTableDefinitionException.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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.Data
-{
-    using System;
-
-    /// <summary>
-    /// Exception thrown when a table definition is missing.
-    /// </summary>
-    [Serializable]
-    public class WixMissingTableDefinitionException : WixException
-    {
-        /// <summary>
-        /// Instantiate new WixMissingTableDefinitionException.
-        /// </summary>
-        /// <param name="error">Localized error information.</param>
-        public WixMissingTableDefinitionException(MessageEventArgs error)
-            : base(error)
-        {
-        }
-    }
-}
diff --git a/src/WixToolset.Data.WindowsInstaller/WixToolset.Data.WindowsInstaller.csproj b/src/WixToolset.Data.WindowsInstaller/WixToolset.Data.WindowsInstaller.csproj
deleted file mode 100644
index bd8140c3..00000000
--- a/src/WixToolset.Data.WindowsInstaller/WixToolset.Data.WindowsInstaller.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Description>Data for Windows Installer</Description>
-    <Title>WiX Toolset Data Windows Installer</Title>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Data\actions.xml" />
-    <EmbeddedResource Include="Data\tables.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
-    <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
-
-    <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
-    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
-  </ItemGroup>
-</Project>
diff --git a/src/test/TestData/Example.Extension/ExampleExtensionData.cs b/src/test/TestData/Example.Extension/ExampleExtensionData.cs
index 6b179ea6..724f9eea 100644
--- a/src/test/TestData/Example.Extension/ExampleExtensionData.cs
+++ b/src/test/TestData/Example.Extension/ExampleExtensionData.cs
@@ -19,7 +19,7 @@ namespace Example.Extension
             switch (name)
             {
                 case "Example":
-                    tupleDefinition = TupleDefinitions.Example;
+                    tupleDefinition = ExampleTupleDefinitions.Example;
                     break;
 
                 default:
diff --git a/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs b/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
index b91d06e9..a081b758 100644
--- a/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
+++ b/src/test/TestData/Example.Extension/ExampleExtensionFactory.cs
@@ -28,6 +28,10 @@ namespace Example.Extension
             {
                 extension = new ExampleExtensionData();
             }
+            else if (extensionType == typeof(IWindowsInstallerBackendExtension))
+            {
+                extension = new ExampleWindowsInstallerBackendExtension();
+            }
             else
             {
                 extension = null;
diff --git a/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs b/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
new file mode 100644
index 00000000..870b02e1
--- /dev/null
+++ b/src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
@@ -0,0 +1,21 @@
+// 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 Example.Extension
+{
+    using System.Collections.Generic;
+    using WixToolset.Data.WindowsInstaller;
+
+    public static class ExampleTableDefinitions
+    {
+        public static readonly TableDefinition ExampleTable = new TableDefinition(
+            "Example",
+            new List<ColumnDefinition>
+            {
+                new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
+                new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
+            }
+            );
+
+        public static readonly TableDefinition[] All = new[] { ExampleTable };
+    }
+}
diff --git a/src/test/TestData/Example.Extension/ExampleTuple.cs b/src/test/TestData/Example.Extension/ExampleTuple.cs
index f280a5c8..0fc0d82c 100644
--- a/src/test/TestData/Example.Extension/ExampleTuple.cs
+++ b/src/test/TestData/Example.Extension/ExampleTuple.cs
@@ -12,11 +12,11 @@ namespace Example.Extension
 
     public class ExampleTuple : IntermediateTuple
     {
-        public ExampleTuple() : base(TupleDefinitions.Example, null, null)
+        public ExampleTuple() : base(ExampleTupleDefinitions.Example, null, null)
         {
         }
 
-        public ExampleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Example, sourceLineNumber, id)
+        public ExampleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.Example, sourceLineNumber, id)
         {
         }
 
diff --git a/src/test/TestData/Example.Extension/TupleDefinitions.cs b/src/test/TestData/Example.Extension/ExampleTupleDefinitions.cs
index 2c320fbc..4775b827 100644
--- a/src/test/TestData/Example.Extension/TupleDefinitions.cs
+++ b/src/test/TestData/Example.Extension/ExampleTupleDefinitions.cs
@@ -4,10 +4,12 @@ namespace Example.Extension
 {
     using WixToolset.Data;
 
-    public static class TupleDefinitions
+    public static class ExampleTupleDefinitions
     {
+        public const string ExampleName = "Example";
+
         public static readonly IntermediateTupleDefinition Example = new IntermediateTupleDefinition(
-            "Example",
+            ExampleName,
             new[]
             {
                 new IntermediateFieldDefinition(nameof(ExampleTupleFields.Example), IntermediateFieldType.String),
diff --git a/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
new file mode 100644
index 00000000..f00a5102
--- /dev/null
+++ b/src/test/TestData/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
@@ -0,0 +1,32 @@
+// 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 Example.Extension
+{
+    using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility;
+
+    internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendExtension
+    {
+        public override bool TryAddTupleToOutput(IntermediateTuple tuple, Output output)
+        {
+#if ALTERNATIVE_TO_USING_HELPER
+            switch (tuple.Definition.Name)
+            {
+                case TupleDefinitions.ExampleName:
+                    {
+                        var table = output.EnsureTable(ExampleTableDefinitions.ExampleTable);
+                        var row = table.CreateRow(tuple.SourceLineNumbers);
+                        row[0] = tuple[0].AsString();
+                        row[1] = tuple[1].AsString();
+                    }
+                    return true;
+            }
+
+            return false;
+#else
+            return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, ExampleTableDefinitions.All);
+#endif
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
index d99f53ec..8c603588 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
@@ -7,6 +7,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolsetTest.CoreIntegration.Utility;
     using Xunit;