diff --git a/SabreTools.Serialization/Internal.Listxml.cs b/SabreTools.Serialization/Internal.Listxml.cs
deleted file mode 100644
index 9dd7f618..00000000
--- a/SabreTools.Serialization/Internal.Listxml.cs
+++ /dev/null
@@ -1,1568 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using SabreTools.Models.Internal;
-
-namespace SabreTools.Serialization
-{
-    /// <summary>
-    /// Serializer for Listxml models to internal structure
-    /// </summary>
-    public partial class Internal
-    {
-        #region Serialize
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.M1"/> to <cref="MetadataFile"/>
-        /// </summary>
-        public static MetadataFile ConvertToInternalModel(Models.Listxml.M1 item)
-        {
-            var metadataFile = new MetadataFile
-            {
-                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
-            };
-
-            if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
-
-            return metadataFile;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Mame"/> to <cref="MetadataFile"/>
-        /// </summary>
-        public static MetadataFile ConvertToInternalModel(Models.Listxml.Mame item)
-        {
-            var metadataFile = new MetadataFile
-            {
-                [MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
-            };
-
-            if (item?.Game != null && item.Game.Any())
-                metadataFile[MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
-
-            return metadataFile;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.M1"/> to <cref="Header"/>
-        /// </summary>
-        private static Header ConvertHeaderToInternalModel(Models.Listxml.M1 item)
-        {
-            var header = new Header
-            {
-                [Header.VersionKey] = item.Version,
-            };
-            return header;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Mame"/> to <cref="Header"/>
-        /// </summary>
-        private static Header ConvertHeaderToInternalModel(Models.Listxml.Mame item)
-        {
-            var header = new Header
-            {
-                [Header.BuildKey] = item.Build,
-                [Header.DebugKey] = item.Debug,
-                [Header.MameConfigKey] = item.MameConfig,
-            };
-            return header;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.GameBase"/> to <cref="Machine"/>
-        /// </summary>
-        private static Machine ConvertMachineToInternalModel(Models.Listxml.GameBase item)
-        {
-            var machine = new Machine
-            {
-                [Machine.NameKey] = item.Name,
-                [Machine.SourceFileKey] = item.SourceFile,
-                [Machine.IsBiosKey] = item.IsBios,
-                [Machine.IsDeviceKey] = item.IsDevice,
-                [Machine.IsMechanicalKey] = item.IsMechanical,
-                [Machine.RunnableKey] = item.Runnable,
-                [Machine.CloneOfKey] = item.CloneOf,
-                [Machine.RomOfKey] = item.RomOf,
-                [Machine.SampleOfKey] = item.SampleOf,
-                [Machine.DescriptionKey] = item.Description,
-                [Machine.YearKey] = item.Year,
-                [Machine.ManufacturerKey] = item.Manufacturer,
-                [Machine.HistoryKey] = item.History,
-            };
-
-            if (item.BiosSet != null && item.BiosSet.Any())
-            {
-                var biosSets = new List<BiosSet>();
-                foreach (var biosSet in item.BiosSet)
-                {
-                    biosSets.Add(ConvertToInternalModel(biosSet));
-                }
-                machine[Machine.BiosSetKey] = biosSets.ToArray();
-            }
-
-            if (item.Rom != null && item.Rom.Any())
-            {
-                var roms = new List<Rom>();
-                foreach (var rom in item.Rom)
-                {
-                    roms.Add(ConvertToInternalModel(rom));
-                }
-                machine[Machine.RomKey] = roms.ToArray();
-            }
-
-            if (item.Disk != null && item.Disk.Any())
-            {
-                var disks = new List<Disk>();
-                foreach (var disk in item.Disk)
-                {
-                    disks.Add(ConvertToInternalModel(disk));
-                }
-                machine[Machine.DiskKey] = disks.ToArray();
-            }
-
-            if (item.DeviceRef != null && item.DeviceRef.Any())
-            {
-                var deviceRefs = new List<DeviceRef>();
-                foreach (var deviceRef in item.DeviceRef)
-                {
-                    deviceRefs.Add(ConvertToInternalModel(deviceRef));
-                }
-                machine[Machine.DeviceRefKey] = deviceRefs.ToArray();
-            }
-
-            if (item.Sample != null && item.Sample.Any())
-            {
-                var samples = new List<Sample>();
-                foreach (var sample in item.Sample)
-                {
-                    samples.Add(ConvertToInternalModel(sample));
-                }
-                machine[Machine.SampleKey] = samples.ToArray();
-            }
-
-            if (item.Chip != null && item.Chip.Any())
-            {
-                var chips = new List<Chip>();
-                foreach (var chip in item.Chip)
-                {
-                    chips.Add(ConvertToInternalModel(chip));
-                }
-                machine[Machine.ChipKey] = chips.ToArray();
-            }
-
-            if (item.Display != null && item.Display.Any())
-            {
-                var displays = new List<Display>();
-                foreach (var display in item.Display)
-                {
-                    displays.Add(ConvertToInternalModel(display));
-                }
-                machine[Machine.DisplayKey] = displays.ToArray();
-            }
-
-            if (item.Video != null && item.Video.Any())
-            {
-                var videos = new List<Video>();
-                foreach (var video in item.Video)
-                {
-                    videos.Add(ConvertToInternalModel(video));
-                }
-                machine[Machine.VideoKey] = videos.ToArray();
-            }
-
-            if (item.Sound != null)
-                machine[Machine.SoundKey] = ConvertToInternalModel(item.Sound);
-
-            if (item.Input != null)
-                machine[Machine.InputKey] = ConvertToInternalModel(item.Input);
-
-            if (item.DipSwitch != null && item.DipSwitch.Any())
-            {
-                var dipSwitches = new List<DipSwitch>();
-                foreach (var dipSwitch in item.DipSwitch)
-                {
-                    dipSwitches.Add(ConvertToInternalModel(dipSwitch));
-                }
-                machine[Machine.DipSwitchKey] = dipSwitches.ToArray();
-            }
-
-            if (item.Configuration != null && item.Configuration.Any())
-            {
-                var configurations = new List<Configuration>();
-                foreach (var configuration in item.Configuration)
-                {
-                    configurations.Add(ConvertToInternalModel(configuration));
-                }
-                machine[Machine.ConfigurationKey] = configurations.ToArray();
-            }
-
-            if (item.Port != null && item.Port.Any())
-            {
-                var ports = new List<Port>();
-                foreach (var port in item.Port)
-                {
-                    ports.Add(ConvertToInternalModel(port));
-                }
-                machine[Machine.PortKey] = ports.ToArray();
-            }
-
-            if (item.Adjuster != null && item.Adjuster.Any())
-            {
-                var adjusters = new List<Adjuster>();
-                foreach (var adjuster in item.Adjuster)
-                {
-                    adjusters.Add(ConvertToInternalModel(adjuster));
-                }
-                machine[Machine.AdjusterKey] = adjusters.ToArray();
-            }
-
-            if (item.Driver != null)
-                machine[Machine.DriverKey] = ConvertToInternalModel(item.Driver);
-
-            if (item.Feature != null && item.Feature.Any())
-            {
-                var features = new List<Feature>();
-                foreach (var feature in item.Feature)
-                {
-                    features.Add(ConvertToInternalModel(feature));
-                }
-                machine[Machine.FeatureKey] = features.ToArray();
-            }
-
-            if (item.Device != null && item.Device.Any())
-            {
-                var devices = new List<Device>();
-                foreach (var device in item.Device)
-                {
-                    devices.Add(ConvertToInternalModel(device));
-                }
-                machine[Machine.DeviceKey] = devices.ToArray();
-            }
-
-            if (item.Slot != null && item.Slot.Any())
-            {
-                var slots = new List<Slot>();
-                foreach (var slot in item.Slot)
-                {
-                    slots.Add(ConvertToInternalModel(slot));
-                }
-                machine[Machine.SlotKey] = slots.ToArray();
-            }
-
-            if (item.SoftwareList != null && item.SoftwareList.Any())
-            {
-                var softwareLists = new List<SoftwareList>();
-                foreach (var softwareList in item.SoftwareList)
-                {
-                    softwareLists.Add(ConvertToInternalModel(softwareList));
-                }
-                machine[Machine.SoftwareListKey] = softwareLists.ToArray();
-            }
-
-            if (item.RamOption != null && item.RamOption.Any())
-            {
-                var ramOptions = new List<RamOption>();
-                foreach (var ramOption in item.RamOption)
-                {
-                    ramOptions.Add(ConvertToInternalModel(ramOption));
-                }
-                machine[Machine.RamOptionKey] = ramOptions.ToArray();
-            }
-
-            return machine;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Adjuster"/> to <cref="Adjuster"/>
-        /// </summary>
-        private static Adjuster ConvertToInternalModel(Models.Listxml.Adjuster item)
-        {
-            var adjuster = new Adjuster
-            {
-                [Adjuster.NameKey] = item.Name,
-                [Adjuster.DefaultKey] = item.Default,
-            };
-
-            if (item.Condition != null)
-                adjuster[Adjuster.ConditionKey] = ConvertToInternalModel(item.Condition);
-
-            return adjuster;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Analog"/> to <cref="Analog"/>
-        /// </summary>
-        private static Analog ConvertToInternalModel(Models.Listxml.Analog item)
-        {
-            var analog = new Analog
-            {
-                [Analog.MaskKey] = item.Mask,
-            };
-            return analog;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.BiosSet"/> to <cref="BiosSet"/>
-        /// </summary>
-        private static BiosSet ConvertToInternalModel(Models.Listxml.BiosSet item)
-        {
-            var biosset = new BiosSet
-            {
-                [BiosSet.NameKey] = item.Name,
-                [BiosSet.DescriptionKey] = item.Description,
-                [BiosSet.DefaultKey] = item.Default,
-            };
-            return biosset;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Chip"/> to <cref="Chip"/>
-        /// </summary>
-        private static Chip ConvertToInternalModel(Models.Listxml.Chip item)
-        {
-            var chip = new Chip
-            {
-                [Chip.NameKey] = item.Name,
-                [Chip.TagKey] = item.Tag,
-                [Chip.TypeKey] = item.Type,
-                [Chip.SoundOnlyKey] = item.SoundOnly,
-                [Chip.ClockKey] = item.Clock,
-            };
-            return chip;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Condition"/> to <cref="Condition"/>
-        /// </summary>
-        private static Condition ConvertToInternalModel(Models.Listxml.Condition item)
-        {
-            var condition = new Condition
-            {
-                [Condition.TagKey] = item.Tag,
-                [Condition.MaskKey] = item.Mask,
-                [Condition.RelationKey] = item.Relation,
-                [Condition.ValueKey] = item.Value,
-            };
-            return condition;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Configuration"/> to <cref="Configuration"/>
-        /// </summary>
-        private static Configuration ConvertToInternalModel(Models.Listxml.Configuration item)
-        {
-            var configuration = new Configuration
-            {
-                [Configuration.NameKey] = item.Name,
-                [Configuration.TagKey] = item.Tag,
-                [Configuration.MaskKey] = item.Mask,
-            };
-
-            if (item.Condition != null)
-                configuration[Configuration.ConditionKey] = ConvertToInternalModel(item.Condition);
-
-            if (item.ConfLocation != null && item.ConfLocation.Any())
-            {
-                var confLocations = new List<ConfLocation>();
-                foreach (var confLocation in item.ConfLocation)
-                {
-                    confLocations.Add(ConvertToInternalModel(confLocation));
-                }
-                configuration[Configuration.ConfLocationKey] = confLocations.ToArray();
-            }
-
-            if (item.ConfSetting != null && item.ConfSetting.Any())
-            {
-                var confSettings = new List<ConfSetting>();
-                foreach (var confSetting in item.ConfSetting)
-                {
-                    confSettings.Add(ConvertToInternalModel(confSetting));
-                }
-                configuration[Configuration.ConfSettingKey] = confSettings.ToArray();
-            }
-
-            return configuration;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.ConfLocation"/> to <cref="ConfLocation"/>
-        /// </summary>
-        private static ConfLocation ConvertToInternalModel(Models.Listxml.ConfLocation item)
-        {
-            var confLocation = new ConfLocation
-            {
-                [ConfLocation.NameKey] = item.Name,
-                [ConfLocation.NumberKey] = item.Number,
-                [ConfLocation.InvertedKey] = item.Inverted,
-            };
-            return confLocation;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.ConfSetting"/> to <cref="ConfSetting"/>
-        /// </summary>
-        private static ConfSetting ConvertToInternalModel(Models.Listxml.ConfSetting item)
-        {
-            var confSetting = new ConfSetting
-            {
-                [ConfSetting.NameKey] = item.Name,
-                [ConfSetting.ValueKey] = item.Value,
-                [ConfSetting.DefaultKey] = item.Default,
-            };
-
-            if (item.Condition != null)
-                confSetting[ConfSetting.ConditionKey] = ConvertToInternalModel(item.Condition);
-
-            return confSetting;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Control"/> to <cref="Control"/>
-        /// </summary>
-        private static Control ConvertToInternalModel(Models.Listxml.Control item)
-        {
-            var control = new Control
-            {
-                [Control.TypeKey] = item.Type,
-                [Control.PlayerKey] = item.Player,
-                [Control.ButtonsKey] = item.Buttons,
-                [Control.ReqButtonsKey] = item.ReqButtons,
-                [Control.MinimumKey] = item.Minimum,
-                [Control.MaximumKey] = item.Maximum,
-                [Control.SensitivityKey] = item.Sensitivity,
-                [Control.KeyDeltaKey] = item.KeyDelta,
-                [Control.ReverseKey] = item.Reverse,
-                [Control.WaysKey] = item.Ways,
-                [Control.Ways2Key] = item.Ways2,
-                [Control.Ways3Key] = item.Ways3,
-            };
-            return control;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Device"/> to <cref="Device"/>
-        /// </summary>
-        private static Device ConvertToInternalModel(Models.Listxml.Device item)
-        {
-            var device = new Device
-            {
-                [Device.TypeKey] = item.Type,
-                [Device.TagKey] = item.Tag,
-                [Device.FixedImageKey] = item.FixedImage,
-                [Device.MandatoryKey] = item.Mandatory,
-                [Device.InterfaceKey] = item.Interface,
-            };
-
-            if (item.Instance != null)
-                device[Device.InstanceKey] = ConvertToInternalModel(item.Instance);
-
-            if (item.Extension != null && item.Extension.Any())
-            {
-                var extensions = new List<Extension>();
-                foreach (var extension in item.Extension)
-                {
-                    extensions.Add(ConvertToInternalModel(extension));
-                }
-                device[Device.ExtensionKey] = extensions.ToArray();
-            }
-
-            return device;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.DeviceRef"/> to <cref="DeviceRef"/>
-        /// </summary>
-        private static DeviceRef ConvertToInternalModel(Models.Listxml.DeviceRef item)
-        {
-            var deviceRef = new DeviceRef
-            {
-                [DeviceRef.NameKey] = item.Name,
-            };
-            return deviceRef;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.DipLocation"/> to <cref="DipLocation"/>
-        /// </summary>
-        private static DipLocation ConvertToInternalModel(Models.Listxml.DipLocation item)
-        {
-            var dipLocation = new DipLocation
-            {
-                [DipLocation.NameKey] = item.Name,
-                [DipLocation.NumberKey] = item.Number,
-                [DipLocation.InvertedKey] = item.Inverted,
-            };
-            return dipLocation;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.DipSwitch"/> to <cref="DipSwitch"/>
-        /// </summary>
-        private static DipSwitch ConvertToInternalModel(Models.Listxml.DipSwitch item)
-        {
-            var dipSwitch = new DipSwitch
-            {
-                [DipSwitch.NameKey] = item.Name,
-                [DipSwitch.TagKey] = item.Tag,
-                [DipSwitch.MaskKey] = item.Mask,
-            };
-
-            if (item.Condition != null)
-                dipSwitch[DipSwitch.ConditionKey] = ConvertToInternalModel(item.Condition);
-
-            if (item.DipLocation != null && item.DipLocation.Any())
-            {
-                var dipLocations = new List<DipLocation>();
-                foreach (var dipLocation in item.DipLocation)
-                {
-                    dipLocations.Add(ConvertToInternalModel(dipLocation));
-                }
-                dipSwitch[DipSwitch.DipLocationKey] = dipLocations.ToArray();
-            }
-
-            if (item.DipValue != null && item.DipValue.Any())
-            {
-                var dipValues = new List<DipValue>();
-                foreach (var dipValue in item.DipValue)
-                {
-                    dipValues.Add(ConvertToInternalModel(dipValue));
-                }
-                dipSwitch[DipSwitch.DipValueKey] = dipValues.ToArray();
-            }
-
-            return dipSwitch;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.DipValue"/> to <cref="DipValue"/>
-        /// </summary>
-        private static DipValue ConvertToInternalModel(Models.Listxml.DipValue item)
-        {
-            var dipValue = new DipValue
-            {
-                [DipValue.NameKey] = item.Name,
-                [DipValue.ValueKey] = item.Value,
-                [DipValue.DefaultKey] = item.Default,
-            };
-
-            if (item.Condition != null)
-                dipValue[DipValue.ConditionKey] = ConvertToInternalModel(item.Condition);
-
-            return dipValue;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Disk"/> to <cref="Disk"/>
-        /// </summary>
-        private static Disk ConvertToInternalModel(Models.Listxml.Disk item)
-        {
-            var disk = new Disk
-            {
-                [Disk.NameKey] = item.Name,
-                [Disk.MD5Key] = item.MD5,
-                [Disk.SHA1Key] = item.SHA1,
-                [Disk.MergeKey] = item.Merge,
-                [Disk.RegionKey] = item.Region,
-                [Disk.IndexKey] = item.Index,
-                [Disk.WritableKey] = item.Writable,
-                [Disk.StatusKey] = item.Status,
-                [Disk.OptionalKey] = item.Optional,
-            };
-            return disk;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Display"/> to <cref="Display"/>
-        /// </summary>
-        private static Display ConvertToInternalModel(Models.Listxml.Display item)
-        {
-            var display = new Display
-            {
-                [Display.TagKey] = item.Tag,
-                [Display.TypeKey] = item.Type,
-                [Display.RotateKey] = item.Rotate,
-                [Display.FlipXKey] = item.FlipX,
-                [Display.WidthKey] = item.Width,
-                [Display.HeightKey] = item.Height,
-                [Display.RefreshKey] = item.Refresh,
-                [Display.PixClockKey] = item.PixClock,
-                [Display.HTotalKey] = item.HTotal,
-                [Display.HBEndKey] = item.HBEnd,
-                [Display.HBStartKey] = item.HBStart,
-                [Display.VTotalKey] = item.VTotal,
-                [Display.VBEndKey] = item.VBEnd,
-                [Display.VBStartKey] = item.VBStart,
-            };
-            return display;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Driver"/> to <cref="Driver"/>
-        /// </summary>
-        private static Driver ConvertToInternalModel(Models.Listxml.Driver item)
-        {
-            var driver = new Driver
-            {
-                [Driver.StatusKey] = item.Status,
-                [Driver.ColorKey] = item.Color,
-                [Driver.SoundKey] = item.Sound,
-                [Driver.PaletteSizeKey] = item.PaletteSize,
-                [Driver.EmulationKey] = item.Emulation,
-                [Driver.CocktailKey] = item.Cocktail,
-                [Driver.SaveStateKey] = item.SaveState,
-                [Driver.RequiresArtworkKey] = item.RequiresArtwork,
-                [Driver.UnofficialKey] = item.Unofficial,
-                [Driver.NoSoundHardwareKey] = item.NoSoundHardware,
-                [Driver.IncompleteKey] = item.Incomplete,
-            };
-            return driver;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Extension"/> to <cref="Extension"/>
-        /// </summary>
-        private static Extension ConvertToInternalModel(Models.Listxml.Extension item)
-        {
-            var extension = new Extension
-            {
-                [Extension.NameKey] = item.Name,
-            };
-            return extension;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Feature"/> to <cref="Feature"/>
-        /// </summary>
-        private static Feature ConvertToInternalModel(Models.Listxml.Feature item)
-        {
-            var feature = new Feature
-            {
-                [Feature.TypeKey] = item.Type,
-                [Feature.StatusKey] = item.Status,
-                [Feature.OverallKey] = item.Overall,
-            };
-            return feature;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Input"/> to <cref="Input"/>
-        /// </summary>
-        private static Input ConvertToInternalModel(Models.Listxml.Input item)
-        {
-            var input = new Input
-            {
-                [Input.ServiceKey] = item.Service,
-                [Input.TiltKey] = item.Tilt,
-                [Input.PlayersKey] = item.Players,
-                [Input.ControlKey] = item.ControlAttr,
-                [Input.ButtonsKey] = item.Buttons,
-                [Input.CoinsKey] = item.Coins,
-            };
-
-            if (item.Control != null && item.Control.Any())
-            {
-                var controls = new List<Control>();
-                foreach (var control in item.Control)
-                {
-                    controls.Add(ConvertToInternalModel(control));
-                }
-                input[Input.ControlKey] = controls.ToArray();
-            }
-
-            return input;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Instance"/> to <cref="Instance"/>
-        /// </summary>
-        private static Instance ConvertToInternalModel(Models.Listxml.Instance item)
-        {
-            var instance = new Instance
-            {
-                [Instance.NameKey] = item.Name,
-                [Instance.BriefNameKey] = item.BriefName,
-            };
-            return instance;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Port"/> to <cref="Port"/>
-        /// </summary>
-        private static Port ConvertToInternalModel(Models.Listxml.Port item)
-        {
-            var port = new Port
-            {
-                [Port.TagKey] = item.Tag,
-            };
-
-            if (item.Analog != null && item.Analog.Any())
-            {
-                var analogs = new List<Analog>();
-                foreach (var analog in item.Analog)
-                {
-                    analogs.Add(ConvertToInternalModel(analog));
-                }
-                port[Port.AnalogKey] = analogs.ToArray();
-            }
-
-            return port;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.RamOption"/> to <cref="RamOption"/>
-        /// </summary>
-        private static RamOption ConvertToInternalModel(Models.Listxml.RamOption item)
-        {
-            var ramOption = new RamOption
-            {
-                [RamOption.NameKey] = item.Name,
-                [RamOption.DefaultKey] = item.Default,
-            };
-            return ramOption;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Rom"/> to <cref="Rom"/>
-        /// </summary>
-        private static Rom ConvertToInternalModel(Models.Listxml.Rom item)
-        {
-            var rom = new Rom
-            {
-                [Rom.NameKey] = item.Name,
-                [Rom.BiosKey] = item.Bios,
-                [Rom.SizeKey] = item.Size,
-                [Rom.CRCKey] = item.CRC,
-                [Rom.SHA1Key] = item.SHA1,
-                [Rom.MergeKey] = item.Merge,
-                [Rom.RegionKey] = item.Region,
-                [Rom.OffsetKey] = item.Offset,
-                [Rom.StatusKey] = item.Status,
-                [Rom.OptionalKey] = item.Optional,
-                [Rom.DisposeKey] = item.Dispose,
-                [Rom.SoundOnlyKey] = item.SoundOnly,
-            };
-            return rom;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Sample"/> to <cref="Sample"/>
-        /// </summary>
-        private static Sample ConvertToInternalModel(Models.Listxml.Sample item)
-        {
-            var sample = new Sample
-            {
-                [Sample.NameKey] = item.Name,
-            };
-            return sample;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Slot"/> to <cref="Slot"/>
-        /// </summary>
-        private static Slot ConvertToInternalModel(Models.Listxml.Slot item)
-        {
-            var slot = new Slot
-            {
-                [Slot.NameKey] = item.Name,
-            };
-
-            if (item.SlotOption != null && item.SlotOption.Any())
-            {
-                var slotOptions = new List<SlotOption>();
-                foreach (var slotOption in item.SlotOption)
-                {
-                    slotOptions.Add(ConvertToInternalModel(slotOption));
-                }
-                slot[Slot.SlotOptionKey] = slotOptions.ToArray();
-            }
-
-            return slot;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.SlotOption"/> to <cref="SlotOption"/>
-        /// </summary>
-        private static SlotOption ConvertToInternalModel(Models.Listxml.SlotOption item)
-        {
-            var slotOption = new SlotOption
-            {
-                [SlotOption.NameKey] = item.Name,
-                [SlotOption.DevNameKey] = item.DevName,
-                [SlotOption.DefaultKey] = item.Default,
-            };
-            return slotOption;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.SoftwareList"/> to <cref="SoftwareList"/>
-        /// </summary>
-        private static SoftwareList ConvertToInternalModel(Models.Listxml.SoftwareList item)
-        {
-            var softwareList = new SoftwareList
-            {
-                [SoftwareList.TagKey] = item.Tag,
-                [SoftwareList.NameKey] = item.Name,
-                [SoftwareList.StatusKey] = item.Status,
-                [SoftwareList.FilterKey] = item.Filter,
-            };
-            return softwareList;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Sound"/> to <cref="Sound"/>
-        /// </summary>
-        private static Sound ConvertToInternalModel(Models.Listxml.Sound item)
-        {
-            var sound = new Sound
-            {
-                [Sound.ChannelsKey] = item.Channels,
-            };
-            return sound;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Models.Listxml.Video"/> to <cref="Video"/>
-        /// </summary>
-        private static Video ConvertToInternalModel(Models.Listxml.Video item)
-        {
-            var video = new Video
-            {
-                [Video.ScreenKey] = item.Screen,
-                [Video.OrientationKey] = item.Orientation,
-                [Video.WidthKey] = item.Width,
-                [Video.HeightKey] = item.Height,
-                [Video.AspectXKey] = item.AspectX,
-                [Video.AspectYKey] = item.AspectY,
-                [Video.RefreshKey] = item.Refresh,
-            };
-            return video;
-        }
-
-        #endregion
-
-        #region Deserialize
-
-        /// <summary>
-        /// Convert from <cref="Header"/> to <cref="Models.Listxml.M1"/>
-        /// </summary>
-        public static Models.Listxml.M1? ConvertHeaderToListxmlM1(Header? item)
-        {
-            if (item == null)
-                return null;
-
-            var m1 = new Models.Listxml.M1
-            {
-                Version = item.ReadString(Header.VersionKey),
-            };
-            return m1;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Header"/> to <cref="Models.Listxml.Mame"/>
-        /// </summary>
-        public static Models.Listxml.Mame? ConvertHeaderToListxmlMame(Header? item)
-        {
-            if (item == null)
-                return null;
-
-            var mame = new Models.Listxml.Mame
-            {
-                Build = item.ReadString(Header.BuildKey),
-                Debug = item.ReadString(Header.DebugKey),
-                MameConfig = item.ReadString(Header.MameConfigKey),
-            };
-            return mame;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Machine"/> to <cref="Models.Listxml.GameBase"/>
-        /// </summary>
-        public static Models.Listxml.GameBase? ConvertMachineToListxml(Machine? item)
-        {
-            if (item == null)
-                return null;
-
-            var machine = new Models.Listxml.Machine
-            {
-                Name = item.ReadString(Machine.NameKey),
-                SourceFile = item.ReadString(Machine.SourceFileKey),
-                IsBios = item.ReadString(Machine.IsBiosKey),
-                IsDevice = item.ReadString(Machine.IsDeviceKey),
-                IsMechanical = item.ReadString(Machine.IsMechanicalKey),
-                Runnable = item.ReadString(Machine.RunnableKey),
-                CloneOf = item.ReadString(Machine.CloneOfKey),
-                RomOf = item.ReadString(Machine.RomOfKey),
-                SampleOf = item.ReadString(Machine.SampleOfKey),
-                Description = item.ReadString(Machine.DescriptionKey),
-                Year = item.ReadString(Machine.YearKey),
-                Manufacturer = item.ReadString(Machine.ManufacturerKey),
-                History = item.ReadString(Machine.HistoryKey),
-            };
-
-            var biosSets = item.Read<BiosSet[]>(Machine.BiosSetKey);
-            machine.BiosSet = biosSets?.Select(ConvertToListxml)?.ToArray();
-
-            var roms = item.Read<Rom[]>(Machine.RomKey);
-            machine.Rom = roms?.Select(ConvertToListxml)?.ToArray();
-
-            var disks = item.Read<Disk[]>(Machine.DiskKey);
-            machine.Disk = disks?.Select(ConvertToListxml)?.ToArray();
-
-            var deviceRefs = item.Read<DeviceRef[]>(Machine.DeviceRefKey);
-            machine.DeviceRef = deviceRefs?.Select(ConvertToListxml)?.ToArray();
-
-            var samples = item.Read<Sample[]>(Machine.SampleKey);
-            machine.Sample = samples?.Select(ConvertToListxml)?.ToArray();
-
-            var chips = item.Read<Chip[]>(Machine.ChipKey);
-            machine.Chip = chips?.Select(ConvertToListxml)?.ToArray();
-
-            var displays = item.Read<Display[]>(Machine.DisplayKey);
-            machine.Display = displays?.Select(ConvertToListxml)?.ToArray();
-
-            var videos = item.Read<Video[]>(Machine.VideoKey);
-            machine.Video = videos?.Select(ConvertToListxml)?.ToArray();
-
-            var sound = item.Read<Sound>(Machine.SoundKey);
-            machine.Sound = ConvertToListxml(sound);
-
-            var input = item.Read<Input>(Machine.InputKey);
-            machine.Input = ConvertToListxml(input);
-
-            var dipSwitches = item.Read<DipSwitch[]>(Machine.DipSwitchKey);
-            machine.DipSwitch = dipSwitches?.Select(ConvertToListxml)?.ToArray();
-
-            var configurations = item.Read<Configuration[]>(Machine.ConfigurationKey);
-            machine.Configuration = configurations?.Select(ConvertToListxml)?.ToArray();
-
-            var ports = item.Read<Port[]>(Machine.PortKey);
-            machine.Port = ports?.Select(ConvertToListxml)?.ToArray();
-
-            var adjusters = item.Read<Adjuster[]>(Machine.AdjusterKey);
-            machine.Adjuster = adjusters?.Select(ConvertToListxml)?.ToArray();
-
-            var driver = item.Read<Driver>(Machine.DriverKey);
-            machine.Driver = ConvertToListxml(driver);
-
-            var features = item.Read<Feature[]>(Machine.FeatureKey);
-            machine.Feature = features?.Select(ConvertToListxml)?.ToArray();
-
-            var devices = item.Read<Device[]>(Machine.DeviceKey);
-            machine.Device = devices?.Select(ConvertToListxml)?.ToArray();
-
-            var slots = item.Read<Slot[]>(Machine.SlotKey);
-            machine.Slot = slots?.Select(ConvertToListxml)?.ToArray();
-
-            var softwareLists = item.Read<SoftwareList[]>(Machine.SoftwareListKey);
-            machine.SoftwareList = softwareLists?.Select(ConvertToListxml)?.ToArray();
-
-            var ramOptions = item.Read<RamOption[]>(Machine.RamOptionKey);
-            machine.RamOption = ramOptions?.Select(ConvertToListxml)?.ToArray();
-
-            return machine;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Adjuster"/> to <cref="Models.Listxml.Adjuster"/>
-        /// </summary>
-        private static Models.Listxml.Adjuster? ConvertToListxml(Adjuster? item)
-        {
-            if (item == null)
-                return null;
-
-            var adjuster = new Models.Listxml.Adjuster
-            {
-                Name = item.ReadString(Adjuster.NameKey),
-                Default = item.ReadString(Adjuster.DefaultKey),
-            };
-
-            var condition = item.Read<Condition>(Adjuster.ConditionKey);
-            adjuster.Condition = ConvertToListxml(condition);
-
-            return adjuster;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Analog"/> to <cref="Models.Listxml.Analog"/>
-        /// </summary>
-        private static Models.Listxml.Analog? ConvertToListxml(Analog? item)
-        {
-            if (item == null)
-                return null;
-
-            var analog = new Models.Listxml.Analog
-            {
-                Mask = item.ReadString(Analog.MaskKey),
-            };
-            return analog;
-        }
-
-        /// <summary>
-        /// Convert from <cref="BiosSet"/> to <cref="Models.Listxml.BiosSet"/>
-        /// </summary>
-        private static Models.Listxml.BiosSet? ConvertToListxml(BiosSet? item)
-        {
-            if (item == null)
-                return null;
-
-            var biosset = new Models.Listxml.BiosSet
-            {
-                Name = item.ReadString(BiosSet.NameKey),
-                Description = item.ReadString(BiosSet.DescriptionKey),
-                Default = item.ReadString(BiosSet.DefaultKey),
-            };
-            return biosset;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Chip"/> to <cref="Models.Listxml.Chip"/>
-        /// </summary>
-        private static Models.Listxml.Chip? ConvertToListxml(Chip? item)
-        {
-            if (item == null)
-                return null;
-
-            var chip = new Models.Listxml.Chip
-            {
-                Name = item.ReadString(Chip.NameKey),
-                Tag = item.ReadString(Chip.TagKey),
-                Type = item.ReadString(Chip.TypeKey),
-                SoundOnly = item.ReadString(Chip.SoundOnlyKey),
-                Clock = item.ReadString(Chip.ClockKey),
-            };
-            return chip;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Condition"/> to <cref="Models.Listxml.Condition"/>
-        /// </summary>
-        private static Models.Listxml.Condition? ConvertToListxml(Condition? item)
-        {
-            if (item == null)
-                return null;
-
-            var condition = new Models.Listxml.Condition
-            {
-                Tag = item.ReadString(Condition.TagKey),
-                Mask = item.ReadString(Condition.MaskKey),
-                Relation = item.ReadString(Condition.RelationKey),
-                Value = item.ReadString(Condition.ValueKey),
-            };
-            return condition;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Configuration"/> to <cref="Models.Listxml.Configuration"/>
-        /// </summary>
-        private static Models.Listxml.Configuration? ConvertToListxml(Configuration? item)
-        {
-            if (item == null)
-                return null;
-
-            var configuration = new Models.Listxml.Configuration
-            {
-                Name = item.ReadString(Configuration.NameKey),
-                Tag = item.ReadString(Configuration.TagKey),
-                Mask = item.ReadString(Configuration.MaskKey),
-            };
-
-            var condition = item.Read<Condition>(Configuration.ConditionKey);
-            configuration.Condition = ConvertToListxml(condition);
-
-            var confLocations = item.Read<ConfLocation[]>(Configuration.ConfLocationKey);
-            configuration.ConfLocation = confLocations?.Select(ConvertToListxml)?.ToArray();
-
-            var confSettings = item.Read<ConfSetting[]>(Configuration.ConfSettingKey);
-            configuration.ConfSetting = confSettings?.Select(ConvertToListxml)?.ToArray();
-
-            return configuration;
-        }
-
-        /// <summary>
-        /// Convert from <cref="ConfLocation"/> to <cref="Models.Listxml.ConfLocation"/>
-        /// </summary>
-        private static Models.Listxml.ConfLocation? ConvertToListxml(ConfLocation? item)
-        {
-            if (item == null)
-                return null;
-
-            var confLocation = new Models.Listxml.ConfLocation
-            {
-                Name = item.ReadString(ConfLocation.NameKey),
-                Number = item.ReadString(ConfLocation.NumberKey),
-                Inverted = item.ReadString(ConfLocation.InvertedKey),
-            };
-            return confLocation;
-        }
-
-        /// <summary>
-        /// Convert from <cref="ConfSetting"/> to <cref="Models.Listxml.ConfSetting"/>
-        /// </summary>
-        private static Models.Listxml.ConfSetting? ConvertToListxml(ConfSetting? item)
-        {
-            if (item == null)
-                return null;
-
-            var confSetting = new Models.Listxml.ConfSetting
-            {
-                Name = item.ReadString(ConfSetting.NameKey),
-                Value = item.ReadString(ConfSetting.ValueKey),
-                Default = item.ReadString(ConfSetting.DefaultKey),
-            };
-
-            var condition = item.Read<Condition>(ConfSetting.ConditionKey);
-            confSetting.Condition = ConvertToListxml(condition);
-
-            return confSetting;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Control"/> to <cref="Models.Listxml.Control"/>
-        /// </summary>
-        private static Models.Listxml.Control? ConvertToListxml(Control? item)
-        {
-            if (item == null)
-                return null;
-
-            var control = new Models.Listxml.Control
-            {
-                Type = item.ReadString(Control.TypeKey),
-                Player = item.ReadString(Control.PlayerKey),
-                Buttons = item.ReadString(Control.ButtonsKey),
-                ReqButtons = item.ReadString(Control.ReqButtonsKey),
-                Minimum = item.ReadString(Control.MinimumKey),
-                Maximum = item.ReadString(Control.MaximumKey),
-                Sensitivity = item.ReadString(Control.SensitivityKey),
-                KeyDelta = item.ReadString(Control.KeyDeltaKey),
-                Reverse = item.ReadString(Control.ReverseKey),
-                Ways = item.ReadString(Control.WaysKey),
-                Ways2 = item.ReadString(Control.Ways2Key),
-                Ways3 = item.ReadString(Control.Ways3Key),
-            };
-            return control;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Device"/> to <cref="Models.Listxml.Device"/>
-        /// </summary>
-        private static Models.Listxml.Device? ConvertToListxml(Device? item)
-        {
-            if (item == null)
-                return null;
-
-            var device = new Models.Listxml.Device
-            {
-                Type = item.ReadString(Device.TypeKey),
-                Tag = item.ReadString(Device.TagKey),
-                FixedImage = item.ReadString(Device.FixedImageKey),
-                Mandatory = item.ReadString(Device.MandatoryKey),
-                Interface = item.ReadString(Device.InterfaceKey),
-            };
-
-            var instance = item.Read<Instance>(Device.InstanceKey);
-            device.Instance = ConvertToListxml(instance);
-
-            var extensions = item.Read<Extension[]>(Device.ExtensionKey);
-            device.Extension = extensions?.Select(ConvertToListxml)?.ToArray();
-
-            return device;
-        }
-
-        /// <summary>
-        /// Convert from <cref="DeviceRef"/> to <cref="Models.Listxml.DeviceRef"/>
-        /// </summary>
-        private static Models.Listxml.DeviceRef? ConvertToListxml(DeviceRef? item)
-        {
-            if (item == null)
-                return null;
-
-            var deviceRef = new Models.Listxml.DeviceRef
-            {
-                Name = item.ReadString(DeviceRef.NameKey),
-            };
-            return deviceRef;
-        }
-
-        /// <summary>
-        /// Convert from <cref="DipLocation"/> to <cref="Models.Listxml.DipLocation"/>
-        /// </summary>
-        private static Models.Listxml.DipLocation? ConvertToListxml(DipLocation? item)
-        {
-            if (item == null)
-                return null;
-
-            var dipLocation = new Models.Listxml.DipLocation
-            {
-                Name = item.ReadString(DipLocation.NameKey),
-                Number = item.ReadString(DipLocation.NumberKey),
-                Inverted = item.ReadString(DipLocation.InvertedKey),
-            };
-            return dipLocation;
-        }
-
-        /// <summary>
-        /// Convert from <cref="DipSwitch"/> to <cref="Models.Listxml.DipSwitch"/>
-        /// </summary>
-        private static Models.Listxml.DipSwitch? ConvertToListxml(DipSwitch? item)
-        {
-            if (item == null)
-                return null;
-
-            var dipSwitch = new Models.Listxml.DipSwitch
-            {
-                Name = item.ReadString(DipSwitch.NameKey),
-                Tag = item.ReadString(DipSwitch.TagKey),
-                Mask = item.ReadString(DipSwitch.MaskKey),
-            };
-
-            var condition = item.Read<Condition>(DipSwitch.ConditionKey);
-            dipSwitch.Condition = ConvertToListxml(condition);
-
-            var dipLocations = item.Read<DipLocation[]>(DipSwitch.DipLocationKey);
-            dipSwitch.DipLocation = dipLocations?.Select(ConvertToListxml)?.ToArray();
-
-            var dipValues = item.Read<DipValue[]>(DipSwitch.DipValueKey);
-            dipSwitch.DipValue = dipValues?.Select(ConvertToListxml)?.ToArray();
-
-            return dipSwitch;
-        }
-
-        /// <summary>
-        /// Convert from <cref="DipValue"/> to <cref="Models.Listxml.DipValue"/>
-        /// </summary>
-        private static Models.Listxml.DipValue? ConvertToListxml(DipValue? item)
-        {
-            if (item == null)
-                return null;
-
-            var dipValue = new Models.Listxml.DipValue
-            {
-                Name = item.ReadString(DipValue.NameKey),
-                Value = item.ReadString(DipValue.ValueKey),
-                Default = item.ReadString(DipValue.DefaultKey),
-            };
-
-            var condition = item.Read<Condition>(DipValue.ConditionKey);
-            dipValue.Condition = ConvertToListxml(condition);
-
-            return dipValue;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Disk"/> to <cref="Models.Listxml.Disk"/>
-        /// </summary>
-        private static Models.Listxml.Disk? ConvertToListxml(Disk? item)
-        {
-            if (item == null)
-                return null;
-
-            var disk = new Models.Listxml.Disk
-            {
-                Name = item.ReadString(Disk.NameKey),
-                MD5 = item.ReadString(Disk.MD5Key),
-                SHA1 = item.ReadString(Disk.SHA1Key),
-                Merge = item.ReadString(Disk.MergeKey),
-                Region = item.ReadString(Disk.RegionKey),
-                Index = item.ReadString(Disk.IndexKey),
-                Writable = item.ReadString(Disk.WritableKey),
-                Status = item.ReadString(Disk.StatusKey),
-                Optional = item.ReadString(Disk.OptionalKey),
-            };
-            return disk;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Display"/> to <cref="Models.Listxml.Display"/>
-        /// </summary>
-        private static Models.Listxml.Display? ConvertToListxml(Display? item)
-        {
-            if (item == null)
-                return null;
-
-            var display = new Models.Listxml.Display
-            {
-                Tag = item.ReadString(Display.TagKey),
-                Type = item.ReadString(Display.TypeKey),
-                Rotate = item.ReadString(Display.RotateKey),
-                FlipX = item.ReadString(Display.FlipXKey),
-                Width = item.ReadString(Display.WidthKey),
-                Height = item.ReadString(Display.HeightKey),
-                Refresh = item.ReadString(Display.RefreshKey),
-                PixClock = item.ReadString(Display.PixClockKey),
-                HTotal = item.ReadString(Display.HTotalKey),
-                HBEnd = item.ReadString(Display.HBEndKey),
-                HBStart = item.ReadString(Display.HBStartKey),
-                VTotal = item.ReadString(Display.VTotalKey),
-                VBEnd = item.ReadString(Display.VBEndKey),
-                VBStart = item.ReadString(Display.VBStartKey),
-            };
-            return display;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Driver"/> to <cref="Models.Listxml.Driver"/>
-        /// </summary>
-        private static Models.Listxml.Driver? ConvertToListxml(Driver? item)
-        {
-            if (item == null)
-                return null;
-
-            var driver = new Models.Listxml.Driver
-            {
-                Status = item.ReadString(Driver.StatusKey),
-                Color = item.ReadString(Driver.ColorKey),
-                Sound = item.ReadString(Driver.SoundKey),
-                PaletteSize = item.ReadString(Driver.PaletteSizeKey),
-                Emulation = item.ReadString(Driver.EmulationKey),
-                Cocktail = item.ReadString(Driver.CocktailKey),
-                SaveState = item.ReadString(Driver.SaveStateKey),
-                RequiresArtwork = item.ReadString(Driver.RequiresArtworkKey),
-                Unofficial = item.ReadString(Driver.UnofficialKey),
-                NoSoundHardware = item.ReadString(Driver.NoSoundHardwareKey),
-                Incomplete = item.ReadString(Driver.IncompleteKey),
-            };
-            return driver;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Extension"/> to <cref="Models.Listxml.Extension"/>
-        /// </summary>
-        private static Models.Listxml.Extension? ConvertToListxml(Extension? item)
-        {
-            if (item == null)
-                return null;
-
-            var extension = new Models.Listxml.Extension
-            {
-                Name = item.ReadString(Extension.NameKey),
-            };
-            return extension;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Feature"/> to <cref="Models.Listxml.Feature"/>
-        /// </summary>
-        private static Models.Listxml.Feature? ConvertToListxml(Feature? item)
-        {
-            if (item == null)
-                return null;
-
-            var feature = new Models.Listxml.Feature
-            {
-                Type = item.ReadString(Feature.TypeKey),
-                Status = item.ReadString(Feature.StatusKey),
-                Overall = item.ReadString(Feature.OverallKey),
-            };
-            return feature;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Input"/> to <cref="Models.Listxml.Input"/>
-        /// </summary>
-        private static Models.Listxml.Input? ConvertToListxml(Input? item)
-        {
-            if (item == null)
-                return null;
-
-            var input = new Models.Listxml.Input
-            {
-                Service = item.ReadString(Input.ServiceKey),
-                Tilt = item.ReadString(Input.TiltKey),
-                Players = item.ReadString(Input.PlayersKey),
-                ControlAttr = item.ReadString(Input.ControlKey),
-                Buttons = item.ReadString(Input.ButtonsKey),
-                Coins = item.ReadString(Input.CoinsKey),
-            };
-
-            var controls = item.Read<Control[]>(Input.ControlKey);
-            input.Control = controls?.Select(ConvertToListxml)?.ToArray();
-
-            return input;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Instance"/> to <cref="Models.Listxml.Instance"/>
-        /// </summary>
-        private static Models.Listxml.Instance? ConvertToListxml(Instance? item)
-        {
-            if (item == null)
-                return null;
-
-            var instance = new Models.Listxml.Instance
-            {
-                Name = item.ReadString(Instance.NameKey),
-                BriefName = item.ReadString(Instance.BriefNameKey),
-            };
-            return instance;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Port"/> to <cref="Models.Listxml.Port"/>
-        /// </summary>
-        private static Models.Listxml.Port? ConvertToListxml(Port? item)
-        {
-            if (item == null)
-                return null;
-
-            var port = new Models.Listxml.Port
-            {
-                Tag = item.ReadString(Port.TagKey),
-            };
-
-            var analogs = item.Read<Analog[]>(Port.AnalogKey);
-            port.Analog = analogs?.Select(ConvertToListxml)?.ToArray();
-
-            return port;
-        }
-
-        /// <summary>
-        /// Convert from <cref="RamOption"/> to <cref="Models.Listxml.RamOption"/>
-        /// </summary>
-        private static Models.Listxml.RamOption? ConvertToListxml(RamOption? item)
-        {
-            if (item == null)
-                return null;
-
-            var ramOption = new Models.Listxml.RamOption
-            {
-                Name = item.ReadString(RamOption.NameKey),
-                Default = item.ReadString(RamOption.DefaultKey),
-            };
-            return ramOption;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Rom"/> to <cref="Models.Listxml.Rom"/>
-        /// </summary>
-        private static Models.Listxml.Rom? ConvertToListxml(Rom? item)
-        {
-            if (item == null)
-                return null;
-
-            var rom = new Models.Listxml.Rom
-            {
-                Name = item.ReadString(Rom.NameKey),
-                Bios = item.ReadString(Rom.BiosKey),
-                Size = item.ReadString(Rom.SizeKey),
-                CRC = item.ReadString(Rom.CRCKey),
-                SHA1 = item.ReadString(Rom.SHA1Key),
-                Merge = item.ReadString(Rom.MergeKey),
-                Region = item.ReadString(Rom.RegionKey),
-                Offset = item.ReadString(Rom.OffsetKey),
-                Status = item.ReadString(Rom.StatusKey),
-                Optional = item.ReadString(Rom.OptionalKey),
-                Dispose = item.ReadString(Rom.DisposeKey),
-                SoundOnly = item.ReadString(Rom.SoundOnlyKey),
-            };
-            return rom;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Sample"/> to <cref="Models.Listxml.Sample"/>
-        /// </summary>
-        private static Models.Listxml.Sample? ConvertToListxml(Sample? item)
-        {
-            if (item == null)
-                return null;
-
-            var sample = new Models.Listxml.Sample
-            {
-                Name = item.ReadString(Sample.NameKey),
-            };
-            return sample;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Slot"/> to <cref="Models.Listxml.Slot"/>
-        /// </summary>
-        private static Models.Listxml.Slot? ConvertToListxml(Slot? item)
-        {
-            if (item == null)
-                return null;
-
-            var slot = new Models.Listxml.Slot
-            {
-                Name = item.ReadString(Slot.NameKey),
-            };
-
-            var slotOptions = item.Read<SlotOption[]>(Slot.SlotOptionKey);
-            slot.SlotOption = slotOptions?.Select(ConvertToListxml)?.ToArray();
-
-            return slot;
-        }
-
-        /// <summary>
-        /// Convert from <cref="SlotOption"/> to <cref="Models.Listxml.SlotOption"/>
-        /// </summary>
-        private static Models.Listxml.SlotOption? ConvertToListxml(SlotOption? item)
-        {
-            if (item == null)
-                return null;
-
-            var slotOption = new Models.Listxml.SlotOption
-            {
-                Name = item.ReadString(SlotOption.NameKey),
-                DevName = item.ReadString(SlotOption.DevNameKey),
-                Default = item.ReadString(SlotOption.DefaultKey),
-            };
-            return slotOption;
-        }
-
-        /// <summary>
-        /// Convert from <cref="SoftwareList"/> to <cref="Models.Listxml.SoftwareList"/>
-        /// </summary>
-        private static Models.Listxml.SoftwareList? ConvertToListxml(SoftwareList? item)
-        {
-            if (item == null)
-                return null;
-
-            var softwareList = new Models.Listxml.SoftwareList
-            {
-                Tag = item.ReadString(SoftwareList.TagKey),
-                Name = item.ReadString(SoftwareList.NameKey),
-                Status = item.ReadString(SoftwareList.StatusKey),
-                Filter = item.ReadString(SoftwareList.FilterKey),
-            };
-            return softwareList;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Sound"/> to <cref="Models.Listxml.Sound"/>
-        /// </summary>
-        private static Models.Listxml.Sound? ConvertToListxml(Sound? item)
-        {
-            if (item == null)
-                return null;
-
-            var sound = new Models.Listxml.Sound
-            {
-                Channels = item.ReadString(Sound.ChannelsKey),
-            };
-            return sound;
-        }
-
-        /// <summary>
-        /// Convert from <cref="Video"/> to <cref="Models.Listxml.Video"/>
-        /// </summary>
-        private static Models.Listxml.Video? ConvertToListxml(Video? item)
-        {
-            if (item == null)
-                return null;
-
-            var video = new Models.Listxml.Video
-            {
-                Screen = item.ReadString(Video.ScreenKey),
-                Orientation = item.ReadString(Video.OrientationKey),
-                Width = item.ReadString(Video.WidthKey),
-                Height = item.ReadString(Video.HeightKey),
-                AspectX = item.ReadString(Video.AspectXKey),
-                AspectY = item.ReadString(Video.AspectYKey),
-                Refresh = item.ReadString(Video.RefreshKey),
-            };
-            return video;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/SabreTools.Serialization/Listxml.Deserializer.cs b/SabreTools.Serialization/Listxml.Deserializer.cs
new file mode 100644
index 00000000..596572e6
--- /dev/null
+++ b/SabreTools.Serialization/Listxml.Deserializer.cs
@@ -0,0 +1,735 @@
+using System.Linq;
+using SabreTools.Models.Listxml;
+
+namespace SabreTools.Serialization
+{
+    /// <summary>
+    /// XML deserializer for MAME listxml files
+    /// </summary>
+    public partial class Listxml : XmlSerializer<Mame>
+    {
+        #region Internal
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.Listxml.M1"/>
+        /// </summary>
+        public static M1? ConvertM1FromInternalModel(Models.Internal.Header? item)
+        {
+            if (item == null)
+                return null;
+
+            var m1 = new M1
+            {
+                Version = item.ReadString(Models.Internal.Header.VersionKey),
+            };
+            return m1;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.Listxml.Mame"/>
+        /// </summary>
+        public static Mame? ConvertMameFromInternalModel(Models.Internal.Header? item)
+        {
+            if (item == null)
+                return null;
+
+            var mame = new Mame
+            {
+                Build = item.ReadString(Models.Internal.Header.BuildKey),
+                Debug = item.ReadString(Models.Internal.Header.DebugKey),
+                MameConfig = item.ReadString(Models.Internal.Header.MameConfigKey),
+            };
+            return mame;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.Listxml.GameBase"/>
+        /// </summary>
+        public static GameBase? ConvertMachineFromInternalModel(Models.Internal.Machine? item)
+        {
+            if (item == null)
+                return null;
+
+            var machine = new Machine
+            {
+                Name = item.ReadString(Models.Internal.Machine.NameKey),
+                SourceFile = item.ReadString(Models.Internal.Machine.SourceFileKey),
+                IsBios = item.ReadString(Models.Internal.Machine.IsBiosKey),
+                IsDevice = item.ReadString(Models.Internal.Machine.IsDeviceKey),
+                IsMechanical = item.ReadString(Models.Internal.Machine.IsMechanicalKey),
+                Runnable = item.ReadString(Models.Internal.Machine.RunnableKey),
+                CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey),
+                RomOf = item.ReadString(Models.Internal.Machine.RomOfKey),
+                SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey),
+                Description = item.ReadString(Models.Internal.Machine.DescriptionKey),
+                Year = item.ReadString(Models.Internal.Machine.YearKey),
+                Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey),
+                History = item.ReadString(Models.Internal.Machine.HistoryKey),
+            };
+
+            var biosSets = item.Read<Models.Internal.BiosSet[]>(Models.Internal.Machine.BiosSetKey);
+            machine.BiosSet = biosSets?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            machine.Rom = roms?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
+            machine.Disk = disks?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var deviceRefs = item.Read<Models.Internal.DeviceRef[]>(Models.Internal.Machine.DeviceRefKey);
+            machine.DeviceRef = deviceRefs?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var samples = item.Read<Models.Internal.Sample[]>(Models.Internal.Machine.SampleKey);
+            machine.Sample = samples?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var chips = item.Read<Models.Internal.Chip[]>(Models.Internal.Machine.ChipKey);
+            machine.Chip = chips?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var displays = item.Read<Models.Internal.Display[]>(Models.Internal.Machine.DisplayKey);
+            machine.Display = displays?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var videos = item.Read<Models.Internal.Video[]>(Models.Internal.Machine.VideoKey);
+            machine.Video = videos?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var sound = item.Read<Models.Internal.Sound>(Models.Internal.Machine.SoundKey);
+            machine.Sound = ConvertFromInternalModel(sound);
+
+            var input = item.Read<Models.Internal.Input>(Models.Internal.Machine.InputKey);
+            machine.Input = ConvertFromInternalModel(input);
+
+            var dipSwitches = item.Read<Models.Internal.DipSwitch[]>(Models.Internal.Machine.DipSwitchKey);
+            machine.DipSwitch = dipSwitches?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var configurations = item.Read<Models.Internal.Configuration[]>(Models.Internal.Machine.ConfigurationKey);
+            machine.Configuration = configurations?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var ports = item.Read<Models.Internal.Port[]>(Models.Internal.Machine.PortKey);
+            machine.Port = ports?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var adjusters = item.Read<Models.Internal.Adjuster[]>(Models.Internal.Machine.AdjusterKey);
+            machine.Adjuster = adjusters?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var driver = item.Read<Models.Internal.Driver>(Models.Internal.Machine.DriverKey);
+            machine.Driver = ConvertFromInternalModel(driver);
+
+            var features = item.Read<Models.Internal.Feature[]>(Models.Internal.Machine.FeatureKey);
+            machine.Feature = features?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var devices = item.Read<Models.Internal.Device[]>(Models.Internal.Machine.DeviceKey);
+            machine.Device = devices?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var slots = item.Read<Models.Internal.Slot[]>(Models.Internal.Machine.SlotKey);
+            machine.Slot = slots?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var softwareLists = item.Read<Models.Internal.SoftwareList[]>(Models.Internal.Machine.SoftwareListKey);
+            machine.SoftwareList = softwareLists?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var ramOptions = item.Read<Models.Internal.RamOption[]>(Models.Internal.Machine.RamOptionKey);
+            machine.RamOption = ramOptions?.Select(ConvertFromInternalModel)?.ToArray();
+
+            return machine;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Adjuster"/> to <cref="Models.Listxml.Adjuster"/>
+        /// </summary>
+        private static Adjuster? ConvertFromInternalModel(Models.Internal.Adjuster? item)
+        {
+            if (item == null)
+                return null;
+
+            var adjuster = new Adjuster
+            {
+                Name = item.ReadString(Models.Internal.Adjuster.NameKey),
+                Default = item.ReadString(Models.Internal.Adjuster.DefaultKey),
+            };
+
+            var condition = item.Read<Models.Internal.Condition>(Models.Internal.Adjuster.ConditionKey);
+            adjuster.Condition = ConvertFromInternalModel(condition);
+
+            return adjuster;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Analog"/> to <cref="Models.Listxml.Analog"/>
+        /// </summary>
+        private static Analog? ConvertFromInternalModel(Models.Internal.Analog? item)
+        {
+            if (item == null)
+                return null;
+
+            var analog = new Analog
+            {
+                Mask = item.ReadString(Models.Internal.Analog.MaskKey),
+            };
+            return analog;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.BiosSet"/> to <cref="Models.Listxml.BiosSet"/>
+        /// </summary>
+        private static BiosSet? ConvertFromInternalModel(Models.Internal.BiosSet? item)
+        {
+            if (item == null)
+                return null;
+
+            var biosset = new BiosSet
+            {
+                Name = item.ReadString(Models.Internal.BiosSet.NameKey),
+                Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey),
+                Default = item.ReadString(Models.Internal.BiosSet.DefaultKey),
+            };
+            return biosset;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Chip"/> to <cref="Models.Listxml.Chip"/>
+        /// </summary>
+        private static Chip? ConvertFromInternalModel(Models.Internal.Chip? item)
+        {
+            if (item == null)
+                return null;
+
+            var chip = new Chip
+            {
+                Name = item.ReadString(Models.Internal.Chip.NameKey),
+                Tag = item.ReadString(Models.Internal.Chip.TagKey),
+                Type = item.ReadString(Models.Internal.Chip.TypeKey),
+                SoundOnly = item.ReadString(Models.Internal.Chip.SoundOnlyKey),
+                Clock = item.ReadString(Models.Internal.Chip.ClockKey),
+            };
+            return chip;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Condition"/> to <cref="Models.Listxml.Condition"/>
+        /// </summary>
+        private static Condition? ConvertFromInternalModel(Models.Internal.Condition? item)
+        {
+            if (item == null)
+                return null;
+
+            var condition = new Condition
+            {
+                Tag = item.ReadString(Models.Internal.Condition.TagKey),
+                Mask = item.ReadString(Models.Internal.Condition.MaskKey),
+                Relation = item.ReadString(Models.Internal.Condition.RelationKey),
+                Value = item.ReadString(Models.Internal.Condition.ValueKey),
+            };
+            return condition;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Configuration"/> to <cref="Models.Listxml.Configuration"/>
+        /// </summary>
+        private static Configuration? ConvertFromInternalModel(Models.Internal.Configuration? item)
+        {
+            if (item == null)
+                return null;
+
+            var configuration = new Configuration
+            {
+                Name = item.ReadString(Models.Internal.Configuration.NameKey),
+                Tag = item.ReadString(Models.Internal.Configuration.TagKey),
+                Mask = item.ReadString(Models.Internal.Configuration.MaskKey),
+            };
+
+            var condition = item.Read<Models.Internal.Condition>(Models.Internal.Configuration.ConditionKey);
+            configuration.Condition = ConvertFromInternalModel(condition);
+
+            var confLocations = item.Read<Models.Internal.ConfLocation[]>(Models.Internal.Configuration.ConfLocationKey);
+            configuration.ConfLocation = confLocations?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var confSettings = item.Read<Models.Internal.ConfSetting[]>(Models.Internal.Configuration.ConfSettingKey);
+            configuration.ConfSetting = confSettings?.Select(ConvertFromInternalModel)?.ToArray();
+
+            return configuration;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.ConfLocation"/> to <cref="Models.Listxml.ConfLocation"/>
+        /// </summary>
+        private static ConfLocation? ConvertFromInternalModel(Models.Internal.ConfLocation? item)
+        {
+            if (item == null)
+                return null;
+
+            var confLocation = new ConfLocation
+            {
+                Name = item.ReadString(Models.Internal.ConfLocation.NameKey),
+                Number = item.ReadString(Models.Internal.ConfLocation.NumberKey),
+                Inverted = item.ReadString(Models.Internal.ConfLocation.InvertedKey),
+            };
+            return confLocation;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.ConfSetting"/> to <cref="Models.Listxml.ConfSetting"/>
+        /// </summary>
+        private static ConfSetting? ConvertFromInternalModel(Models.Internal.ConfSetting? item)
+        {
+            if (item == null)
+                return null;
+
+            var confSetting = new ConfSetting
+            {
+                Name = item.ReadString(Models.Internal.ConfSetting.NameKey),
+                Value = item.ReadString(Models.Internal.ConfSetting.ValueKey),
+                Default = item.ReadString(Models.Internal.ConfSetting.DefaultKey),
+            };
+
+            var condition = item.Read<Models.Internal.Condition>(Models.Internal.ConfSetting.ConditionKey);
+            confSetting.Condition = ConvertFromInternalModel(condition);
+
+            return confSetting;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Control"/> to <cref="Models.Listxml.Control"/>
+        /// </summary>
+        private static Control? ConvertFromInternalModel(Models.Internal.Control? item)
+        {
+            if (item == null)
+                return null;
+
+            var control = new Control
+            {
+                Type = item.ReadString(Models.Internal.Control.TypeKey),
+                Player = item.ReadString(Models.Internal.Control.PlayerKey),
+                Buttons = item.ReadString(Models.Internal.Control.ButtonsKey),
+                ReqButtons = item.ReadString(Models.Internal.Control.ReqButtonsKey),
+                Minimum = item.ReadString(Models.Internal.Control.MinimumKey),
+                Maximum = item.ReadString(Models.Internal.Control.MaximumKey),
+                Sensitivity = item.ReadString(Models.Internal.Control.SensitivityKey),
+                KeyDelta = item.ReadString(Models.Internal.Control.KeyDeltaKey),
+                Reverse = item.ReadString(Models.Internal.Control.ReverseKey),
+                Ways = item.ReadString(Models.Internal.Control.WaysKey),
+                Ways2 = item.ReadString(Models.Internal.Control.Ways2Key),
+                Ways3 = item.ReadString(Models.Internal.Control.Ways3Key),
+            };
+            return control;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Internal.Device"/> to <cref="Models.Listxml.Device"/>
+        /// </summary>
+        private static Device? ConvertFromInternalModel(Models.Internal.Device? item)
+        {
+            if (item == null)
+                return null;
+
+            var device = new Device
+            {
+                Type = item.ReadString(Models.Internal.Device.TypeKey),
+                Tag = item.ReadString(Models.Internal.Device.TagKey),
+                FixedImage = item.ReadString(Models.Internal.Device.FixedImageKey),
+                Mandatory = item.ReadString(Models.Internal.Device.MandatoryKey),
+                Interface = item.ReadString(Models.Internal.Device.InterfaceKey),
+            };
+
+            var instance = item.Read<Models.Internal.Instance>(Models.Internal.Device.InstanceKey);
+            device.Instance = ConvertFromInternalModel(instance);
+
+            var extensions = item.Read<Models.Internal.Extension[]>(Models.Internal.Device.ExtensionKey);
+            device.Extension = extensions?.Select(ConvertFromInternalModel)?.ToArray();
+
+            return device;
+        }
+
+        /// <summary>
+        /// Convert from <cref="DeviceRef"/> to <cref="Models.Listxml.DeviceRef"/>
+        /// </summary>
+        private static DeviceRef? ConvertFromInternalModel(Models.Internal.DeviceRef? item)
+        {
+            if (item == null)
+                return null;
+
+            var deviceRef = new DeviceRef
+            {
+                Name = item.ReadString(Models.Internal.DeviceRef.NameKey),
+            };
+            return deviceRef;
+        }
+
+        /// <summary>
+        /// Convert from <cref="DipLocation"/> to <cref="Models.Listxml.DipLocation"/>
+        /// </summary>
+        private static DipLocation? ConvertFromInternalModel(Models.Internal.DipLocation? item)
+        {
+            if (item == null)
+                return null;
+
+            var dipLocation = new DipLocation
+            {
+                Name = item.ReadString(Models.Internal.DipLocation.NameKey),
+                Number = item.ReadString(Models.Internal.DipLocation.NumberKey),
+                Inverted = item.ReadString(Models.Internal.DipLocation.InvertedKey),
+            };
+            return dipLocation;
+        }
+
+        /// <summary>
+        /// Convert from <cref="DipSwitch"/> to <cref="Models.Listxml.DipSwitch"/>
+        /// </summary>
+        private static DipSwitch? ConvertFromInternalModel(Models.Internal.DipSwitch? item)
+        {
+            if (item == null)
+                return null;
+
+            var dipSwitch = new DipSwitch
+            {
+                Name = item.ReadString(Models.Internal.DipSwitch.NameKey),
+                Tag = item.ReadString(Models.Internal.DipSwitch.TagKey),
+                Mask = item.ReadString(Models.Internal.DipSwitch.MaskKey),
+            };
+
+            var condition = item.Read<Models.Internal.Condition>(Models.Internal.DipSwitch.ConditionKey);
+            dipSwitch.Condition = ConvertFromInternalModel(condition);
+
+            var dipLocations = item.Read<Models.Internal.DipLocation[]>(Models.Internal.DipSwitch.DipLocationKey);
+            dipSwitch.DipLocation = dipLocations?.Select(ConvertFromInternalModel)?.ToArray();
+
+            var dipValues = item.Read<Models.Internal.DipValue[]>(Models.Internal.DipSwitch.DipValueKey);
+            dipSwitch.DipValue = dipValues?.Select(ConvertFromInternalModel)?.ToArray();
+
+            return dipSwitch;
+        }
+
+        /// <summary>
+        /// Convert from <cref="DipValue"/> to <cref="Models.Listxml.DipValue"/>
+        /// </summary>
+        private static DipValue? ConvertFromInternalModel(Models.Internal.DipValue? item)
+        {
+            if (item == null)
+                return null;
+
+            var dipValue = new DipValue
+            {
+                Name = item.ReadString(Models.Internal.DipValue.NameKey),
+                Value = item.ReadString(Models.Internal.DipValue.ValueKey),
+                Default = item.ReadString(Models.Internal.DipValue.DefaultKey),
+            };
+
+            var condition = item.Read<Models.Internal.Condition>(Models.Internal.DipValue.ConditionKey);
+            dipValue.Condition = ConvertFromInternalModel(condition);
+
+            return dipValue;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Disk"/> to <cref="Models.Listxml.Disk"/>
+        /// </summary>
+        private static Disk? ConvertFromInternalModel(Models.Internal.Disk? item)
+        {
+            if (item == null)
+                return null;
+
+            var disk = new Disk
+            {
+                Name = item.ReadString(Models.Internal.Disk.NameKey),
+                MD5 = item.ReadString(Models.Internal.Disk.MD5Key),
+                SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key),
+                Merge = item.ReadString(Models.Internal.Disk.MergeKey),
+                Region = item.ReadString(Models.Internal.Disk.RegionKey),
+                Index = item.ReadString(Models.Internal.Disk.IndexKey),
+                Writable = item.ReadString(Models.Internal.Disk.WritableKey),
+                Status = item.ReadString(Models.Internal.Disk.StatusKey),
+                Optional = item.ReadString(Models.Internal.Disk.OptionalKey),
+            };
+            return disk;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Display"/> to <cref="Models.Listxml.Display"/>
+        /// </summary>
+        private static Display? ConvertFromInternalModel(Models.Internal.Display? item)
+        {
+            if (item == null)
+                return null;
+
+            var display = new Display
+            {
+                Tag = item.ReadString(Models.Internal.Display.TagKey),
+                Type = item.ReadString(Models.Internal.Display.TypeKey),
+                Rotate = item.ReadString(Models.Internal.Display.RotateKey),
+                FlipX = item.ReadString(Models.Internal.Display.FlipXKey),
+                Width = item.ReadString(Models.Internal.Display.WidthKey),
+                Height = item.ReadString(Models.Internal.Display.HeightKey),
+                Refresh = item.ReadString(Models.Internal.Display.RefreshKey),
+                PixClock = item.ReadString(Models.Internal.Display.PixClockKey),
+                HTotal = item.ReadString(Models.Internal.Display.HTotalKey),
+                HBEnd = item.ReadString(Models.Internal.Display.HBEndKey),
+                HBStart = item.ReadString(Models.Internal.Display.HBStartKey),
+                VTotal = item.ReadString(Models.Internal.Display.VTotalKey),
+                VBEnd = item.ReadString(Models.Internal.Display.VBEndKey),
+                VBStart = item.ReadString(Models.Internal.Display.VBStartKey),
+            };
+            return display;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Driver"/> to <cref="Models.Listxml.Driver"/>
+        /// </summary>
+        private static Driver? ConvertFromInternalModel(Models.Internal.Driver? item)
+        {
+            if (item == null)
+                return null;
+
+            var driver = new Driver
+            {
+                Status = item.ReadString(Models.Internal.Driver.StatusKey),
+                Color = item.ReadString(Models.Internal.Driver.ColorKey),
+                Sound = item.ReadString(Models.Internal.Driver.SoundKey),
+                PaletteSize = item.ReadString(Models.Internal.Driver.PaletteSizeKey),
+                Emulation = item.ReadString(Models.Internal.Driver.EmulationKey),
+                Cocktail = item.ReadString(Models.Internal.Driver.CocktailKey),
+                SaveState = item.ReadString(Models.Internal.Driver.SaveStateKey),
+                RequiresArtwork = item.ReadString(Models.Internal.Driver.RequiresArtworkKey),
+                Unofficial = item.ReadString(Models.Internal.Driver.UnofficialKey),
+                NoSoundHardware = item.ReadString(Models.Internal.Driver.NoSoundHardwareKey),
+                Incomplete = item.ReadString(Models.Internal.Driver.IncompleteKey),
+            };
+            return driver;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Extension"/> to <cref="Models.Listxml.Extension"/>
+        /// </summary>
+        private static Extension? ConvertFromInternalModel(Models.Internal.Extension? item)
+        {
+            if (item == null)
+                return null;
+
+            var extension = new Extension
+            {
+                Name = item.ReadString(Models.Internal.Extension.NameKey),
+            };
+            return extension;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Feature"/> to <cref="Models.Listxml.Feature"/>
+        /// </summary>
+        private static Feature? ConvertFromInternalModel(Models.Internal.Feature? item)
+        {
+            if (item == null)
+                return null;
+
+            var feature = new Feature
+            {
+                Type = item.ReadString(Models.Internal.Feature.TypeKey),
+                Status = item.ReadString(Models.Internal.Feature.StatusKey),
+                Overall = item.ReadString(Models.Internal.Feature.OverallKey),
+            };
+            return feature;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Input"/> to <cref="Models.Listxml.Input"/>
+        /// </summary>
+        private static Input? ConvertFromInternalModel(Models.Internal.Input? item)
+        {
+            if (item == null)
+                return null;
+
+            var input = new Input
+            {
+                Service = item.ReadString(Models.Internal.Input.ServiceKey),
+                Tilt = item.ReadString(Models.Internal.Input.TiltKey),
+                Players = item.ReadString(Models.Internal.Input.PlayersKey),
+                ControlAttr = item.ReadString(Models.Internal.Input.ControlKey),
+                Buttons = item.ReadString(Models.Internal.Input.ButtonsKey),
+                Coins = item.ReadString(Models.Internal.Input.CoinsKey),
+            };
+
+            var controls = item.Read<Models.Internal.Control[]>(Models.Internal.Input.ControlKey);
+            input.Control = controls?.Select(ConvertFromInternalModel)?.ToArray();
+
+            return input;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Instance"/> to <cref="Models.Listxml.Instance"/>
+        /// </summary>
+        private static Instance? ConvertFromInternalModel(Models.Internal.Instance? item)
+        {
+            if (item == null)
+                return null;
+
+            var instance = new Instance
+            {
+                Name = item.ReadString(Models.Internal.Instance.NameKey),
+                BriefName = item.ReadString(Models.Internal.Instance.BriefNameKey),
+            };
+            return instance;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Port"/> to <cref="Models.Listxml.Port"/>
+        /// </summary>
+        private static Port? ConvertFromInternalModel(Models.Internal.Port? item)
+        {
+            if (item == null)
+                return null;
+
+            var port = new Port
+            {
+                Tag = item.ReadString(Models.Internal.Port.TagKey),
+            };
+
+            var analogs = item.Read<Models.Internal.Analog[]>(Models.Internal.Port.AnalogKey);
+            port.Analog = analogs?.Select(ConvertFromInternalModel)?.ToArray();
+
+            return port;
+        }
+
+        /// <summary>
+        /// Convert from <cref="RamOption"/> to <cref="Models.Listxml.RamOption"/>
+        /// </summary>
+        private static RamOption? ConvertFromInternalModel(Models.Internal.RamOption? item)
+        {
+            if (item == null)
+                return null;
+
+            var ramOption = new RamOption
+            {
+                Name = item.ReadString(Models.Internal.RamOption.NameKey),
+                Default = item.ReadString(Models.Internal.RamOption.DefaultKey),
+            };
+            return ramOption;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Rom"/> to <cref="Models.Listxml.Rom"/>
+        /// </summary>
+        private static Rom? ConvertFromInternalModel(Models.Internal.Rom? item)
+        {
+            if (item == null)
+                return null;
+
+            var rom = new Rom
+            {
+                Name = item.ReadString(Models.Internal.Rom.NameKey),
+                Bios = item.ReadString(Models.Internal.Rom.BiosKey),
+                Size = item.ReadString(Models.Internal.Rom.SizeKey),
+                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
+                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
+                Merge = item.ReadString(Models.Internal.Rom.MergeKey),
+                Region = item.ReadString(Models.Internal.Rom.RegionKey),
+                Offset = item.ReadString(Models.Internal.Rom.OffsetKey),
+                Status = item.ReadString(Models.Internal.Rom.StatusKey),
+                Optional = item.ReadString(Models.Internal.Rom.OptionalKey),
+                Dispose = item.ReadString(Models.Internal.Rom.DisposeKey),
+                SoundOnly = item.ReadString(Models.Internal.Rom.SoundOnlyKey),
+            };
+            return rom;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Sample"/> to <cref="Models.Listxml.Sample"/>
+        /// </summary>
+        private static Sample? ConvertFromInternalModel(Models.Internal.Sample? item)
+        {
+            if (item == null)
+                return null;
+
+            var sample = new Sample
+            {
+                Name = item.ReadString(Models.Internal.Sample.NameKey),
+            };
+            return sample;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Slot"/> to <cref="Models.Listxml.Slot"/>
+        /// </summary>
+        private static Slot? ConvertFromInternalModel(Models.Internal.Slot? item)
+        {
+            if (item == null)
+                return null;
+
+            var slot = new Slot
+            {
+                Name = item.ReadString(Models.Internal.Slot.NameKey),
+            };
+
+            var slotOptions = item.Read<Models.Internal.SlotOption[]>(Models.Internal.Slot.SlotOptionKey);
+            slot.SlotOption = slotOptions?.Select(ConvertFromInternalModel)?.ToArray();
+
+            return slot;
+        }
+
+        /// <summary>
+        /// Convert from <cref="SlotOption"/> to <cref="Models.Listxml.SlotOption"/>
+        /// </summary>
+        private static SlotOption? ConvertFromInternalModel(Models.Internal.SlotOption? item)
+        {
+            if (item == null)
+                return null;
+
+            var slotOption = new SlotOption
+            {
+                Name = item.ReadString(Models.Internal.SlotOption.NameKey),
+                DevName = item.ReadString(Models.Internal.SlotOption.DevNameKey),
+                Default = item.ReadString(Models.Internal.SlotOption.DefaultKey),
+            };
+            return slotOption;
+        }
+
+        /// <summary>
+        /// Convert from <cref="SoftwareList"/> to <cref="Models.Listxml.SoftwareList"/>
+        /// </summary>
+        private static SoftwareList? ConvertFromInternalModel(Models.Internal.SoftwareList? item)
+        {
+            if (item == null)
+                return null;
+
+            var softwareList = new SoftwareList
+            {
+                Tag = item.ReadString(Models.Internal.SoftwareList.TagKey),
+                Name = item.ReadString(Models.Internal.SoftwareList.NameKey),
+                Status = item.ReadString(Models.Internal.SoftwareList.StatusKey),
+                Filter = item.ReadString(Models.Internal.SoftwareList.FilterKey),
+            };
+            return softwareList;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Sound"/> to <cref="Models.Listxml.Sound"/>
+        /// </summary>
+        private static Sound? ConvertFromInternalModel(Models.Internal.Sound? item)
+        {
+            if (item == null)
+                return null;
+
+            var sound = new Sound
+            {
+                Channels = item.ReadString(Models.Internal.Sound.ChannelsKey),
+            };
+            return sound;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Video"/> to <cref="Models.Listxml.Video"/>
+        /// </summary>
+        private static Video? ConvertFromInternalModel(Models.Internal.Video? item)
+        {
+            if (item == null)
+                return null;
+
+            var video = new Video
+            {
+                Screen = item.ReadString(Models.Internal.Video.ScreenKey),
+                Orientation = item.ReadString(Models.Internal.Video.OrientationKey),
+                Width = item.ReadString(Models.Internal.Video.WidthKey),
+                Height = item.ReadString(Models.Internal.Video.HeightKey),
+                AspectX = item.ReadString(Models.Internal.Video.AspectXKey),
+                AspectY = item.ReadString(Models.Internal.Video.AspectYKey),
+                Refresh = item.ReadString(Models.Internal.Video.RefreshKey),
+            };
+            return video;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SabreTools.Serialization/Listxml.Serializer.cs b/SabreTools.Serialization/Listxml.Serializer.cs
new file mode 100644
index 00000000..986a2c08
--- /dev/null
+++ b/SabreTools.Serialization/Listxml.Serializer.cs
@@ -0,0 +1,669 @@
+using System.Linq;
+using SabreTools.Models.Listxml;
+
+namespace SabreTools.Serialization
+{
+    /// <summary>
+    /// XML serializer for MAME listxml files
+    /// </summary>
+    public partial class Listxml : XmlSerializer<Mame>
+    {
+        #region Internal
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.M1"/> to <cref="Models.Internal.MetadataFile"/>
+        /// </summary>
+        public static Models.Internal.MetadataFile ConvertToInternalModel(M1 item)
+        {
+            var metadataFile = new Models.Internal.MetadataFile
+            {
+                [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
+            };
+
+            if (item?.Game != null && item.Game.Any())
+                metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
+
+            return metadataFile;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Mame"/> to <cref="Models.Internal.MetadataFile"/>
+        /// </summary>
+        public static Models.Internal.MetadataFile ConvertToInternalModel(Mame item)
+        {
+            var metadataFile = new Models.Internal.MetadataFile
+            {
+                [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
+            };
+
+            if (item?.Game != null && item.Game.Any())
+                metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Game.Select(ConvertMachineToInternalModel).ToArray();
+
+            return metadataFile;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.M1"/> to <cref="Models.Internal.Header"/>
+        /// </summary>
+        private static Models.Internal.Header ConvertHeaderToInternalModel(M1 item)
+        {
+            var header = new Models.Internal.Header
+            {
+                [Models.Internal.Header.VersionKey] = item.Version,
+            };
+            return header;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Mame"/> to <cref="Models.Internal.Header"/>
+        /// </summary>
+        private static Models.Internal.Header ConvertHeaderToInternalModel(Mame item)
+        {
+            var header = new Models.Internal.Header
+            {
+                [Models.Internal.Header.BuildKey] = item.Build,
+                [Models.Internal.Header.DebugKey] = item.Debug,
+                [Models.Internal.Header.MameConfigKey] = item.MameConfig,
+            };
+            return header;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.GameBase"/> to <cref="Models.Internal.Machine"/>
+        /// </summary>
+        private static Models.Internal.Machine ConvertMachineToInternalModel(GameBase item)
+        {
+            var machine = new Models.Internal.Machine
+            {
+                [Models.Internal.Machine.NameKey] = item.Name,
+                [Models.Internal.Machine.SourceFileKey] = item.SourceFile,
+                [Models.Internal.Machine.IsBiosKey] = item.IsBios,
+                [Models.Internal.Machine.IsDeviceKey] = item.IsDevice,
+                [Models.Internal.Machine.IsMechanicalKey] = item.IsMechanical,
+                [Models.Internal.Machine.RunnableKey] = item.Runnable,
+                [Models.Internal.Machine.CloneOfKey] = item.CloneOf,
+                [Models.Internal.Machine.RomOfKey] = item.RomOf,
+                [Models.Internal.Machine.SampleOfKey] = item.SampleOf,
+                [Models.Internal.Machine.DescriptionKey] = item.Description,
+                [Models.Internal.Machine.YearKey] = item.Year,
+                [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer,
+                [Models.Internal.Machine.HistoryKey] = item.History,
+            };
+
+            if (item.BiosSet != null && item.BiosSet.Any())
+                machine[Models.Internal.Machine.BiosSetKey] = item.BiosSet.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Rom != null && item.Rom.Any())
+                machine[Models.Internal.Machine.RomKey] = item.Rom.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Disk != null && item.Disk.Any())
+                machine[Models.Internal.Machine.DiskKey] = item.Disk.Select(ConvertToInternalModel).ToArray();
+
+            if (item.DeviceRef != null && item.DeviceRef.Any())
+                machine[Models.Internal.Machine.DeviceRefKey] = item.DeviceRef.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Sample != null && item.Sample.Any())
+                machine[Models.Internal.Machine.SampleKey] = item.Sample.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Chip != null && item.Chip.Any())
+                machine[Models.Internal.Machine.ChipKey] = item.Chip.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Display != null && item.Display.Any())
+                machine[Models.Internal.Machine.DisplayKey] = item.Display.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Video != null && item.Video.Any())
+                machine[Models.Internal.Machine.VideoKey] = item.Video.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Sound != null)
+                machine[Models.Internal.Machine.SoundKey] = ConvertToInternalModel(item.Sound);
+
+            if (item.Input != null)
+                machine[Models.Internal.Machine.InputKey] = ConvertToInternalModel(item.Input);
+
+            if (item.DipSwitch != null && item.DipSwitch.Any())
+                machine[Models.Internal.Machine.DipSwitchKey] = item.DipSwitch.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Configuration != null && item.Configuration.Any())
+                machine[Models.Internal.Machine.ConfigurationKey] = item.Configuration.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Port != null && item.Port.Any())
+                machine[Models.Internal.Machine.PortKey] = item.Port.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Adjuster != null && item.Adjuster.Any())
+                machine[Models.Internal.Machine.AdjusterKey] = item.Adjuster.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Driver != null)
+                machine[Models.Internal.Machine.DriverKey] = ConvertToInternalModel(item.Driver);
+
+            if (item.Feature != null && item.Feature.Any())
+                machine[Models.Internal.Machine.FeatureKey] = item.Feature.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Device != null && item.Device.Any())
+                machine[Models.Internal.Machine.DeviceKey] = item.Device.Select(ConvertToInternalModel).ToArray();
+
+            if (item.Slot != null && item.Slot.Any())
+                machine[Models.Internal.Machine.SlotKey] = item.Slot.Select(ConvertToInternalModel).ToArray();
+
+            if (item.SoftwareList != null && item.SoftwareList.Any())
+                machine[Models.Internal.Machine.SoftwareListKey] = item.SoftwareList.Select(ConvertToInternalModel).ToArray();
+
+            if (item.RamOption != null && item.RamOption.Any())
+                machine[Models.Internal.Machine.RamOptionKey] = item.RamOption.Select(ConvertToInternalModel).ToArray();
+
+            return machine;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Adjuster"/> to <cref="Models.Internal.Adjuster"/>
+        /// </summary>
+        private static Models.Internal.Adjuster ConvertToInternalModel(Adjuster item)
+        {
+            var adjuster = new Models.Internal.Adjuster
+            {
+                [Models.Internal.Adjuster.NameKey] = item.Name,
+                [Models.Internal.Adjuster.DefaultKey] = item.Default,
+            };
+
+            if (item.Condition != null)
+                adjuster[Models.Internal.Adjuster.ConditionKey] = ConvertToInternalModel(item.Condition);
+
+            return adjuster;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Analog"/> to <cref="Models.Internal.Analog"/>
+        /// </summary>
+        private static Models.Internal.Analog ConvertToInternalModel(Analog item)
+        {
+            var analog = new Models.Internal.Analog
+            {
+                [Models.Internal.Analog.MaskKey] = item.Mask,
+            };
+            return analog;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.BiosSet"/> to <cref="Models.Internal.BiosSet"/>
+        /// </summary>
+        private static Models.Internal.BiosSet ConvertToInternalModel(BiosSet item)
+        {
+            var biosset = new Models.Internal.BiosSet
+            {
+                [Models.Internal.BiosSet.NameKey] = item.Name,
+                [Models.Internal.BiosSet.DescriptionKey] = item.Description,
+                [Models.Internal.BiosSet.DefaultKey] = item.Default,
+            };
+            return biosset;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Chip"/> to <cref="Models.Internal.Chip"/>
+        /// </summary>
+        private static Models.Internal.Chip ConvertToInternalModel(Chip item)
+        {
+            var chip = new Models.Internal.Chip
+            {
+                [Models.Internal.Chip.NameKey] = item.Name,
+                [Models.Internal.Chip.TagKey] = item.Tag,
+                [Models.Internal.Chip.TypeKey] = item.Type,
+                [Models.Internal.Chip.SoundOnlyKey] = item.SoundOnly,
+                [Models.Internal.Chip.ClockKey] = item.Clock,
+            };
+            return chip;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Condition"/> to <cref="Models.Internal.Condition"/>
+        /// </summary>
+        private static Models.Internal.Condition ConvertToInternalModel(Condition item)
+        {
+            var condition = new Models.Internal.Condition
+            {
+                [Models.Internal.Condition.TagKey] = item.Tag,
+                [Models.Internal.Condition.MaskKey] = item.Mask,
+                [Models.Internal.Condition.RelationKey] = item.Relation,
+                [Models.Internal.Condition.ValueKey] = item.Value,
+            };
+            return condition;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Configuration"/> to <cref="Models.Internal.Configuration"/>
+        /// </summary>
+        private static Models.Internal.Configuration ConvertToInternalModel(Configuration item)
+        {
+            var configuration = new Models.Internal.Configuration
+            {
+                [Models.Internal.Configuration.NameKey] = item.Name,
+                [Models.Internal.Configuration.TagKey] = item.Tag,
+                [Models.Internal.Configuration.MaskKey] = item.Mask,
+            };
+
+            if (item.Condition != null)
+                configuration[Models.Internal.Configuration.ConditionKey] = ConvertToInternalModel(item.Condition);
+
+            if (item.ConfLocation != null && item.ConfLocation.Any())
+                configuration[Models.Internal.Configuration.ConfLocationKey] = item.ConfLocation.Select(ConvertToInternalModel).ToArray();
+
+            if (item.ConfSetting != null && item.ConfSetting.Any())
+                configuration[Models.Internal.Configuration.ConfSettingKey] = item.ConfSetting.Select(ConvertToInternalModel).ToArray();
+
+            return configuration;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.ConfLocation"/> to <cref="Models.Internal.ConfLocation"/>
+        /// </summary>
+        private static Models.Internal.ConfLocation ConvertToInternalModel(ConfLocation item)
+        {
+            var confLocation = new Models.Internal.ConfLocation
+            {
+                [Models.Internal.ConfLocation.NameKey] = item.Name,
+                [Models.Internal.ConfLocation.NumberKey] = item.Number,
+                [Models.Internal.ConfLocation.InvertedKey] = item.Inverted,
+            };
+            return confLocation;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.ConfSetting"/> to <cref="Models.Internal.ConfSetting"/>
+        /// </summary>
+        private static Models.Internal.ConfSetting ConvertToInternalModel(ConfSetting item)
+        {
+            var confSetting = new Models.Internal.ConfSetting
+            {
+                [Models.Internal.ConfSetting.NameKey] = item.Name,
+                [Models.Internal.ConfSetting.ValueKey] = item.Value,
+                [Models.Internal.ConfSetting.DefaultKey] = item.Default,
+            };
+
+            if (item.Condition != null)
+                confSetting[Models.Internal.ConfSetting.ConditionKey] = ConvertToInternalModel(item.Condition);
+
+            return confSetting;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Control"/> to <cref="Models.Internal.Control"/>
+        /// </summary>
+        private static Models.Internal.Control ConvertToInternalModel(Control item)
+        {
+            var control = new Models.Internal.Control
+            {
+                [Models.Internal.Control.TypeKey] = item.Type,
+                [Models.Internal.Control.PlayerKey] = item.Player,
+                [Models.Internal.Control.ButtonsKey] = item.Buttons,
+                [Models.Internal.Control.ReqButtonsKey] = item.ReqButtons,
+                [Models.Internal.Control.MinimumKey] = item.Minimum,
+                [Models.Internal.Control.MaximumKey] = item.Maximum,
+                [Models.Internal.Control.SensitivityKey] = item.Sensitivity,
+                [Models.Internal.Control.KeyDeltaKey] = item.KeyDelta,
+                [Models.Internal.Control.ReverseKey] = item.Reverse,
+                [Models.Internal.Control.WaysKey] = item.Ways,
+                [Models.Internal.Control.Ways2Key] = item.Ways2,
+                [Models.Internal.Control.Ways3Key] = item.Ways3,
+            };
+            return control;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Device"/> to <cref="Models.Internal.Device"/>
+        /// </summary>
+        private static Models.Internal.Device ConvertToInternalModel(Device item)
+        {
+            var device = new Models.Internal.Device
+            {
+                [Models.Internal.Device.TypeKey] = item.Type,
+                [Models.Internal.Device.TagKey] = item.Tag,
+                [Models.Internal.Device.FixedImageKey] = item.FixedImage,
+                [Models.Internal.Device.MandatoryKey] = item.Mandatory,
+                [Models.Internal.Device.InterfaceKey] = item.Interface,
+            };
+
+            if (item.Instance != null)
+                device[Models.Internal.Device.InstanceKey] = ConvertToInternalModel(item.Instance);
+
+            if (item.Extension != null && item.Extension.Any())
+                device[Models.Internal.Device.ExtensionKey] = item.Extension.Select(ConvertToInternalModel).ToArray();
+
+            return device;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.DeviceRef"/> to <cref="Models.Internal.DeviceRef"/>
+        /// </summary>
+        private static Models.Internal.DeviceRef ConvertToInternalModel(DeviceRef item)
+        {
+            var deviceRef = new Models.Internal.DeviceRef
+            {
+                [Models.Internal.DeviceRef.NameKey] = item.Name,
+            };
+            return deviceRef;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.DipLocation"/> to <cref="Models.Internal.DipLocation"/>
+        /// </summary>
+        private static Models.Internal.DipLocation ConvertToInternalModel(DipLocation item)
+        {
+            var dipLocation = new Models.Internal.DipLocation
+            {
+                [Models.Internal.DipLocation.NameKey] = item.Name,
+                [Models.Internal.DipLocation.NumberKey] = item.Number,
+                [Models.Internal.DipLocation.InvertedKey] = item.Inverted,
+            };
+            return dipLocation;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.DipSwitch"/> to <cref="Models.Internal.DipSwitch"/>
+        /// </summary>
+        private static Models.Internal.DipSwitch ConvertToInternalModel(DipSwitch item)
+        {
+            var dipSwitch = new Models.Internal.DipSwitch
+            {
+                [Models.Internal.DipSwitch.NameKey] = item.Name,
+                [Models.Internal.DipSwitch.TagKey] = item.Tag,
+                [Models.Internal.DipSwitch.MaskKey] = item.Mask,
+            };
+
+            if (item.Condition != null)
+                dipSwitch[Models.Internal.DipSwitch.ConditionKey] = ConvertToInternalModel(item.Condition);
+
+            if (item.DipLocation != null && item.DipLocation.Any())
+                dipSwitch[Models.Internal.DipSwitch.DipLocationKey] = item.DipLocation.Select(ConvertToInternalModel).ToArray();
+
+            if (item.DipValue != null && item.DipValue.Any())
+                dipSwitch[Models.Internal.DipSwitch.DipValueKey] = item.DipValue.Select(ConvertToInternalModel).ToArray();
+
+            return dipSwitch;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.DipValue"/> to <cref="Models.Internal.DipValue"/>
+        /// </summary>
+        private static Models.Internal.DipValue ConvertToInternalModel(DipValue item)
+        {
+            var dipValue = new Models.Internal.DipValue
+            {
+                [Models.Internal.DipValue.NameKey] = item.Name,
+                [Models.Internal.DipValue.ValueKey] = item.Value,
+                [Models.Internal.DipValue.DefaultKey] = item.Default,
+            };
+
+            if (item.Condition != null)
+                dipValue[Models.Internal.DipValue.ConditionKey] = ConvertToInternalModel(item.Condition);
+
+            return dipValue;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Disk"/> to <cref="Models.Internal.Disk"/>
+        /// </summary>
+        private static Models.Internal.Disk ConvertToInternalModel(Disk item)
+        {
+            var disk = new Models.Internal.Disk
+            {
+                [Models.Internal.Disk.NameKey] = item.Name,
+                [Models.Internal.Disk.MD5Key] = item.MD5,
+                [Models.Internal.Disk.SHA1Key] = item.SHA1,
+                [Models.Internal.Disk.MergeKey] = item.Merge,
+                [Models.Internal.Disk.RegionKey] = item.Region,
+                [Models.Internal.Disk.IndexKey] = item.Index,
+                [Models.Internal.Disk.WritableKey] = item.Writable,
+                [Models.Internal.Disk.StatusKey] = item.Status,
+                [Models.Internal.Disk.OptionalKey] = item.Optional,
+            };
+            return disk;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Display"/> to <cref="Models.Internal.Display"/>
+        /// </summary>
+        private static Models.Internal.Display ConvertToInternalModel(Display item)
+        {
+            var display = new Models.Internal.Display
+            {
+                [Models.Internal.Display.TagKey] = item.Tag,
+                [Models.Internal.Display.TypeKey] = item.Type,
+                [Models.Internal.Display.RotateKey] = item.Rotate,
+                [Models.Internal.Display.FlipXKey] = item.FlipX,
+                [Models.Internal.Display.WidthKey] = item.Width,
+                [Models.Internal.Display.HeightKey] = item.Height,
+                [Models.Internal.Display.RefreshKey] = item.Refresh,
+                [Models.Internal.Display.PixClockKey] = item.PixClock,
+                [Models.Internal.Display.HTotalKey] = item.HTotal,
+                [Models.Internal.Display.HBEndKey] = item.HBEnd,
+                [Models.Internal.Display.HBStartKey] = item.HBStart,
+                [Models.Internal.Display.VTotalKey] = item.VTotal,
+                [Models.Internal.Display.VBEndKey] = item.VBEnd,
+                [Models.Internal.Display.VBStartKey] = item.VBStart,
+            };
+            return display;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Driver"/> to <cref="Models.Internal.Driver"/>
+        /// </summary>
+        private static Models.Internal.Driver ConvertToInternalModel(Driver item)
+        {
+            var driver = new Models.Internal.Driver
+            {
+                [Models.Internal.Driver.StatusKey] = item.Status,
+                [Models.Internal.Driver.ColorKey] = item.Color,
+                [Models.Internal.Driver.SoundKey] = item.Sound,
+                [Models.Internal.Driver.PaletteSizeKey] = item.PaletteSize,
+                [Models.Internal.Driver.EmulationKey] = item.Emulation,
+                [Models.Internal.Driver.CocktailKey] = item.Cocktail,
+                [Models.Internal.Driver.SaveStateKey] = item.SaveState,
+                [Models.Internal.Driver.RequiresArtworkKey] = item.RequiresArtwork,
+                [Models.Internal.Driver.UnofficialKey] = item.Unofficial,
+                [Models.Internal.Driver.NoSoundHardwareKey] = item.NoSoundHardware,
+                [Models.Internal.Driver.IncompleteKey] = item.Incomplete,
+            };
+            return driver;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Extension"/> to <cref="Models.Internal.Extension"/>
+        /// </summary>
+        private static Models.Internal.Extension ConvertToInternalModel(Extension item)
+        {
+            var extension = new Models.Internal.Extension
+            {
+                [Models.Internal.Extension.NameKey] = item.Name,
+            };
+            return extension;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Feature"/> to <cref="Models.Internal.Feature"/>
+        /// </summary>
+        private static Models.Internal.Feature ConvertToInternalModel(Feature item)
+        {
+            var feature = new Models.Internal.Feature
+            {
+                [Models.Internal.Feature.TypeKey] = item.Type,
+                [Models.Internal.Feature.StatusKey] = item.Status,
+                [Models.Internal.Feature.OverallKey] = item.Overall,
+            };
+            return feature;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Input"/> to <cref="Models.Internal.Input"/>
+        /// </summary>
+        private static Models.Internal.Input ConvertToInternalModel(Input item)
+        {
+            var input = new Models.Internal.Input
+            {
+                [Models.Internal.Input.ServiceKey] = item.Service,
+                [Models.Internal.Input.TiltKey] = item.Tilt,
+                [Models.Internal.Input.PlayersKey] = item.Players,
+                [Models.Internal.Input.ControlKey] = item.ControlAttr,
+                [Models.Internal.Input.ButtonsKey] = item.Buttons,
+                [Models.Internal.Input.CoinsKey] = item.Coins,
+            };
+
+            if (item.Control != null && item.Control.Any())
+                input[Models.Internal.Input.ControlKey] = item.Control.Select(ConvertToInternalModel).ToArray();
+
+            return input;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Instance"/> to <cref="Models.Internal.Instance"/>
+        /// </summary>
+        private static Models.Internal.Instance ConvertToInternalModel(Instance item)
+        {
+            var instance = new Models.Internal.Instance
+            {
+                [Models.Internal.Instance.NameKey] = item.Name,
+                [Models.Internal.Instance.BriefNameKey] = item.BriefName,
+            };
+            return instance;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Port"/> to <cref="Models.Internal.Port"/>
+        /// </summary>
+        private static Models.Internal.Port ConvertToInternalModel(Port item)
+        {
+            var port = new Models.Internal.Port
+            {
+                [Models.Internal.Port.TagKey] = item.Tag,
+            };
+
+            if (item.Analog != null && item.Analog.Any())
+                port[Models.Internal.Port.AnalogKey] = item.Analog.Select(ConvertToInternalModel).ToArray();
+
+            return port;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.RamOption"/> to <cref="Models.Internal.RamOption"/>
+        /// </summary>
+        private static Models.Internal.RamOption ConvertToInternalModel(RamOption item)
+        {
+            var ramOption = new Models.Internal.RamOption
+            {
+                [Models.Internal.RamOption.NameKey] = item.Name,
+                [Models.Internal.RamOption.DefaultKey] = item.Default,
+            };
+            return ramOption;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Rom"/> to <cref="Models.Internal.Rom"/>
+        /// </summary>
+        private static Models.Internal.Rom ConvertToInternalModel(Rom item)
+        {
+            var rom = new Models.Internal.Rom
+            {
+                [Models.Internal.Rom.NameKey] = item.Name,
+                [Models.Internal.Rom.BiosKey] = item.Bios,
+                [Models.Internal.Rom.SizeKey] = item.Size,
+                [Models.Internal.Rom.CRCKey] = item.CRC,
+                [Models.Internal.Rom.SHA1Key] = item.SHA1,
+                [Models.Internal.Rom.MergeKey] = item.Merge,
+                [Models.Internal.Rom.RegionKey] = item.Region,
+                [Models.Internal.Rom.OffsetKey] = item.Offset,
+                [Models.Internal.Rom.StatusKey] = item.Status,
+                [Models.Internal.Rom.OptionalKey] = item.Optional,
+                [Models.Internal.Rom.DisposeKey] = item.Dispose,
+                [Models.Internal.Rom.SoundOnlyKey] = item.SoundOnly,
+            };
+            return rom;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Sample"/> to <cref="Models.Internal.Sample"/>
+        /// </summary>
+        private static Models.Internal.Sample ConvertToInternalModel(Sample item)
+        {
+            var sample = new Models.Internal.Sample
+            {
+                [Models.Internal.Sample.NameKey] = item.Name,
+            };
+            return sample;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Slot"/> to <cref="Models.Internal.Slot"/>
+        /// </summary>
+        private static Models.Internal.Slot ConvertToInternalModel(Slot item)
+        {
+            var slot = new Models.Internal.Slot
+            {
+                [Models.Internal.Slot.NameKey] = item.Name,
+            };
+
+            if (item.SlotOption != null && item.SlotOption.Any())
+                slot[Models.Internal.Slot.SlotOptionKey] = item.SlotOption.Select(ConvertToInternalModel).ToArray();
+
+            return slot;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.SlotOption"/> to <cref="Models.Internal.SlotOption"/>
+        /// </summary>
+        private static Models.Internal.SlotOption ConvertToInternalModel(SlotOption item)
+        {
+            var slotOption = new Models.Internal.SlotOption
+            {
+                [Models.Internal.SlotOption.NameKey] = item.Name,
+                [Models.Internal.SlotOption.DevNameKey] = item.DevName,
+                [Models.Internal.SlotOption.DefaultKey] = item.Default,
+            };
+            return slotOption;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.SoftwareList"/> to <cref="Models.Internal.SoftwareList"/>
+        /// </summary>
+        private static Models.Internal.SoftwareList ConvertToInternalModel(SoftwareList item)
+        {
+            var softwareList = new Models.Internal.SoftwareList
+            {
+                [Models.Internal.SoftwareList.TagKey] = item.Tag,
+                [Models.Internal.SoftwareList.NameKey] = item.Name,
+                [Models.Internal.SoftwareList.StatusKey] = item.Status,
+                [Models.Internal.SoftwareList.FilterKey] = item.Filter,
+            };
+            return softwareList;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Sound"/> to <cref="Models.Internal.Sound"/>
+        /// </summary>
+        private static Models.Internal.Sound ConvertToInternalModel(Sound item)
+        {
+            var sound = new Models.Internal.Sound
+            {
+                [Models.Internal.Sound.ChannelsKey] = item.Channels,
+            };
+            return sound;
+        }
+
+        /// <summary>
+        /// Convert from <cref="Models.Listxml.Video"/> to <cref="Models.Internal.Video"/>
+        /// </summary>
+        private static Models.Internal.Video ConvertToInternalModel(Video item)
+        {
+            var video = new Models.Internal.Video
+            {
+                [Models.Internal.Video.ScreenKey] = item.Screen,
+                [Models.Internal.Video.OrientationKey] = item.Orientation,
+                [Models.Internal.Video.WidthKey] = item.Width,
+                [Models.Internal.Video.HeightKey] = item.Height,
+                [Models.Internal.Video.AspectXKey] = item.AspectX,
+                [Models.Internal.Video.AspectYKey] = item.AspectY,
+                [Models.Internal.Video.RefreshKey] = item.Refresh,
+            };
+            return video;
+        }
+
+        #endregion
+    
+    }
+}
\ No newline at end of file
diff --git a/SabreTools.Serialization/Listxml.cs b/SabreTools.Serialization/Listxml.cs
deleted file mode 100644
index c4a13156..00000000
--- a/SabreTools.Serialization/Listxml.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SabreTools.Serialization
-{
-    /// <summary>
-    /// XML deserializer for MAME listxml files
-    /// </summary>
-    public class Listxml : XmlSerializer<Models.Listxml.Mame> { }
-}
\ No newline at end of file