diff --git a/SabreTools.Serialization/Internal.ArchiveDotOrg.cs b/SabreTools.Serialization/Internal.ArchiveDotOrg.cs
index 36850327..cb11f139 100644
--- a/SabreTools.Serialization/Internal.ArchiveDotOrg.cs
+++ b/SabreTools.Serialization/Internal.ArchiveDotOrg.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -10,99 +11,99 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.ArchiveDotOrg.Files"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.ArchiveDotOrg.Files"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromArchiveDotOrg(Models.ArchiveDotOrg.Files item)
+        public static Header ConvertHeaderFromArchiveDotOrg(Models.ArchiveDotOrg.Files item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NameKey] = "archive.org",
+                [Header.NameKey] = "archive.org",
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
+        public static Machine ConvertMachineFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.RomKey] = ConvertFromArchiveDotOrg(item),
+                [Machine.RomKey] = ConvertFromArchiveDotOrg(item),
             };
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
+        public static Rom ConvertFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.Name,
-                [Models.Internal.Rom.SourceKey] = item.Source,
-                [Models.Internal.Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash,
-                [Models.Internal.Rom.LastModifiedTimeKey] = item.LastModifiedTime,
-                [Models.Internal.Rom.SizeKey] = item.Size,
-                [Models.Internal.Rom.MD5Key] = item.MD5,
-                [Models.Internal.Rom.CRCKey] = item.CRC32,
-                [Models.Internal.Rom.SHA1Key] = item.SHA1,
-                [Models.Internal.Rom.FileCountKey] = item.FileCount,
-                [Models.Internal.Rom.FormatKey] = item.Format,
-                [Models.Internal.Rom.OriginalKey] = item.Original,
-                [Models.Internal.Rom.SummationKey] = item.Summation,
-                [Models.Internal.Rom.MatrixNumberKey] = item.MatrixNumber,
-                [Models.Internal.Rom.CollectionCatalogNumberKey] = item.CollectionCatalogNumber,
-                [Models.Internal.Rom.PublisherKey] = item.Publisher,
-                [Models.Internal.Rom.CommentKey] = item.Comment,
+                [Rom.NameKey] = item.Name,
+                [Rom.SourceKey] = item.Source,
+                [Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash,
+                [Rom.LastModifiedTimeKey] = item.LastModifiedTime,
+                [Rom.SizeKey] = item.Size,
+                [Rom.MD5Key] = item.MD5,
+                [Rom.CRCKey] = item.CRC32,
+                [Rom.SHA1Key] = item.SHA1,
+                [Rom.FileCountKey] = item.FileCount,
+                [Rom.FormatKey] = item.Format,
+                [Rom.OriginalKey] = item.Original,
+                [Rom.SummationKey] = item.Summation,
+                [Rom.MatrixNumberKey] = item.MatrixNumber,
+                [Rom.CollectionCatalogNumberKey] = item.CollectionCatalogNumber,
+                [Rom.PublisherKey] = item.Publisher,
+                [Rom.CommentKey] = item.Comment,
 
-                [Models.Internal.Rom.ASRDetectedLangKey] = item.ASRDetectedLang,
-                [Models.Internal.Rom.ASRDetectedLangConfKey] = item.ASRDetectedLangConf,
-                [Models.Internal.Rom.ASRTranscribedLangKey] = item.ASRTranscribedLang,
-                [Models.Internal.Rom.WhisperASRModuleVersionKey] = item.WhisperASRModuleVersion,
-                [Models.Internal.Rom.WhisperModelHashKey] = item.WhisperModelHash,
-                [Models.Internal.Rom.WhisperModelNameKey] = item.WhisperModelName,
-                [Models.Internal.Rom.WhisperVersionKey] = item.WhisperVersion,
+                [Rom.ASRDetectedLangKey] = item.ASRDetectedLang,
+                [Rom.ASRDetectedLangConfKey] = item.ASRDetectedLangConf,
+                [Rom.ASRTranscribedLangKey] = item.ASRTranscribedLang,
+                [Rom.WhisperASRModuleVersionKey] = item.WhisperASRModuleVersion,
+                [Rom.WhisperModelHashKey] = item.WhisperModelHash,
+                [Rom.WhisperModelNameKey] = item.WhisperModelName,
+                [Rom.WhisperVersionKey] = item.WhisperVersion,
 
-                [Models.Internal.Rom.ClothCoverDetectionModuleVersionKey] = item.ClothCoverDetectionModuleVersion,
-                [Models.Internal.Rom.hOCRCharToWordhOCRVersionKey] = item.hOCRCharToWordhOCRVersion,
-                [Models.Internal.Rom.hOCRCharToWordModuleVersionKey] = item.hOCRCharToWordModuleVersion,
-                [Models.Internal.Rom.hOCRFtsTexthOCRVersionKey] = item.hOCRFtsTexthOCRVersion,
-                [Models.Internal.Rom.hOCRFtsTextModuleVersionKey] = item.hOCRFtsTextModuleVersion,
-                [Models.Internal.Rom.hOCRPageIndexhOCRVersionKey] = item.hOCRPageIndexhOCRVersion,
-                [Models.Internal.Rom.hOCRPageIndexModuleVersionKey] = item.hOCRPageIndexModuleVersion,
-                [Models.Internal.Rom.TesseractOCRKey] = item.TesseractOCR,
-                [Models.Internal.Rom.TesseractOCRConvertedKey] = item.TesseractOCRConverted,
-                [Models.Internal.Rom.TesseractOCRDetectedLangKey] = item.TesseractOCRDetectedLang,
-                [Models.Internal.Rom.TesseractOCRDetectedLangConfKey] = item.TesseractOCRDetectedLangConf,
-                [Models.Internal.Rom.TesseractOCRDetectedScriptKey] = item.TesseractOCRDetectedScript,
-                [Models.Internal.Rom.TesseractOCRDetectedScriptConfKey] = item.TesseractOCRDetectedScriptConf,
-                [Models.Internal.Rom.TesseractOCRModuleVersionKey] = item.TesseractOCRModuleVersion,
-                [Models.Internal.Rom.TesseractOCRParametersKey] = item.TesseractOCRParameters,
-                [Models.Internal.Rom.PDFModuleVersionKey] = item.PDFModuleVersion,
-                [Models.Internal.Rom.WordConfidenceInterval0To10Key] = item.WordConfidenceInterval0To10,
-                [Models.Internal.Rom.WordConfidenceInterval11To20Key] = item.WordConfidenceInterval11To20,
-                [Models.Internal.Rom.WordConfidenceInterval21To30Key] = item.WordConfidenceInterval21To30,
-                [Models.Internal.Rom.WordConfidenceInterval31To40Key] = item.WordConfidenceInterval31To40,
-                [Models.Internal.Rom.WordConfidenceInterval41To50Key] = item.WordConfidenceInterval41To50,
-                [Models.Internal.Rom.WordConfidenceInterval51To60Key] = item.WordConfidenceInterval51To60,
-                [Models.Internal.Rom.WordConfidenceInterval61To70Key] = item.WordConfidenceInterval61To70,
-                [Models.Internal.Rom.WordConfidenceInterval71To80Key] = item.WordConfidenceInterval71To80,
-                [Models.Internal.Rom.WordConfidenceInterval81To90Key] = item.WordConfidenceInterval81To90,
-                [Models.Internal.Rom.WordConfidenceInterval91To100Key] = item.WordConfidenceInterval91To100,
+                [Rom.ClothCoverDetectionModuleVersionKey] = item.ClothCoverDetectionModuleVersion,
+                [Rom.hOCRCharToWordhOCRVersionKey] = item.hOCRCharToWordhOCRVersion,
+                [Rom.hOCRCharToWordModuleVersionKey] = item.hOCRCharToWordModuleVersion,
+                [Rom.hOCRFtsTexthOCRVersionKey] = item.hOCRFtsTexthOCRVersion,
+                [Rom.hOCRFtsTextModuleVersionKey] = item.hOCRFtsTextModuleVersion,
+                [Rom.hOCRPageIndexhOCRVersionKey] = item.hOCRPageIndexhOCRVersion,
+                [Rom.hOCRPageIndexModuleVersionKey] = item.hOCRPageIndexModuleVersion,
+                [Rom.TesseractOCRKey] = item.TesseractOCR,
+                [Rom.TesseractOCRConvertedKey] = item.TesseractOCRConverted,
+                [Rom.TesseractOCRDetectedLangKey] = item.TesseractOCRDetectedLang,
+                [Rom.TesseractOCRDetectedLangConfKey] = item.TesseractOCRDetectedLangConf,
+                [Rom.TesseractOCRDetectedScriptKey] = item.TesseractOCRDetectedScript,
+                [Rom.TesseractOCRDetectedScriptConfKey] = item.TesseractOCRDetectedScriptConf,
+                [Rom.TesseractOCRModuleVersionKey] = item.TesseractOCRModuleVersion,
+                [Rom.TesseractOCRParametersKey] = item.TesseractOCRParameters,
+                [Rom.PDFModuleVersionKey] = item.PDFModuleVersion,
+                [Rom.WordConfidenceInterval0To10Key] = item.WordConfidenceInterval0To10,
+                [Rom.WordConfidenceInterval11To20Key] = item.WordConfidenceInterval11To20,
+                [Rom.WordConfidenceInterval21To30Key] = item.WordConfidenceInterval21To30,
+                [Rom.WordConfidenceInterval31To40Key] = item.WordConfidenceInterval31To40,
+                [Rom.WordConfidenceInterval41To50Key] = item.WordConfidenceInterval41To50,
+                [Rom.WordConfidenceInterval51To60Key] = item.WordConfidenceInterval51To60,
+                [Rom.WordConfidenceInterval61To70Key] = item.WordConfidenceInterval61To70,
+                [Rom.WordConfidenceInterval71To80Key] = item.WordConfidenceInterval71To80,
+                [Rom.WordConfidenceInterval81To90Key] = item.WordConfidenceInterval81To90,
+                [Rom.WordConfidenceInterval91To100Key] = item.WordConfidenceInterval91To100,
 
-                [Models.Internal.Rom.AlbumKey] = item.Album,
-                [Models.Internal.Rom.ArtistKey] = item.Artist,
-                [Models.Internal.Rom.BitrateKey] = item.Bitrate,
-                [Models.Internal.Rom.CreatorKey] = item.Creator,
-                [Models.Internal.Rom.HeightKey] = item.Height,
-                [Models.Internal.Rom.LengthKey] = item.Length,
-                [Models.Internal.Rom.PreviewImageKey] = item.PreviewImage,
-                [Models.Internal.Rom.RotationKey] = item.Rotation,
-                [Models.Internal.Rom.TitleKey] = item.Title,
-                [Models.Internal.Rom.TrackKey] = item.Track,
-                [Models.Internal.Rom.WidthKey] = item.Width,
+                [Rom.AlbumKey] = item.Album,
+                [Rom.ArtistKey] = item.Artist,
+                [Rom.BitrateKey] = item.Bitrate,
+                [Rom.CreatorKey] = item.Creator,
+                [Rom.HeightKey] = item.Height,
+                [Rom.LengthKey] = item.Length,
+                [Rom.PreviewImageKey] = item.PreviewImage,
+                [Rom.RotationKey] = item.Rotation,
+                [Rom.TitleKey] = item.Title,
+                [Rom.TrackKey] = item.Track,
+                [Rom.WidthKey] = item.Width,
             };
             return rom;
         }
@@ -112,89 +113,89 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.ArchiveDotOrg.File"/>
+        /// Convert from <cref="Machine"/> to an array of <cref="Models.ArchiveDotOrg.File"/>
         /// </summary>
-        public static Models.ArchiveDotOrg.File?[]? ConvertMachineToArchiveDotOrg(Models.Internal.Machine? item)
+        public static Models.ArchiveDotOrg.File?[]? ConvertMachineToArchiveDotOrg(Machine? item)
         {
             if (item == null)
                 return null;
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             return roms?.Select(ConvertToArchiveDotOrg)?.ToArray();
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.ArchiveDotOrg.File"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.ArchiveDotOrg.File"/>
         /// </summary>
-        private static Models.ArchiveDotOrg.File? ConvertToArchiveDotOrg(Models.Internal.Rom? item)
+        private static Models.ArchiveDotOrg.File? ConvertToArchiveDotOrg(Rom? item)
         {
             if (item == null)
                 return null;
 
             var file = new Models.ArchiveDotOrg.File
             {
-                Name = item.ReadString(Models.Internal.Rom.NameKey),
-                Source = item.ReadString(Models.Internal.Rom.SourceKey),
-                BitTorrentMagnetHash = item.ReadString(Models.Internal.Rom.BitTorrentMagnetHashKey),
-                LastModifiedTime = item.ReadString(Models.Internal.Rom.LastModifiedTimeKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
-                MD5 = item.ReadString(Models.Internal.Rom.MD5Key),
-                CRC32 = item.ReadString(Models.Internal.Rom.CRCKey),
-                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
-                FileCount = item.ReadString(Models.Internal.Rom.FileCountKey),
-                Format = item.ReadString(Models.Internal.Rom.FormatKey),
-                Original = item.ReadString(Models.Internal.Rom.OriginalKey),
-                Summation = item.ReadString(Models.Internal.Rom.SummationKey),
-                MatrixNumber = item.ReadString(Models.Internal.Rom.MatrixNumberKey),
-                CollectionCatalogNumber = item.ReadString(Models.Internal.Rom.CollectionCatalogNumberKey),
-                Comment = item.ReadString(Models.Internal.Rom.CommentKey),
+                Name = item.ReadString(Rom.NameKey),
+                Source = item.ReadString(Rom.SourceKey),
+                BitTorrentMagnetHash = item.ReadString(Rom.BitTorrentMagnetHashKey),
+                LastModifiedTime = item.ReadString(Rom.LastModifiedTimeKey),
+                Size = item.ReadString(Rom.SizeKey),
+                MD5 = item.ReadString(Rom.MD5Key),
+                CRC32 = item.ReadString(Rom.CRCKey),
+                SHA1 = item.ReadString(Rom.SHA1Key),
+                FileCount = item.ReadString(Rom.FileCountKey),
+                Format = item.ReadString(Rom.FormatKey),
+                Original = item.ReadString(Rom.OriginalKey),
+                Summation = item.ReadString(Rom.SummationKey),
+                MatrixNumber = item.ReadString(Rom.MatrixNumberKey),
+                CollectionCatalogNumber = item.ReadString(Rom.CollectionCatalogNumberKey),
+                Comment = item.ReadString(Rom.CommentKey),
 
-                ASRDetectedLang = item.ReadString(Models.Internal.Rom.ASRDetectedLangKey),
-                ASRDetectedLangConf = item.ReadString(Models.Internal.Rom.ASRDetectedLangConfKey),
-                ASRTranscribedLang = item.ReadString(Models.Internal.Rom.ASRTranscribedLangKey),
-                WhisperASRModuleVersion = item.ReadString(Models.Internal.Rom.WhisperASRModuleVersionKey),
-                WhisperModelHash = item.ReadString(Models.Internal.Rom.WhisperModelHashKey),
-                WhisperModelName = item.ReadString(Models.Internal.Rom.WhisperModelNameKey),
-                WhisperVersion = item.ReadString(Models.Internal.Rom.WhisperVersionKey),
+                ASRDetectedLang = item.ReadString(Rom.ASRDetectedLangKey),
+                ASRDetectedLangConf = item.ReadString(Rom.ASRDetectedLangConfKey),
+                ASRTranscribedLang = item.ReadString(Rom.ASRTranscribedLangKey),
+                WhisperASRModuleVersion = item.ReadString(Rom.WhisperASRModuleVersionKey),
+                WhisperModelHash = item.ReadString(Rom.WhisperModelHashKey),
+                WhisperModelName = item.ReadString(Rom.WhisperModelNameKey),
+                WhisperVersion = item.ReadString(Rom.WhisperVersionKey),
 
-                ClothCoverDetectionModuleVersion = item.ReadString(Models.Internal.Rom.ClothCoverDetectionModuleVersionKey),
-                hOCRCharToWordhOCRVersion = item.ReadString(Models.Internal.Rom.hOCRCharToWordhOCRVersionKey),
-                hOCRCharToWordModuleVersion = item.ReadString(Models.Internal.Rom.hOCRCharToWordModuleVersionKey),
-                hOCRFtsTexthOCRVersion = item.ReadString(Models.Internal.Rom.hOCRFtsTexthOCRVersionKey),
-                hOCRFtsTextModuleVersion = item.ReadString(Models.Internal.Rom.hOCRFtsTextModuleVersionKey),
-                hOCRPageIndexhOCRVersion = item.ReadString(Models.Internal.Rom.hOCRPageIndexhOCRVersionKey),
-                hOCRPageIndexModuleVersion = item.ReadString(Models.Internal.Rom.hOCRPageIndexModuleVersionKey),
-                TesseractOCR = item.ReadString(key: Models.Internal.Rom.TesseractOCRKey),
-                TesseractOCRConverted = item.ReadString(Models.Internal.Rom.TesseractOCRConvertedKey),
-                TesseractOCRDetectedLang = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedLangKey),
-                TesseractOCRDetectedLangConf = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedLangConfKey),
-                TesseractOCRDetectedScript = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedScriptKey),
-                TesseractOCRDetectedScriptConf = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedScriptConfKey),
-                TesseractOCRModuleVersion = item.ReadString(Models.Internal.Rom.TesseractOCRModuleVersionKey),
-                TesseractOCRParameters = item.ReadString(Models.Internal.Rom.TesseractOCRParametersKey),
-                PDFModuleVersion = item.ReadString(Models.Internal.Rom.PDFModuleVersionKey),
-                WordConfidenceInterval0To10 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval0To10Key),
-                WordConfidenceInterval11To20 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval11To20Key),
-                WordConfidenceInterval21To30 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval21To30Key),
-                WordConfidenceInterval31To40 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval31To40Key),
-                WordConfidenceInterval41To50 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval41To50Key),
-                WordConfidenceInterval51To60 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval51To60Key),
-                WordConfidenceInterval61To70 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval61To70Key),
-                WordConfidenceInterval71To80 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval71To80Key),
-                WordConfidenceInterval81To90 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval81To90Key),
-                WordConfidenceInterval91To100 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval91To100Key),
+                ClothCoverDetectionModuleVersion = item.ReadString(Rom.ClothCoverDetectionModuleVersionKey),
+                hOCRCharToWordhOCRVersion = item.ReadString(Rom.hOCRCharToWordhOCRVersionKey),
+                hOCRCharToWordModuleVersion = item.ReadString(Rom.hOCRCharToWordModuleVersionKey),
+                hOCRFtsTexthOCRVersion = item.ReadString(Rom.hOCRFtsTexthOCRVersionKey),
+                hOCRFtsTextModuleVersion = item.ReadString(Rom.hOCRFtsTextModuleVersionKey),
+                hOCRPageIndexhOCRVersion = item.ReadString(Rom.hOCRPageIndexhOCRVersionKey),
+                hOCRPageIndexModuleVersion = item.ReadString(Rom.hOCRPageIndexModuleVersionKey),
+                TesseractOCR = item.ReadString(key: Rom.TesseractOCRKey),
+                TesseractOCRConverted = item.ReadString(Rom.TesseractOCRConvertedKey),
+                TesseractOCRDetectedLang = item.ReadString(Rom.TesseractOCRDetectedLangKey),
+                TesseractOCRDetectedLangConf = item.ReadString(Rom.TesseractOCRDetectedLangConfKey),
+                TesseractOCRDetectedScript = item.ReadString(Rom.TesseractOCRDetectedScriptKey),
+                TesseractOCRDetectedScriptConf = item.ReadString(Rom.TesseractOCRDetectedScriptConfKey),
+                TesseractOCRModuleVersion = item.ReadString(Rom.TesseractOCRModuleVersionKey),
+                TesseractOCRParameters = item.ReadString(Rom.TesseractOCRParametersKey),
+                PDFModuleVersion = item.ReadString(Rom.PDFModuleVersionKey),
+                WordConfidenceInterval0To10 = item.ReadString(Rom.WordConfidenceInterval0To10Key),
+                WordConfidenceInterval11To20 = item.ReadString(Rom.WordConfidenceInterval11To20Key),
+                WordConfidenceInterval21To30 = item.ReadString(Rom.WordConfidenceInterval21To30Key),
+                WordConfidenceInterval31To40 = item.ReadString(Rom.WordConfidenceInterval31To40Key),
+                WordConfidenceInterval41To50 = item.ReadString(Rom.WordConfidenceInterval41To50Key),
+                WordConfidenceInterval51To60 = item.ReadString(Rom.WordConfidenceInterval51To60Key),
+                WordConfidenceInterval61To70 = item.ReadString(Rom.WordConfidenceInterval61To70Key),
+                WordConfidenceInterval71To80 = item.ReadString(Rom.WordConfidenceInterval71To80Key),
+                WordConfidenceInterval81To90 = item.ReadString(Rom.WordConfidenceInterval81To90Key),
+                WordConfidenceInterval91To100 = item.ReadString(Rom.WordConfidenceInterval91To100Key),
 
-                Album = item.ReadString(Models.Internal.Rom.AlbumKey),
-                Artist = item.ReadString(Models.Internal.Rom.ArtistKey),
-                Bitrate = item.ReadString(Models.Internal.Rom.BitrateKey),
-                Creator = item.ReadString(Models.Internal.Rom.CreatorKey),
-                Height = item.ReadString(Models.Internal.Rom.HeightKey),
-                Length = item.ReadString(Models.Internal.Rom.LengthKey),
-                PreviewImage = item.ReadString(Models.Internal.Rom.PreviewImageKey),
-                Rotation = item.ReadString(Models.Internal.Rom.RotationKey),
-                Title = item.ReadString(Models.Internal.Rom.TitleKey),
-                Track = item.ReadString(Models.Internal.Rom.TrackKey),
-                Width = item.ReadString(Models.Internal.Rom.WidthKey),
+                Album = item.ReadString(Rom.AlbumKey),
+                Artist = item.ReadString(Rom.ArtistKey),
+                Bitrate = item.ReadString(Rom.BitrateKey),
+                Creator = item.ReadString(Rom.CreatorKey),
+                Height = item.ReadString(Rom.HeightKey),
+                Length = item.ReadString(Rom.LengthKey),
+                PreviewImage = item.ReadString(Rom.PreviewImageKey),
+                Rotation = item.ReadString(Rom.RotationKey),
+                Title = item.ReadString(Rom.TitleKey),
+                Track = item.ReadString(Rom.TrackKey),
+                Width = item.ReadString(Rom.WidthKey),
             };
             return file;
         }
diff --git a/SabreTools.Serialization/Internal.AttractMode.cs b/SabreTools.Serialization/Internal.AttractMode.cs
index 392bef5e..cd2b02dc 100644
--- a/SabreTools.Serialization/Internal.AttractMode.cs
+++ b/SabreTools.Serialization/Internal.AttractMode.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -10,59 +11,59 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.AttractMode.MetadataFile"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.AttractMode.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromAttractMode(Models.AttractMode.MetadataFile item)
+        public static Header ConvertHeaderFromAttractMode(Models.AttractMode.MetadataFile item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.HeaderKey] = item.Header,
+                [Header.HeaderKey] = item.Header,
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromAttractMode(Models.AttractMode.Row item)
+        public static Machine ConvertMachineFromAttractMode(Models.AttractMode.Row item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.NameKey] = item.Name,
-                [Models.Internal.Machine.EmulatorKey] = item.Emulator,
-                [Models.Internal.Machine.CloneOfKey] = item.CloneOf,
-                [Models.Internal.Machine.YearKey] = item.Year,
-                [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer,
-                [Models.Internal.Machine.CategoryKey] = item.Category,
-                [Models.Internal.Machine.PlayersKey] = item.Players,
-                [Models.Internal.Machine.RotationKey] = item.Rotation,
-                [Models.Internal.Machine.ControlKey] = item.Control,
-                [Models.Internal.Machine.StatusKey] = item.Status,
-                [Models.Internal.Machine.DisplayCountKey] = item.DisplayCount,
-                [Models.Internal.Machine.DisplayTypeKey] = item.DisplayType,
-                [Models.Internal.Machine.ExtraKey] = item.Extra,
-                [Models.Internal.Machine.ButtonsKey] = item.Buttons,
-                [Models.Internal.Machine.FavoriteKey] = item.Favorite,
-                [Models.Internal.Machine.TagsKey] = item.Tags,
-                [Models.Internal.Machine.PlayedCountKey] = item.PlayedCount,
-                [Models.Internal.Machine.PlayedTimeKey] = item.PlayedTime,
-                [Models.Internal.Machine.PlayedTimeKey] = item.PlayedTime,
-                [Models.Internal.Machine.RomKey] = ConvertFromAttractMode(item),
+                [Machine.NameKey] = item.Name,
+                [Machine.EmulatorKey] = item.Emulator,
+                [Machine.CloneOfKey] = item.CloneOf,
+                [Machine.YearKey] = item.Year,
+                [Machine.ManufacturerKey] = item.Manufacturer,
+                [Machine.CategoryKey] = item.Category,
+                [Machine.PlayersKey] = item.Players,
+                [Machine.RotationKey] = item.Rotation,
+                [Machine.ControlKey] = item.Control,
+                [Machine.StatusKey] = item.Status,
+                [Machine.DisplayCountKey] = item.DisplayCount,
+                [Machine.DisplayTypeKey] = item.DisplayType,
+                [Machine.ExtraKey] = item.Extra,
+                [Machine.ButtonsKey] = item.Buttons,
+                [Machine.FavoriteKey] = item.Favorite,
+                [Machine.TagsKey] = item.Tags,
+                [Machine.PlayedCountKey] = item.PlayedCount,
+                [Machine.PlayedTimeKey] = item.PlayedTime,
+                [Machine.PlayedTimeKey] = item.PlayedTime,
+                [Machine.RomKey] = ConvertFromAttractMode(item),
             };
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromAttractMode(Models.AttractMode.Row item)
+        public static Rom ConvertFromAttractMode(Models.AttractMode.Row item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.Title,
-                [Models.Internal.Rom.AltRomnameKey] = item.AltRomname,
-                [Models.Internal.Rom.AltTitleKey] = item.AltTitle,
-                [Models.Internal.Rom.FileIsAvailableKey] = item.FileIsAvailable,
+                [Rom.NameKey] = item.Title,
+                [Rom.AltRomnameKey] = item.AltRomname,
+                [Rom.AltTitleKey] = item.AltTitle,
+                [Rom.FileIsAvailableKey] = item.FileIsAvailable,
             };
             return rom;
         }
@@ -72,29 +73,29 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.AttractMode.MetadataFile"/>
+        /// Convert from <cref="Header"/> to <cref="Models.AttractMode.MetadataFile"/>
         /// </summary>
-        public static Models.AttractMode.MetadataFile? ConvertHeaderToAttractMode(Models.Internal.Header? item)
+        public static Models.AttractMode.MetadataFile? ConvertHeaderToAttractMode(Header? item)
         {
             if (item == null)
                 return null;
 
             var metadataFile = new Models.AttractMode.MetadataFile
             {
-                Header = item.ReadStringArray(Models.Internal.Header.HeaderKey),
+                Header = item.ReadStringArray(Header.HeaderKey),
             };
             return metadataFile;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.AttractMode.Row"/>
+        /// Convert from <cref="Machine"/> to an array of <cref="Models.AttractMode.Row"/>
         /// </summary>
-        public static Models.AttractMode.Row?[]? ConvertMachineToAttractMode(Models.Internal.Machine? item)
+        public static Models.AttractMode.Row?[]? ConvertMachineToAttractMode(Machine? item)
         {
             if (item == null)
                 return null;
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             return roms?.Select(rom =>
             {
                 if (rom == null)
@@ -102,43 +103,43 @@ namespace SabreTools.Serialization
 
                 var rowItem = ConvertToAttractMode(rom);
 
-                rowItem.Name = item.ReadString(Models.Internal.Machine.NameKey);
-                rowItem.Emulator = item.ReadString(Models.Internal.Machine.EmulatorKey);
-                rowItem.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey);
-                rowItem.Year = item.ReadString(Models.Internal.Machine.YearKey);
-                rowItem.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey);
-                rowItem.Category = item.ReadString(Models.Internal.Machine.CategoryKey);
-                rowItem.Players = item.ReadString(Models.Internal.Machine.PlayersKey);
-                rowItem.Rotation = item.ReadString(Models.Internal.Machine.RotationKey);
-                rowItem.Control = item.ReadString(Models.Internal.Machine.ControlKey);
-                rowItem.Status = item.ReadString(Models.Internal.Machine.StatusKey);
-                rowItem.DisplayCount = item.ReadString(Models.Internal.Machine.DisplayCountKey);
-                rowItem.DisplayType = item.ReadString(Models.Internal.Machine.DisplayTypeKey);
-                rowItem.Extra = item.ReadString(Models.Internal.Machine.ExtraKey);
-                rowItem.Buttons = item.ReadString(Models.Internal.Machine.ButtonsKey);
-                rowItem.Favorite = item.ReadString(Models.Internal.Machine.FavoriteKey);
-                rowItem.Tags = item.ReadString(Models.Internal.Machine.TagsKey);
-                rowItem.PlayedCount = item.ReadString(Models.Internal.Machine.PlayedCountKey);
-                rowItem.PlayedTime = item.ReadString(Models.Internal.Machine.PlayedTimeKey);
+                rowItem.Name = item.ReadString(Machine.NameKey);
+                rowItem.Emulator = item.ReadString(Machine.EmulatorKey);
+                rowItem.CloneOf = item.ReadString(Machine.CloneOfKey);
+                rowItem.Year = item.ReadString(Machine.YearKey);
+                rowItem.Manufacturer = item.ReadString(Machine.ManufacturerKey);
+                rowItem.Category = item.ReadString(Machine.CategoryKey);
+                rowItem.Players = item.ReadString(Machine.PlayersKey);
+                rowItem.Rotation = item.ReadString(Machine.RotationKey);
+                rowItem.Control = item.ReadString(Machine.ControlKey);
+                rowItem.Status = item.ReadString(Machine.StatusKey);
+                rowItem.DisplayCount = item.ReadString(Machine.DisplayCountKey);
+                rowItem.DisplayType = item.ReadString(Machine.DisplayTypeKey);
+                rowItem.Extra = item.ReadString(Machine.ExtraKey);
+                rowItem.Buttons = item.ReadString(Machine.ButtonsKey);
+                rowItem.Favorite = item.ReadString(Machine.FavoriteKey);
+                rowItem.Tags = item.ReadString(Machine.TagsKey);
+                rowItem.PlayedCount = item.ReadString(Machine.PlayedCountKey);
+                rowItem.PlayedTime = item.ReadString(Machine.PlayedTimeKey);
 
                 return rowItem;
             })?.ToArray();
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.AttractMode.Row"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.AttractMode.Row"/>
         /// </summary>
-        private static Models.AttractMode.Row? ConvertToAttractMode(Models.Internal.Rom? item)
+        private static Models.AttractMode.Row? ConvertToAttractMode(Rom? item)
         {
             if (item == null)
                 return null;
 
             var row = new Models.AttractMode.Row
             {
-                Title = item.ReadString(Models.Internal.Rom.NameKey),
-                AltRomname = item.ReadString(Models.Internal.Rom.AltRomnameKey),
-                AltTitle = item.ReadString(Models.Internal.Rom.AltTitleKey),
-                FileIsAvailable = item.ReadString(Models.Internal.Rom.FileIsAvailableKey),
+                Title = item.ReadString(Rom.NameKey),
+                AltRomname = item.ReadString(Rom.AltRomnameKey),
+                AltTitle = item.ReadString(Rom.AltTitleKey),
+                FileIsAvailable = item.ReadString(Rom.FileIsAvailableKey),
             };
             return row;
         }
diff --git a/SabreTools.Serialization/Internal.ClrMamePro.cs b/SabreTools.Serialization/Internal.ClrMamePro.cs
index 5d68f04a..3a017db2 100644
--- a/SabreTools.Serialization/Internal.ClrMamePro.cs
+++ b/SabreTools.Serialization/Internal.ClrMamePro.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,360 +12,360 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.ClrMamePro"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.ClrMamePro.ClrMamePro"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromClrMamePro(Models.ClrMamePro.ClrMamePro item)
+        public static Header ConvertHeaderFromClrMamePro(Models.ClrMamePro.ClrMamePro item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NameKey] = item.Name,
-                [Models.Internal.Header.DescriptionKey] = item.Description,
-                [Models.Internal.Header.RootDirKey] = item.RootDir,
-                [Models.Internal.Header.CategoryKey] = item.Category,
-                [Models.Internal.Header.VersionKey] = item.Version,
-                [Models.Internal.Header.DateKey] = item.Date,
-                [Models.Internal.Header.AuthorKey] = item.Author,
-                [Models.Internal.Header.HomepageKey] = item.Homepage,
-                [Models.Internal.Header.UrlKey] = item.Url,
-                [Models.Internal.Header.CommentKey] = item.Comment,
-                [Models.Internal.Header.HeaderKey] = item.Header,
-                [Models.Internal.Header.TypeKey] = item.Type,
-                [Models.Internal.Header.ForceMergingKey] = item.ForceMerging,
-                [Models.Internal.Header.ForceZippingKey] = item.ForceZipping,
-                [Models.Internal.Header.ForcePackingKey] = item.ForcePacking,
+                [Header.NameKey] = item.Name,
+                [Header.DescriptionKey] = item.Description,
+                [Header.RootDirKey] = item.RootDir,
+                [Header.CategoryKey] = item.Category,
+                [Header.VersionKey] = item.Version,
+                [Header.DateKey] = item.Date,
+                [Header.AuthorKey] = item.Author,
+                [Header.HomepageKey] = item.Homepage,
+                [Header.UrlKey] = item.Url,
+                [Header.CommentKey] = item.Comment,
+                [Header.HeaderKey] = item.Header,
+                [Header.TypeKey] = item.Type,
+                [Header.ForceMergingKey] = item.ForceMerging,
+                [Header.ForceZippingKey] = item.ForceZipping,
+                [Header.ForcePackingKey] = item.ForcePacking,
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromClrMamePro(Models.ClrMamePro.GameBase item)
+        public static Machine ConvertMachineFromClrMamePro(Models.ClrMamePro.GameBase item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.NameKey] = item.Name,
-                [Models.Internal.Machine.DescriptionKey] = item.Description,
-                [Models.Internal.Machine.YearKey] = item.Year,
-                [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer,
-                [Models.Internal.Machine.CategoryKey] = item.Category,
-                [Models.Internal.Machine.CloneOfKey] = item.CloneOf,
-                [Models.Internal.Machine.RomOfKey] = item.RomOf,
-                [Models.Internal.Machine.SampleOfKey] = item.SampleOf,
+                [Machine.NameKey] = item.Name,
+                [Machine.DescriptionKey] = item.Description,
+                [Machine.YearKey] = item.Year,
+                [Machine.ManufacturerKey] = item.Manufacturer,
+                [Machine.CategoryKey] = item.Category,
+                [Machine.CloneOfKey] = item.CloneOf,
+                [Machine.RomOfKey] = item.RomOf,
+                [Machine.SampleOfKey] = item.SampleOf,
             };
 
             if (item.Release != null && item.Release.Any())
             {
-                var releases = new List<Models.Internal.Release>();
+                var releases = new List<Release>();
                 foreach (var release in item.Release)
                 {
                     releases.Add(ConvertFromClrMamePro(release));
                 }
-                machine[Models.Internal.Machine.ReleaseKey] = releases.ToArray();
+                machine[Machine.ReleaseKey] = releases.ToArray();
             }
 
             if (item.BiosSet != null && item.BiosSet.Any())
             {
-                var biosSets = new List<Models.Internal.BiosSet>();
+                var biosSets = new List<BiosSet>();
                 foreach (var biosSet in item.BiosSet)
                 {
                     biosSets.Add(ConvertFromClrMamePro(biosSet));
                 }
-                machine[Models.Internal.Machine.BiosSetKey] = biosSets.ToArray();
+                machine[Machine.BiosSetKey] = biosSets.ToArray();
             }
 
             if (item.Rom != null && item.Rom.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
                     roms.Add(ConvertFromClrMamePro(rom));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             if (item.Disk != null && item.Disk.Any())
             {
-                var disks = new List<Models.Internal.Disk>();
+                var disks = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
                     disks.Add(ConvertFromClrMamePro(disk));
                 }
-                machine[Models.Internal.Machine.DiskKey] = disks.ToArray();
+                machine[Machine.DiskKey] = disks.ToArray();
             }
 
             if (item.Media != null && item.Media.Any())
             {
-                var medias = new List<Models.Internal.Media>();
+                var medias = new List<Media>();
                 foreach (var media in item.Media)
                 {
                     medias.Add(ConvertFromClrMamePro(media));
                 }
-                machine[Models.Internal.Machine.MediaKey] = medias.ToArray();
+                machine[Machine.MediaKey] = medias.ToArray();
             }
 
             if (item.Sample != null && item.Sample.Any())
             {
-                var samples = new List<Models.Internal.Sample>();
+                var samples = new List<Sample>();
                 foreach (var sample in item.Sample)
                 {
                     samples.Add(ConvertFromClrMamePro(sample));
                 }
-                machine[Models.Internal.Machine.SampleKey] = samples.ToArray();
+                machine[Machine.SampleKey] = samples.ToArray();
             }
 
             if (item.Archive != null && item.Archive.Any())
             {
-                var archives = new List<Models.Internal.Archive>();
+                var archives = new List<Archive>();
                 foreach (var archive in item.Archive)
                 {
                     archives.Add(ConvertFromClrMamePro(archive));
                 }
-                machine[Models.Internal.Machine.ArchiveKey] = archives.ToArray();
+                machine[Machine.ArchiveKey] = archives.ToArray();
             }
 
             if (item.Chip != null && item.Chip.Any())
             {
-                var chips = new List<Models.Internal.Chip>();
+                var chips = new List<Chip>();
                 foreach (var chip in item.Chip)
                 {
                     chips.Add(ConvertFromClrMamePro(chip));
                 }
-                machine[Models.Internal.Machine.ChipKey] = chips.ToArray();
+                machine[Machine.ChipKey] = chips.ToArray();
             }
 
             if (item.Video != null)
-                machine[Models.Internal.Machine.VideoKey] = ConvertFromClrMamePro(item.Video);
+                machine[Machine.VideoKey] = ConvertFromClrMamePro(item.Video);
 
             if (item.Sound != null)
-                machine[Models.Internal.Machine.SoundKey] = ConvertFromClrMamePro(item.Sound);
+                machine[Machine.SoundKey] = ConvertFromClrMamePro(item.Sound);
 
             if (item.Input != null)
-                machine[Models.Internal.Machine.InputKey] = ConvertFromClrMamePro(item.Input);
+                machine[Machine.InputKey] = ConvertFromClrMamePro(item.Input);
 
             if (item.DipSwitch != null && item.DipSwitch.Any())
             {
-                var dipSwitches = new List<Models.Internal.DipSwitch>();
+                var dipSwitches = new List<DipSwitch>();
                 foreach (var dipSwitch in item.DipSwitch)
                 {
                     dipSwitches.Add(ConvertFromClrMamePro(dipSwitch));
                 }
-                machine[Models.Internal.Machine.DipSwitchKey] = dipSwitches.ToArray();
+                machine[Machine.DipSwitchKey] = dipSwitches.ToArray();
             }
 
             if (item.Driver != null)
-                machine[Models.Internal.Machine.DriverKey] = ConvertFromClrMamePro(item.Driver);
+                machine[Machine.DriverKey] = ConvertFromClrMamePro(item.Driver);
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Archive"/> to <cref="Models.Internal.Archive"/>
+        /// Convert from <cref="Models.ClrMamePro.Archive"/> to <cref="Archive"/>
         /// </summary>
-        public static Models.Internal.Archive ConvertFromClrMamePro(Models.ClrMamePro.Archive item)
+        public static Archive ConvertFromClrMamePro(Models.ClrMamePro.Archive item)
         {
-            var archive = new Models.Internal.Archive
+            var archive = new Archive
             {
-                [Models.Internal.Archive.NameKey] = item.Name,
+                [Archive.NameKey] = item.Name,
             };
             return archive;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.BiosSet"/> to <cref="Models.Internal.BiosSet"/>
+        /// Convert from <cref="Models.ClrMamePro.BiosSet"/> to <cref="BiosSet"/>
         /// </summary>
-        public static Models.Internal.BiosSet ConvertFromClrMamePro(Models.ClrMamePro.BiosSet item)
+        public static BiosSet ConvertFromClrMamePro(Models.ClrMamePro.BiosSet item)
         {
-            var biosset = new Models.Internal.BiosSet
+            var biosset = new BiosSet
             {
-                [Models.Internal.BiosSet.NameKey] = item.Name,
-                [Models.Internal.BiosSet.DescriptionKey] = item.Description,
-                [Models.Internal.BiosSet.DefaultKey] = item.Default,
+                [BiosSet.NameKey] = item.Name,
+                [BiosSet.DescriptionKey] = item.Description,
+                [BiosSet.DefaultKey] = item.Default,
             };
             return biosset;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Chip"/> to <cref="Models.Internal.Chip"/>
+        /// Convert from <cref="Models.ClrMamePro.Chip"/> to <cref="Chip"/>
         /// </summary>
-        public static Models.Internal.Chip ConvertFromClrMamePro(Models.ClrMamePro.Chip item)
+        public static Chip ConvertFromClrMamePro(Models.ClrMamePro.Chip item)
         {
-            var chip = new Models.Internal.Chip
+            var chip = new Chip
             {
-                [Models.Internal.Chip.ChipTypeKey] = item.Type,
-                [Models.Internal.Chip.NameKey] = item.Name,
-                [Models.Internal.Chip.FlagsKey] = item.Flags,
-                [Models.Internal.Chip.ClockKey] = item.Clock,
+                [Chip.ChipTypeKey] = item.Type,
+                [Chip.NameKey] = item.Name,
+                [Chip.FlagsKey] = item.Flags,
+                [Chip.ClockKey] = item.Clock,
             };
             return chip;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.DipSwitch"/> to <cref="Models.Internal.DipSwitch"/>
+        /// Convert from <cref="Models.ClrMamePro.DipSwitch"/> to <cref="DipSwitch"/>
         /// </summary>
-        public static Models.Internal.DipSwitch ConvertFromClrMamePro(Models.ClrMamePro.DipSwitch item)
+        public static DipSwitch ConvertFromClrMamePro(Models.ClrMamePro.DipSwitch item)
         {
-            var dipswitch = new Models.Internal.DipSwitch
+            var dipswitch = new DipSwitch
             {
-                [Models.Internal.DipSwitch.NameKey] = item.Name,
-                [Models.Internal.DipSwitch.EntryKey] = item.Entry,
-                [Models.Internal.DipSwitch.DefaultKey] = item.Default,
+                [DipSwitch.NameKey] = item.Name,
+                [DipSwitch.EntryKey] = item.Entry,
+                [DipSwitch.DefaultKey] = item.Default,
             };
             return dipswitch;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Disk"/> to <cref="Models.Internal.Disk"/>
+        /// Convert from <cref="Models.ClrMamePro.Disk"/> to <cref="Disk"/>
         /// </summary>
-        public static Models.Internal.Disk ConvertFromClrMamePro(Models.ClrMamePro.Disk item)
+        public static Disk ConvertFromClrMamePro(Models.ClrMamePro.Disk item)
         {
-            var disk = new Models.Internal.Disk
+            var disk = new 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.StatusKey] = item.Status,
-                [Models.Internal.Disk.FlagsKey] = item.Flags,
+                [Disk.NameKey] = item.Name,
+                [Disk.MD5Key] = item.MD5,
+                [Disk.SHA1Key] = item.SHA1,
+                [Disk.MergeKey] = item.Merge,
+                [Disk.StatusKey] = item.Status,
+                [Disk.FlagsKey] = item.Flags,
             };
             return disk;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Driver"/> to <cref="Models.Internal.Driver"/>
+        /// Convert from <cref="Models.ClrMamePro.Driver"/> to <cref="Driver"/>
         /// </summary>
-        public static Models.Internal.Driver ConvertFromClrMamePro(Models.ClrMamePro.Driver item)
+        public static Driver ConvertFromClrMamePro(Models.ClrMamePro.Driver item)
         {
-            var driver = new Models.Internal.Driver
+            var driver = new 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.BlitKey] = item.Blit,
+                [Driver.StatusKey] = item.Status,
+                [Driver.ColorKey] = item.Color,
+                [Driver.SoundKey] = item.Sound,
+                [Driver.PaletteSizeKey] = item.PaletteSize,
+                [Driver.BlitKey] = item.Blit,
             };
             return driver;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Input"/> to <cref="Models.Internal.Input"/>
+        /// Convert from <cref="Models.ClrMamePro.Input"/> to <cref="Input"/>
         /// </summary>
-        public static Models.Internal.Input ConvertFromClrMamePro(Models.ClrMamePro.Input item)
+        public static Input ConvertFromClrMamePro(Models.ClrMamePro.Input item)
         {
-            var input = new Models.Internal.Input
+            var input = new Input
             {
-                [Models.Internal.Input.PlayersKey] = item.Players,
-                [Models.Internal.Input.ControlKey] = item.Control,
-                [Models.Internal.Input.ButtonsKey] = item.Buttons,
-                [Models.Internal.Input.CoinsKey] = item.Coins,
-                [Models.Internal.Input.TiltKey] = item.Tilt,
-                [Models.Internal.Input.ServiceKey] = item.Service,
+                [Input.PlayersKey] = item.Players,
+                [Input.ControlKey] = item.Control,
+                [Input.ButtonsKey] = item.Buttons,
+                [Input.CoinsKey] = item.Coins,
+                [Input.TiltKey] = item.Tilt,
+                [Input.ServiceKey] = item.Service,
             };
             return input;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Media"/> to <cref="Models.Internal.Media"/>
+        /// Convert from <cref="Models.ClrMamePro.Media"/> to <cref="Media"/>
         /// </summary>
-        public static Models.Internal.Media ConvertFromClrMamePro(Models.ClrMamePro.Media item)
+        public static Media ConvertFromClrMamePro(Models.ClrMamePro.Media item)
         {
-            var media = new Models.Internal.Media
+            var media = new Media
             {
-                [Models.Internal.Media.NameKey] = item.Name,
-                [Models.Internal.Media.MD5Key] = item.MD5,
-                [Models.Internal.Media.SHA1Key] = item.SHA1,
-                [Models.Internal.Media.SHA256Key] = item.SHA256,
-                [Models.Internal.Media.SpamSumKey] = item.SpamSum,
+                [Media.NameKey] = item.Name,
+                [Media.MD5Key] = item.MD5,
+                [Media.SHA1Key] = item.SHA1,
+                [Media.SHA256Key] = item.SHA256,
+                [Media.SpamSumKey] = item.SpamSum,
             };
             return media;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Release"/> to <cref="Models.Internal.Release"/>
+        /// Convert from <cref="Models.ClrMamePro.Release"/> to <cref="Release"/>
         /// </summary>
-        public static Models.Internal.Release ConvertFromClrMamePro(Models.ClrMamePro.Release item)
+        public static Release ConvertFromClrMamePro(Models.ClrMamePro.Release item)
         {
-            var release = new Models.Internal.Release
+            var release = new Release
             {
-                [Models.Internal.Release.NameKey] = item.Name,
-                [Models.Internal.Release.RegionKey] = item.Region,
-                [Models.Internal.Release.LanguageKey] = item.Language,
-                [Models.Internal.Release.DateKey] = item.Date,
-                [Models.Internal.Release.DefaultKey] = item.Default,
+                [Release.NameKey] = item.Name,
+                [Release.RegionKey] = item.Region,
+                [Release.LanguageKey] = item.Language,
+                [Release.DateKey] = item.Date,
+                [Release.DefaultKey] = item.Default,
             };
             return release;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Rom"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.ClrMamePro.Rom"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromClrMamePro(Models.ClrMamePro.Rom item)
+        public static Rom ConvertFromClrMamePro(Models.ClrMamePro.Rom item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.Name,
-                [Models.Internal.Rom.SizeKey] = item.Size,
-                [Models.Internal.Rom.CRCKey] = item.CRC,
-                [Models.Internal.Rom.MD5Key] = item.MD5,
-                [Models.Internal.Rom.SHA1Key] = item.SHA1,
-                [Models.Internal.Rom.SHA256Key] = item.SHA256,
-                [Models.Internal.Rom.SHA384Key] = item.SHA384,
-                [Models.Internal.Rom.SHA512Key] = item.SHA512,
-                [Models.Internal.Rom.SpamSumKey] = item.SpamSum,
-                [Models.Internal.Rom.xxHash364Key] = item.xxHash364,
-                [Models.Internal.Rom.xxHash3128Key] = item.xxHash3128,
-                [Models.Internal.Rom.MergeKey] = item.Merge,
-                [Models.Internal.Rom.StatusKey] = item.Status,
-                [Models.Internal.Rom.RegionKey] = item.Region,
-                [Models.Internal.Rom.FlagsKey] = item.Flags,
-                [Models.Internal.Rom.OffsetKey] = item.Offs,
-                [Models.Internal.Rom.SerialKey] = item.Serial,
-                [Models.Internal.Rom.HeaderKey] = item.Header,
-                [Models.Internal.Rom.DateKey] = item.Date,
-                [Models.Internal.Rom.InvertedKey] = item.Inverted,
-                [Models.Internal.Rom.MIAKey] = item.MIA,
+                [Rom.NameKey] = item.Name,
+                [Rom.SizeKey] = item.Size,
+                [Rom.CRCKey] = item.CRC,
+                [Rom.MD5Key] = item.MD5,
+                [Rom.SHA1Key] = item.SHA1,
+                [Rom.SHA256Key] = item.SHA256,
+                [Rom.SHA384Key] = item.SHA384,
+                [Rom.SHA512Key] = item.SHA512,
+                [Rom.SpamSumKey] = item.SpamSum,
+                [Rom.xxHash364Key] = item.xxHash364,
+                [Rom.xxHash3128Key] = item.xxHash3128,
+                [Rom.MergeKey] = item.Merge,
+                [Rom.StatusKey] = item.Status,
+                [Rom.RegionKey] = item.Region,
+                [Rom.FlagsKey] = item.Flags,
+                [Rom.OffsetKey] = item.Offs,
+                [Rom.SerialKey] = item.Serial,
+                [Rom.HeaderKey] = item.Header,
+                [Rom.DateKey] = item.Date,
+                [Rom.InvertedKey] = item.Inverted,
+                [Rom.MIAKey] = item.MIA,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Sample"/> to <cref="Models.Internal.Sample"/>
+        /// Convert from <cref="Models.ClrMamePro.Sample"/> to <cref="Sample"/>
         /// </summary>
-        public static Models.Internal.Sample ConvertFromClrMamePro(Models.ClrMamePro.Sample item)
+        public static Sample ConvertFromClrMamePro(Models.ClrMamePro.Sample item)
         {
-            var sample = new Models.Internal.Sample
+            var sample = new Sample
             {
-                [Models.Internal.Sample.NameKey] = item.Name,
+                [Sample.NameKey] = item.Name,
             };
             return sample;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Sound"/> to <cref="Models.Internal.Sound"/>
+        /// Convert from <cref="Models.ClrMamePro.Sound"/> to <cref="Sound"/>
         /// </summary>
-        public static Models.Internal.Sound ConvertFromClrMamePro(Models.ClrMamePro.Sound item)
+        public static Sound ConvertFromClrMamePro(Models.ClrMamePro.Sound item)
         {
-            var sound = new Models.Internal.Sound
+            var sound = new Sound
             {
-                [Models.Internal.Sound.ChannelsKey] = item.Channels,
+                [Sound.ChannelsKey] = item.Channels,
             };
             return sound;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.ClrMamePro.Video"/> to <cref="Models.Internal.Video"/>
+        /// Convert from <cref="Models.ClrMamePro.Video"/> to <cref="Video"/>
         /// </summary>
-        public static Models.Internal.Video ConvertFromClrMamePro(Models.ClrMamePro.Video item)
+        public static Video ConvertFromClrMamePro(Models.ClrMamePro.Video item)
         {
-            var video = new Models.Internal.Video
+            var video = new Video
             {
-                [Models.Internal.Video.ScreenKey] = item.Screen,
-                [Models.Internal.Video.OrientationKey] = item.Orientation,
-                [Models.Internal.Video.WidthKey] = item.X,
-                [Models.Internal.Video.HeightKey] = item.Y,
-                [Models.Internal.Video.AspectXKey] = item.AspectX,
-                [Models.Internal.Video.AspectYKey] = item.AspectY,
-                [Models.Internal.Video.RefreshKey] = item.Freq,
+                [Video.ScreenKey] = item.Screen,
+                [Video.OrientationKey] = item.Orientation,
+                [Video.WidthKey] = item.X,
+                [Video.HeightKey] = item.Y,
+                [Video.AspectXKey] = item.AspectX,
+                [Video.AspectYKey] = item.AspectY,
+                [Video.RefreshKey] = item.Freq,
             };
             return video;
         }
@@ -374,341 +375,341 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.ClrMamePro.ClrMamePro"/>
+        /// Convert from <cref="Header"/> to <cref="Models.ClrMamePro.ClrMamePro"/>
         /// </summary>
-        public static Models.ClrMamePro.ClrMamePro? ConvertHeaderToClrMamePro(Models.Internal.Header? item)
+        public static Models.ClrMamePro.ClrMamePro? ConvertHeaderToClrMamePro(Header? item)
         {
             if (item == null)
                 return null;
 
             var clrMamePro = new Models.ClrMamePro.ClrMamePro
             {
-                Name = item.ReadString(Models.Internal.Header.NameKey),
-                Description = item.ReadString(Models.Internal.Header.DescriptionKey),
-                RootDir = item.ReadString(Models.Internal.Header.RootDirKey),
-                Category = item.ReadString(Models.Internal.Header.CategoryKey),
-                Version = item.ReadString(Models.Internal.Header.VersionKey),
-                Date = item.ReadString(Models.Internal.Header.DateKey),
-                Author = item.ReadString(Models.Internal.Header.AuthorKey),
-                Homepage = item.ReadString(Models.Internal.Header.HomepageKey),
-                Url = item.ReadString(Models.Internal.Header.UrlKey),
-                Comment = item.ReadString(Models.Internal.Header.CommentKey),
-                Header = item.ReadString(Models.Internal.Header.HeaderKey),
-                Type = item.ReadString(Models.Internal.Header.TypeKey),
-                ForceMerging = item.ReadString(Models.Internal.Header.ForceMergingKey),
-                ForceZipping = item.ReadString(Models.Internal.Header.ForceZippingKey),
-                ForcePacking = item.ReadString(Models.Internal.Header.ForcePackingKey),
+                Name = item.ReadString(Header.NameKey),
+                Description = item.ReadString(Header.DescriptionKey),
+                RootDir = item.ReadString(Header.RootDirKey),
+                Category = item.ReadString(Header.CategoryKey),
+                Version = item.ReadString(Header.VersionKey),
+                Date = item.ReadString(Header.DateKey),
+                Author = item.ReadString(Header.AuthorKey),
+                Homepage = item.ReadString(Header.HomepageKey),
+                Url = item.ReadString(Header.UrlKey),
+                Comment = item.ReadString(Header.CommentKey),
+                Header = item.ReadString(Header.HeaderKey),
+                Type = item.ReadString(Header.TypeKey),
+                ForceMerging = item.ReadString(Header.ForceMergingKey),
+                ForceZipping = item.ReadString(Header.ForceZippingKey),
+                ForcePacking = item.ReadString(Header.ForcePackingKey),
             };
             return clrMamePro;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.ClrMamePro.Machine"/>
+        /// Convert from <cref="Archive"/> to <cref="Models.ClrMamePro.Machine"/>
         /// </summary>
-        public static Models.ClrMamePro.GameBase? ConvertMachineToClrMamePro(Models.Internal.Machine? item, bool game = false)
+        public static Models.ClrMamePro.GameBase? ConvertMachineToClrMamePro(Machine? item, bool game = false)
         {
             if (item == null)
                 return null;
 
             Models.ClrMamePro.GameBase gameBase = game ? new Models.ClrMamePro.Game() : new Models.ClrMamePro.Machine();
 
-            gameBase.Name = item.ReadString(Models.Internal.Machine.NameKey);
-            gameBase.Description = item.ReadString(Models.Internal.Machine.DescriptionKey);
-            gameBase.Year = item.ReadString(Models.Internal.Machine.YearKey);
-            gameBase.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey);
-            gameBase.Category = item.ReadString(Models.Internal.Machine.CategoryKey);
-            gameBase.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey);
-            gameBase.RomOf = item.ReadString(Models.Internal.Machine.RomOfKey);
-            gameBase.SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey);
+            gameBase.Name = item.ReadString(Machine.NameKey);
+            gameBase.Description = item.ReadString(Machine.DescriptionKey);
+            gameBase.Year = item.ReadString(Machine.YearKey);
+            gameBase.Manufacturer = item.ReadString(Machine.ManufacturerKey);
+            gameBase.Category = item.ReadString(Machine.CategoryKey);
+            gameBase.CloneOf = item.ReadString(Machine.CloneOfKey);
+            gameBase.RomOf = item.ReadString(Machine.RomOfKey);
+            gameBase.SampleOf = item.ReadString(Machine.SampleOfKey);
 
-            var releases = item.Read<Models.Internal.Release[]>(Models.Internal.Machine.ReleaseKey);
+            var releases = item.Read<Release[]>(Machine.ReleaseKey);
             gameBase.Release = releases?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var biosSets = item.Read<Models.Internal.BiosSet[]>(Models.Internal.Machine.BiosSetKey);
+            var biosSets = item.Read<BiosSet[]>(Machine.BiosSetKey);
             gameBase.BiosSet = biosSets?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             gameBase.Rom = roms?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
+            var disks = item.Read<Disk[]>(Machine.DiskKey);
             gameBase.Disk = disks?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var medias = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey);
+            var medias = item.Read<Media[]>(Machine.MediaKey);
             gameBase.Media = medias?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var samples = item.Read<Models.Internal.Sample[]>(Models.Internal.Machine.SampleKey);
+            var samples = item.Read<Sample[]>(Machine.SampleKey);
             gameBase.Sample = samples?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var archives = item.Read<Models.Internal.Archive[]>(Models.Internal.Machine.ArchiveKey);
+            var archives = item.Read<Archive[]>(Machine.ArchiveKey);
             gameBase.Archive = archives?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var chips = item.Read<Models.Internal.Chip[]>(Models.Internal.Machine.ChipKey);
+            var chips = item.Read<Chip[]>(Machine.ChipKey);
             gameBase.Chip = chips?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var video = item.Read<Models.Internal.Video>(Models.Internal.Machine.VideoKey);
+            var video = item.Read<Video>(Machine.VideoKey);
             gameBase.Video = ConvertToClrMamePro(video);
 
-            var sound = item.Read<Models.Internal.Sound>(Models.Internal.Machine.SoundKey);
+            var sound = item.Read<Sound>(Machine.SoundKey);
             gameBase.Sound = ConvertToClrMamePro(sound);
 
-            var input = item.Read<Models.Internal.Input>(Models.Internal.Machine.InputKey);
+            var input = item.Read<Input>(Machine.InputKey);
             gameBase.Input = ConvertToClrMamePro(input);
 
-            var dipSwitches = item.Read<Models.Internal.DipSwitch[]>(Models.Internal.Machine.DipSwitchKey);
+            var dipSwitches = item.Read<DipSwitch[]>(Machine.DipSwitchKey);
             gameBase.DipSwitch = dipSwitches?.Select(ConvertToClrMamePro)?.ToArray();
 
-            var driver = item.Read<Models.Internal.Driver>(Models.Internal.Machine.DriverKey);
+            var driver = item.Read<Driver>(Machine.DriverKey);
             gameBase.Driver = ConvertToClrMamePro(driver);
 
             return gameBase;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.ClrMamePro.Archive"/>
+        /// Convert from <cref="Archive"/> to <cref="Models.ClrMamePro.Archive"/>
         /// </summary>
-        private static Models.ClrMamePro.Archive? ConvertToClrMamePro(Models.Internal.Archive? item)
+        private static Models.ClrMamePro.Archive? ConvertToClrMamePro(Archive? item)
         {
             if (item == null)
                 return null;
 
             var archive = new Models.ClrMamePro.Archive
             {
-                Name = item.ReadString(Models.Internal.Archive.NameKey),
+                Name = item.ReadString(Archive.NameKey),
             };
             return archive;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.BiosSet"/> to <cref="Models.ClrMamePro.BiosSet"/>
+        /// Convert from <cref="BiosSet"/> to <cref="Models.ClrMamePro.BiosSet"/>
         /// </summary>
-        private static Models.ClrMamePro.BiosSet? ConvertToClrMamePro(Models.Internal.BiosSet? item)
+        private static Models.ClrMamePro.BiosSet? ConvertToClrMamePro(BiosSet? item)
         {
             if (item == null)
                 return null;
 
             var biosset = new Models.ClrMamePro.BiosSet
             {
-                Name = item.ReadString(Models.Internal.BiosSet.NameKey),
-                Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey),
-                Default = item.ReadString(Models.Internal.BiosSet.DefaultKey),
+                Name = item.ReadString(BiosSet.NameKey),
+                Description = item.ReadString(BiosSet.DescriptionKey),
+                Default = item.ReadString(BiosSet.DefaultKey),
             };
             return biosset;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Chip"/> to <cref="Models.ClrMamePro.Chip"/>
+        /// Convert from <cref="Chip"/> to <cref="Models.ClrMamePro.Chip"/>
         /// </summary>
-        private static Models.ClrMamePro.Chip? ConvertToClrMamePro(Models.Internal.Chip? item)
+        private static Models.ClrMamePro.Chip? ConvertToClrMamePro(Chip? item)
         {
             if (item == null)
                 return null;
 
             var chip = new Models.ClrMamePro.Chip
             {
-                Type = item.ReadString(Models.Internal.Chip.ChipTypeKey),
-                Name = item.ReadString(Models.Internal.Chip.NameKey),
-                Flags = item.ReadString(Models.Internal.Chip.FlagsKey),
-                Clock = item.ReadString(Models.Internal.Chip.ClockKey),
+                Type = item.ReadString(Chip.ChipTypeKey),
+                Name = item.ReadString(Chip.NameKey),
+                Flags = item.ReadString(Chip.FlagsKey),
+                Clock = item.ReadString(Chip.ClockKey),
             };
             return chip;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DipSwitch"/> to <cref="Models.ClrMamePro.DipSwitch"/>
+        /// Convert from <cref="DipSwitch"/> to <cref="Models.ClrMamePro.DipSwitch"/>
         /// </summary>
-        private static Models.ClrMamePro.DipSwitch? ConvertToClrMamePro(Models.Internal.DipSwitch? item)
+        private static Models.ClrMamePro.DipSwitch? ConvertToClrMamePro(DipSwitch? item)
         {
             if (item == null)
                 return null;
 
             var dipswitch = new Models.ClrMamePro.DipSwitch
             {
-                Name = item.ReadString(Models.Internal.DipSwitch.NameKey),
-                Entry = item[Models.Internal.DipSwitch.EntryKey] as string[],
-                Default = item.ReadString(Models.Internal.DipSwitch.DefaultKey),
+                Name = item.ReadString(DipSwitch.NameKey),
+                Entry = item[DipSwitch.EntryKey] as string[],
+                Default = item.ReadString(DipSwitch.DefaultKey),
             };
             return dipswitch;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.ClrMamePro.Disk"/>
+        /// Convert from <cref="Disk"/> to <cref="Models.ClrMamePro.Disk"/>
         /// </summary>
-        private static Models.ClrMamePro.Disk? ConvertToClrMamePro(Models.Internal.Disk? item)
+        private static Models.ClrMamePro.Disk? ConvertToClrMamePro(Disk? item)
         {
             if (item == null)
                 return null;
 
             var disk = new Models.ClrMamePro.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),
-                Status = item.ReadString(Models.Internal.Disk.StatusKey),
-                Flags = item.ReadString(Models.Internal.Disk.FlagsKey),
+                Name = item.ReadString(Disk.NameKey),
+                MD5 = item.ReadString(Disk.MD5Key),
+                SHA1 = item.ReadString(Disk.SHA1Key),
+                Merge = item.ReadString(Disk.MergeKey),
+                Status = item.ReadString(Disk.StatusKey),
+                Flags = item.ReadString(Disk.FlagsKey),
             };
             return disk;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Driver"/> to <cref="Models.ClrMamePro.Driver"/>
+        /// Convert from <cref="Driver"/> to <cref="Models.ClrMamePro.Driver"/>
         /// </summary>
-        private static Models.ClrMamePro.Driver? ConvertToClrMamePro(Models.Internal.Driver? item)
+        private static Models.ClrMamePro.Driver? ConvertToClrMamePro(Driver? item)
         {
             if (item == null)
                 return null;
 
             var driver = new Models.ClrMamePro.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),
-                Blit = item.ReadString(Models.Internal.Driver.BlitKey),
+                Status = item.ReadString(Driver.StatusKey),
+                Color = item.ReadString(Driver.ColorKey),
+                Sound = item.ReadString(Driver.SoundKey),
+                PaletteSize = item.ReadString(Driver.PaletteSizeKey),
+                Blit = item.ReadString(Driver.BlitKey),
             };
             return driver;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Input"/> to <cref="Models.ClrMamePro.Input"/>
+        /// Convert from <cref="Input"/> to <cref="Models.ClrMamePro.Input"/>
         /// </summary>
-        private static Models.ClrMamePro.Input? ConvertToClrMamePro(Models.Internal.Input? item)
+        private static Models.ClrMamePro.Input? ConvertToClrMamePro(Input? item)
         {
             if (item == null)
                 return null;
 
             var input = new Models.ClrMamePro.Input
             {
-                Players = item.ReadString(Models.Internal.Input.PlayersKey),
-                Control = item.ReadString(Models.Internal.Input.ControlKey),
-                Buttons = item.ReadString(Models.Internal.Input.ButtonsKey),
-                Coins = item.ReadString(Models.Internal.Input.CoinsKey),
-                Tilt = item.ReadString(Models.Internal.Input.TiltKey),
-                Service = item.ReadString(Models.Internal.Input.ServiceKey),
+                Players = item.ReadString(Input.PlayersKey),
+                Control = item.ReadString(Input.ControlKey),
+                Buttons = item.ReadString(Input.ButtonsKey),
+                Coins = item.ReadString(Input.CoinsKey),
+                Tilt = item.ReadString(Input.TiltKey),
+                Service = item.ReadString(Input.ServiceKey),
             };
             return input;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Media"/> to <cref="Models.ClrMamePro.Media"/>
+        /// Convert from <cref="Media"/> to <cref="Models.ClrMamePro.Media"/>
         /// </summary>
-        private static Models.ClrMamePro.Media? ConvertToClrMamePro(Models.Internal.Media? item)
+        private static Models.ClrMamePro.Media? ConvertToClrMamePro(Media? item)
         {
             if (item == null)
                 return null;
 
             var media = new Models.ClrMamePro.Media
             {
-                Name = item.ReadString(Models.Internal.Media.NameKey),
-                MD5 = item.ReadString(Models.Internal.Media.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Media.SHA1Key),
-                SHA256 = item.ReadString(Models.Internal.Media.SHA256Key),
-                SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey),
+                Name = item.ReadString(Media.NameKey),
+                MD5 = item.ReadString(Media.MD5Key),
+                SHA1 = item.ReadString(Media.SHA1Key),
+                SHA256 = item.ReadString(Media.SHA256Key),
+                SpamSum = item.ReadString(Media.SpamSumKey),
             };
             return media;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Release"/> to <cref="Models.ClrMamePro.Release"/>
+        /// Convert from <cref="Release"/> to <cref="Models.ClrMamePro.Release"/>
         /// </summary>
-        private static Models.ClrMamePro.Release? ConvertToClrMamePro(Models.Internal.Release? item)
+        private static Models.ClrMamePro.Release? ConvertToClrMamePro(Release? item)
         {
             if (item == null)
                 return null;
 
             var release = new Models.ClrMamePro.Release
             {
-                Name = item.ReadString(Models.Internal.Release.NameKey),
-                Region = item.ReadString(Models.Internal.Release.RegionKey),
-                Language = item.ReadString(Models.Internal.Release.LanguageKey),
-                Date = item.ReadString(Models.Internal.Release.DateKey),
-                Default = item.ReadString(Models.Internal.Release.DefaultKey),
+                Name = item.ReadString(Release.NameKey),
+                Region = item.ReadString(Release.RegionKey),
+                Language = item.ReadString(Release.LanguageKey),
+                Date = item.ReadString(Release.DateKey),
+                Default = item.ReadString(Release.DefaultKey),
             };
             return release;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.ClrMamePro.Rom"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.ClrMamePro.Rom"/>
         /// </summary>
-        private static Models.ClrMamePro.Rom? ConvertToClrMamePro(Models.Internal.Rom? item)
+        private static Models.ClrMamePro.Rom? ConvertToClrMamePro(Rom? item)
         {
             if (item == null)
                 return null;
 
             var rom = new Models.ClrMamePro.Rom
             {
-                Name = item.ReadString(Models.Internal.Rom.NameKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
-                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
-                MD5 = item.ReadString(Models.Internal.Rom.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
-                SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key),
-                SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key),
-                SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key),
-                SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey),
-                xxHash364 = item.ReadString(Models.Internal.Rom.xxHash364Key),
-                xxHash3128 = item.ReadString(Models.Internal.Rom.xxHash3128Key),
-                Merge = item.ReadString(Models.Internal.Rom.MergeKey),
-                Status = item.ReadString(Models.Internal.Rom.StatusKey),
-                Region = item.ReadString(Models.Internal.Rom.RegionKey),
-                Flags = item.ReadString(Models.Internal.Rom.FlagsKey),
-                Offs = item.ReadString(Models.Internal.Rom.OffsetKey),
-                Serial = item.ReadString(Models.Internal.Rom.SerialKey),
-                Header = item.ReadString(Models.Internal.Rom.HeaderKey),
-                Date = item.ReadString(Models.Internal.Rom.DateKey),
-                Inverted = item.ReadString(Models.Internal.Rom.InvertedKey),
-                MIA = item.ReadString(Models.Internal.Rom.MIAKey),
+                Name = item.ReadString(Rom.NameKey),
+                Size = item.ReadString(Rom.SizeKey),
+                CRC = item.ReadString(Rom.CRCKey),
+                MD5 = item.ReadString(Rom.MD5Key),
+                SHA1 = item.ReadString(Rom.SHA1Key),
+                SHA256 = item.ReadString(Rom.SHA256Key),
+                SHA384 = item.ReadString(Rom.SHA384Key),
+                SHA512 = item.ReadString(Rom.SHA512Key),
+                SpamSum = item.ReadString(Rom.SpamSumKey),
+                xxHash364 = item.ReadString(Rom.xxHash364Key),
+                xxHash3128 = item.ReadString(Rom.xxHash3128Key),
+                Merge = item.ReadString(Rom.MergeKey),
+                Status = item.ReadString(Rom.StatusKey),
+                Region = item.ReadString(Rom.RegionKey),
+                Flags = item.ReadString(Rom.FlagsKey),
+                Offs = item.ReadString(Rom.OffsetKey),
+                Serial = item.ReadString(Rom.SerialKey),
+                Header = item.ReadString(Rom.HeaderKey),
+                Date = item.ReadString(Rom.DateKey),
+                Inverted = item.ReadString(Rom.InvertedKey),
+                MIA = item.ReadString(Rom.MIAKey),
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Sample"/> to <cref="Models.ClrMamePro.Sample"/>
+        /// Convert from <cref="Sample"/> to <cref="Models.ClrMamePro.Sample"/>
         /// </summary>
-        private static Models.ClrMamePro.Sample? ConvertToClrMamePro(Models.Internal.Sample? item)
+        private static Models.ClrMamePro.Sample? ConvertToClrMamePro(Sample? item)
         {
             if (item == null)
                 return null;
 
             var sample = new Models.ClrMamePro.Sample
             {
-                Name = item.ReadString(Models.Internal.Sample.NameKey),
+                Name = item.ReadString(Sample.NameKey),
             };
             return sample;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Sound"/> to <cref="Models.ClrMamePro.Sound"/>
+        /// Convert from <cref="Sound"/> to <cref="Models.ClrMamePro.Sound"/>
         /// </summary>
-        private static Models.ClrMamePro.Sound? ConvertToClrMamePro(Models.Internal.Sound? item)
+        private static Models.ClrMamePro.Sound? ConvertToClrMamePro(Sound? item)
         {
             if (item == null)
                 return null;
 
             var sound = new Models.ClrMamePro.Sound
             {
-                Channels = item.ReadString(Models.Internal.Sound.ChannelsKey),
+                Channels = item.ReadString(Sound.ChannelsKey),
             };
             return sound;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Video"/> to <cref="Models.ClrMamePro.Video"/>
+        /// Convert from <cref="Video"/> to <cref="Models.ClrMamePro.Video"/>
         /// </summary>
-        private static Models.ClrMamePro.Video? ConvertToClrMamePro(Models.Internal.Video? item)
+        private static Models.ClrMamePro.Video? ConvertToClrMamePro(Video? item)
         {
             if (item == null)
                 return null;
 
             var video = new Models.ClrMamePro.Video
             {
-                Screen = item.ReadString(Models.Internal.Video.ScreenKey),
-                Orientation = item.ReadString(Models.Internal.Video.OrientationKey),
-                X = item.ReadString(Models.Internal.Video.WidthKey),
-                Y = item.ReadString(Models.Internal.Video.HeightKey),
-                AspectX = item.ReadString(Models.Internal.Video.AspectXKey),
-                AspectY = item.ReadString(Models.Internal.Video.AspectYKey),
-                Freq = item.ReadString(Models.Internal.Video.RefreshKey),
+                Screen = item.ReadString(Video.ScreenKey),
+                Orientation = item.ReadString(Video.OrientationKey),
+                X = item.ReadString(Video.WidthKey),
+                Y = item.ReadString(Video.HeightKey),
+                AspectX = item.ReadString(Video.AspectXKey),
+                AspectY = item.ReadString(Video.AspectYKey),
+                Freq = item.ReadString(Video.RefreshKey),
             };
             return video;
         }
diff --git a/SabreTools.Serialization/Internal.DosCenter.cs b/SabreTools.Serialization/Internal.DosCenter.cs
index 2ef43386..30b4b2db 100644
--- a/SabreTools.Serialization/Internal.DosCenter.cs
+++ b/SabreTools.Serialization/Internal.DosCenter.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,57 +12,57 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.DosCenter.DosCenter"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.DosCenter.DosCenter"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromDosCenter(Models.DosCenter.DosCenter item)
+        public static Header ConvertHeaderFromDosCenter(Models.DosCenter.DosCenter item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NameKey] = item.Name,
-                [Models.Internal.Header.DescriptionKey] = item.Description,
-                [Models.Internal.Header.VersionKey] = item.Version,
-                [Models.Internal.Header.DateKey] = item.Date,
-                [Models.Internal.Header.AuthorKey] = item.Author,
-                [Models.Internal.Header.HomepageKey] = item.Homepage,
-                [Models.Internal.Header.CommentKey] = item.Comment,
+                [Header.NameKey] = item.Name,
+                [Header.DescriptionKey] = item.Description,
+                [Header.VersionKey] = item.Version,
+                [Header.DateKey] = item.Date,
+                [Header.AuthorKey] = item.Author,
+                [Header.HomepageKey] = item.Homepage,
+                [Header.CommentKey] = item.Comment,
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.DosCenter.Game"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.DosCenter.Game"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromDosCenter(Models.DosCenter.Game item)
+        public static Machine ConvertMachineFromDosCenter(Models.DosCenter.Game item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.NameKey] = item.Name,
+                [Machine.NameKey] = item.Name,
             };
 
             if (item.File != null && item.File.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var file in item.File)
                 {
                     roms.Add(ConvertFromDosCenter(file));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.DosCenter.File"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.DosCenter.File"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromDosCenter(Models.DosCenter.File item)
+        public static Rom ConvertFromDosCenter(Models.DosCenter.File item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.Name,
-                [Models.Internal.Rom.SizeKey] = item.Size,
-                [Models.Internal.Rom.CRCKey] = item.CRC,
-                [Models.Internal.Rom.DateKey] = item.Date,
+                [Rom.NameKey] = item.Name,
+                [Rom.SizeKey] = item.Size,
+                [Rom.CRCKey] = item.CRC,
+                [Rom.DateKey] = item.Date,
             };
             return rom;
         }
@@ -71,59 +72,59 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.DosCenter.DosCenter"/>
+        /// Convert from <cref="Header"/> to <cref="Models.DosCenter.DosCenter"/>
         /// </summary>
-        public static Models.DosCenter.DosCenter? ConvertHeaderToDosCenter(Models.Internal.Header? item)
+        public static Models.DosCenter.DosCenter? ConvertHeaderToDosCenter(Header? item)
         {
             if (item == null)
                 return null;
 
             var dosCenter = new Models.DosCenter.DosCenter
             {
-                Name = item.ReadString(Models.Internal.Header.NameKey),
-                Description = item.ReadString(Models.Internal.Header.DescriptionKey),
-                Version = item.ReadString(Models.Internal.Header.VersionKey),
-                Date = item.ReadString(Models.Internal.Header.DateKey),
-                Author = item.ReadString(Models.Internal.Header.AuthorKey),
-                Homepage = item.ReadString(Models.Internal.Header.HomepageKey),
-                Comment = item.ReadString(Models.Internal.Header.CommentKey),
+                Name = item.ReadString(Header.NameKey),
+                Description = item.ReadString(Header.DescriptionKey),
+                Version = item.ReadString(Header.VersionKey),
+                Date = item.ReadString(Header.DateKey),
+                Author = item.ReadString(Header.AuthorKey),
+                Homepage = item.ReadString(Header.HomepageKey),
+                Comment = item.ReadString(Header.CommentKey),
             };
             return dosCenter;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.DosCenter.Game"/>
+        /// Convert from <cref="Machine"/> to <cref="Models.DosCenter.Game"/>
         /// </summary>
-        public static Models.DosCenter.Game? ConvertMachineToDosCenter(Models.Internal.Machine? item)
+        public static Models.DosCenter.Game? ConvertMachineToDosCenter(Machine? item)
         {
             if (item == null)
                 return null;
 
             var game = new Models.DosCenter.Game
             {
-                Name = item.ReadString(Models.Internal.Machine.NameKey),
+                Name = item.ReadString(Machine.NameKey),
             };
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             game.File = roms?.Select(ConvertToDosCenter)?.ToArray();
 
             return game;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.DosCenter.File"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.DosCenter.File"/>
         /// </summary>
-        private static Models.DosCenter.File? ConvertToDosCenter(Models.Internal.Rom? item)
+        private static Models.DosCenter.File? ConvertToDosCenter(Rom? item)
         {
             if (item == null)
                 return null;
 
             var file = new Models.DosCenter.File
             {
-                Name = item.ReadString(Models.Internal.Rom.NameKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
-                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
-                Date = item.ReadString(Models.Internal.Rom.DateKey),
+                Name = item.ReadString(Rom.NameKey),
+                Size = item.ReadString(Rom.SizeKey),
+                CRC = item.ReadString(Rom.CRCKey),
+                Date = item.ReadString(Rom.DateKey),
             };
             return file;
         }
diff --git a/SabreTools.Serialization/Internal.EverdriveSMDB.cs b/SabreTools.Serialization/Internal.EverdriveSMDB.cs
index 08b09ff6..6e4468ca 100644
--- a/SabreTools.Serialization/Internal.EverdriveSMDB.cs
+++ b/SabreTools.Serialization/Internal.EverdriveSMDB.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -10,42 +11,42 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.EverdriveSMDB.MetadataFile"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.EverdriveSMDB.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromEverdriveSMDB(Models.EverdriveSMDB.MetadataFile item)
+        public static Header ConvertHeaderFromEverdriveSMDB(Models.EverdriveSMDB.MetadataFile item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NameKey] = "Everdrive SMDB",
+                [Header.NameKey] = "Everdrive SMDB",
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
+        public static Machine ConvertMachineFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.RomKey] = ConvertFromEverdriveSMDB(item),
+                [Machine.RomKey] = ConvertFromEverdriveSMDB(item),
             };
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
+        public static Rom ConvertFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.SHA256Key] = item.SHA256,
-                [Models.Internal.Rom.NameKey] = item.Name,
-                [Models.Internal.Rom.SHA1Key] = item.SHA1,
-                [Models.Internal.Rom.MD5Key] = item.MD5,
-                [Models.Internal.Rom.CRCKey] = item.CRC32,
-                [Models.Internal.Rom.SizeKey] = item.Size,
+                [Rom.SHA256Key] = item.SHA256,
+                [Rom.NameKey] = item.Name,
+                [Rom.SHA1Key] = item.SHA1,
+                [Rom.MD5Key] = item.MD5,
+                [Rom.CRCKey] = item.CRC32,
+                [Rom.SizeKey] = item.Size,
             };
             return rom;
         }
@@ -55,33 +56,33 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.EverdriveSMDB.Row"/>
+        /// Convert from <cref="Machine"/> to an array of <cref="Models.EverdriveSMDB.Row"/>
         /// </summary>
-        public static Models.EverdriveSMDB.Row[]? ConvertMachineToEverdriveSMDB(Models.Internal.Machine item)
+        public static Models.EverdriveSMDB.Row[]? ConvertMachineToEverdriveSMDB(Machine item)
         {
             if (item == null)
                 return null;
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             return roms?.Select(ConvertToEverdriveSMDB)?.ToArray();
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.EverdriveSMDB.Row"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.EverdriveSMDB.Row"/>
         /// </summary>
-        private static Models.EverdriveSMDB.Row? ConvertToEverdriveSMDB(Models.Internal.Rom? item)
+        private static Models.EverdriveSMDB.Row? ConvertToEverdriveSMDB(Rom? item)
         {
             if (item == null)
                 return null;
 
             var row = new Models.EverdriveSMDB.Row
             {
-                SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key),
-                Name = item.ReadString(Models.Internal.Rom.NameKey),
-                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
-                MD5 = item.ReadString(Models.Internal.Rom.MD5Key),
-                CRC32 = item.ReadString(Models.Internal.Rom.CRCKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
+                SHA256 = item.ReadString(Rom.SHA256Key),
+                Name = item.ReadString(Rom.NameKey),
+                SHA1 = item.ReadString(Rom.SHA1Key),
+                MD5 = item.ReadString(Rom.MD5Key),
+                CRC32 = item.ReadString(Rom.CRCKey),
+                Size = item.ReadString(Rom.SizeKey),
             };
             return row;
         }
diff --git a/SabreTools.Serialization/Internal.Hashfile.cs b/SabreTools.Serialization/Internal.Hashfile.cs
index 3ca1e082..3d7444f8 100644
--- a/SabreTools.Serialization/Internal.Hashfile.cs
+++ b/SabreTools.Serialization/Internal.Hashfile.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using SabreTools.Core;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -12,184 +13,184 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromHashfile(Models.Hashfile.Hashfile item)
+        public static Header ConvertHeaderFromHashfile(Models.Hashfile.Hashfile item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NameKey] = "Hashfile",
+                [Header.NameKey] = "Hashfile",
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromHashfile(Models.Hashfile.Hashfile item)
+        public static Machine ConvertMachineFromHashfile(Models.Hashfile.Hashfile item)
         {
-            var machine = new Models.Internal.Machine();
+            var machine = new Machine();
 
             if (item.SFV != null && item.SFV.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var sfv in item.SFV)
                 {
                     roms.Add(ConvertFromSFV(sfv));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             else if (item.MD5 != null && item.MD5.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var md5 in item.MD5)
                 {
                     roms.Add(ConvertFromMD5(md5));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             else if (item.SHA1 != null && item.SHA1.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var sha1 in item.SHA1)
                 {
                     roms.Add(ConvertFromSHA1(sha1));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             else if (item.SHA256 != null && item.SHA256.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var sha256 in item.SHA256)
                 {
                     roms.Add(ConvertFromSHA256(sha256));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             else if (item.SHA384 != null && item.SHA384.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var sha384 in item.SHA384)
                 {
                     roms.Add(ConvertFromSHA384(sha384));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             else if (item.SHA512 != null && item.SHA512.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var sha512 in item.SHA512)
                 {
                     roms.Add(ConvertFromSHA512(sha512));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             else if (item.SpamSum != null && item.SpamSum.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var spamSum in item.SpamSum)
                 {
                     roms.Add(ConvertFromSpamSum(spamSum));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.MD5"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Hashfile.MD5"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromMD5(Models.Hashfile.MD5 item)
+        public static Rom ConvertFromMD5(Models.Hashfile.MD5 item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.MD5Key] = item.Hash,
-                [Models.Internal.Rom.NameKey] = item.File,
+                [Rom.MD5Key] = item.Hash,
+                [Rom.NameKey] = item.File,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.SFV"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Hashfile.SFV"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromSFV(Models.Hashfile.SFV item)
+        public static Rom ConvertFromSFV(Models.Hashfile.SFV item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.File,
-                [Models.Internal.Rom.CRCKey] = item.Hash,
+                [Rom.NameKey] = item.File,
+                [Rom.CRCKey] = item.Hash,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.SHA1"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Hashfile.SHA1"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromSHA1(Models.Hashfile.SHA1 item)
+        public static Rom ConvertFromSHA1(Models.Hashfile.SHA1 item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.SHA1Key] = item.Hash,
-                [Models.Internal.Rom.NameKey] = item.File,
+                [Rom.SHA1Key] = item.Hash,
+                [Rom.NameKey] = item.File,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.SHA256"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Hashfile.SHA256"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromSHA256(Models.Hashfile.SHA256 item)
+        public static Rom ConvertFromSHA256(Models.Hashfile.SHA256 item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.SHA256Key] = item.Hash,
-                [Models.Internal.Rom.NameKey] = item.File,
+                [Rom.SHA256Key] = item.Hash,
+                [Rom.NameKey] = item.File,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.SHA384"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Hashfile.SHA384"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromSHA384(Models.Hashfile.SHA384 item)
+        public static Rom ConvertFromSHA384(Models.Hashfile.SHA384 item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.SHA384Key] = item.Hash,
-                [Models.Internal.Rom.NameKey] = item.File,
+                [Rom.SHA384Key] = item.Hash,
+                [Rom.NameKey] = item.File,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.SHA512"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Hashfile.SHA512"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromSHA512(Models.Hashfile.SHA512 item)
+        public static Rom ConvertFromSHA512(Models.Hashfile.SHA512 item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.SHA512Key] = item.Hash,
-                [Models.Internal.Rom.NameKey] = item.File,
+                [Rom.SHA512Key] = item.Hash,
+                [Rom.NameKey] = item.File,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Hashfile.SpamSum"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Hashfile.SpamSum"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromSpamSum(Models.Hashfile.SpamSum item)
+        public static Rom ConvertFromSpamSum(Models.Hashfile.SpamSum item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.SpamSumKey] = item.Hash,
-                [Models.Internal.Rom.NameKey] = item.File,
+                [Rom.SpamSumKey] = item.Hash,
+                [Rom.NameKey] = item.File,
             };
             return rom;
         }
@@ -199,14 +200,14 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.Hashfile.Hashfile"/>
+        /// Convert from <cref="Machine"/> to <cref="Models.Hashfile.Hashfile"/>
         /// </summary>
-        public static Models.Hashfile.Hashfile? ConvertMachineToHashfile(Models.Internal.Machine? item, Hash hash)
+        public static Models.Hashfile.Hashfile? ConvertMachineToHashfile(Machine? item, Hash hash)
         {
             if (item == null)
                 return null;
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             return new Models.Hashfile.Hashfile
             {
                 SFV = hash == Hash.CRC ? roms?.Select(ConvertToSFV)?.ToArray() : null,
@@ -220,113 +221,113 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.MD5"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.MD5"/>
         /// </summary>
-        private static Models.Hashfile.MD5? ConvertToMD5(Models.Internal.Rom? item)
+        private static Models.Hashfile.MD5? ConvertToMD5(Rom? item)
         {
             if (item == null)
                 return null;
 
             var md5 = new Models.Hashfile.MD5
             {
-                Hash = item.ReadString(Models.Internal.Rom.MD5Key),
-                File = item.ReadString(Models.Internal.Rom.NameKey),
+                Hash = item.ReadString(Rom.MD5Key),
+                File = item.ReadString(Rom.NameKey),
             };
             return md5;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SFV"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SFV"/>
         /// </summary>
-        private static Models.Hashfile.SFV? ConvertToSFV(Models.Internal.Rom? item)
+        private static Models.Hashfile.SFV? ConvertToSFV(Rom? item)
         {
             if (item == null)
                 return null;
 
             var sfv = new Models.Hashfile.SFV
             {
-                File = item.ReadString(Models.Internal.Rom.NameKey),
-                Hash = item.ReadString(Models.Internal.Rom.CRCKey),
+                File = item.ReadString(Rom.NameKey),
+                Hash = item.ReadString(Rom.CRCKey),
             };
             return sfv;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA1"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA1"/>
         /// </summary>
-        private static Models.Hashfile.SHA1? ConvertToSHA1(Models.Internal.Rom? item)
+        private static Models.Hashfile.SHA1? ConvertToSHA1(Rom? item)
         {
             if (item == null)
                 return null;
 
             var sha1 = new Models.Hashfile.SHA1
             {
-                Hash = item.ReadString(Models.Internal.Rom.SHA1Key),
-                File = item.ReadString(Models.Internal.Rom.NameKey),
+                Hash = item.ReadString(Rom.SHA1Key),
+                File = item.ReadString(Rom.NameKey),
             };
             return sha1;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA256"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA256"/>
         /// </summary>
-        private static Models.Hashfile.SHA256? ConvertToSHA256(Models.Internal.Rom? item)
+        private static Models.Hashfile.SHA256? ConvertToSHA256(Rom? item)
         {
             if (item == null)
                 return null;
 
             var sha256 = new Models.Hashfile.SHA256
             {
-                Hash = item.ReadString(Models.Internal.Rom.SHA256Key),
-                File = item.ReadString(Models.Internal.Rom.NameKey),
+                Hash = item.ReadString(Rom.SHA256Key),
+                File = item.ReadString(Rom.NameKey),
             };
             return sha256;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA384"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA384"/>
         /// </summary>
-        private static Models.Hashfile.SHA384? ConvertToSHA384(Models.Internal.Rom? item)
+        private static Models.Hashfile.SHA384? ConvertToSHA384(Rom? item)
         {
             if (item == null)
                 return null;
 
             var sha384 = new Models.Hashfile.SHA384
             {
-                Hash = item.ReadString(Models.Internal.Rom.SHA384Key),
-                File = item.ReadString(Models.Internal.Rom.NameKey),
+                Hash = item.ReadString(Rom.SHA384Key),
+                File = item.ReadString(Rom.NameKey),
             };
             return sha384;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA512"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA512"/>
         /// </summary>
-        private static Models.Hashfile.SHA512? ConvertToSHA512(Models.Internal.Rom? item)
+        private static Models.Hashfile.SHA512? ConvertToSHA512(Rom? item)
         {
             if (item == null)
                 return null;
 
             var sha512 = new Models.Hashfile.SHA512
             {
-                Hash = item.ReadString(Models.Internal.Rom.SHA512Key),
-                File = item.ReadString(Models.Internal.Rom.NameKey),
+                Hash = item.ReadString(Rom.SHA512Key),
+                File = item.ReadString(Rom.NameKey),
             };
             return sha512;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SpamSum"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SpamSum"/>
         /// </summary>
-        private static Models.Hashfile.SpamSum? ConvertToSpamSum(Models.Internal.Rom? item)
+        private static Models.Hashfile.SpamSum? ConvertToSpamSum(Rom? item)
         {
             if (item == null)
                 return null;
 
             var spamsum = new Models.Hashfile.SpamSum
             {
-                Hash = item.ReadString(Models.Internal.Rom.SpamSumKey),
-                File = item.ReadString(Models.Internal.Rom.NameKey),
+                Hash = item.ReadString(Rom.SpamSumKey),
+                File = item.ReadString(Rom.NameKey),
             };
             return spamsum;
         }
diff --git a/SabreTools.Serialization/Internal.Listrom.cs b/SabreTools.Serialization/Internal.Listrom.cs
index 775e2a76..1df8a647 100644
--- a/SabreTools.Serialization/Internal.Listrom.cs
+++ b/SabreTools.Serialization/Internal.Listrom.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,83 +12,83 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.Listrom.MetadataFile"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.Listrom.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromListrom(Models.Listrom.MetadataFile item)
+        public static Header ConvertHeaderFromListrom(Models.Listrom.MetadataFile item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NameKey] = "MAME Listrom",
+                [Header.NameKey] = "MAME Listrom",
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listrom.Set"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.Listrom.Set"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromListrom(Models.Listrom.Set item)
+        public static Machine ConvertMachineFromListrom(Models.Listrom.Set item)
         {
-            var machine = new Models.Internal.Machine();
+            var machine = new Machine();
             if (!string.IsNullOrWhiteSpace(item.Device))
             {
-                machine[Models.Internal.Machine.NameKey] = item.Device;
-                machine[Models.Internal.Machine.IsDeviceKey] = "yes";
+                machine[Machine.NameKey] = item.Device;
+                machine[Machine.IsDeviceKey] = "yes";
             }
             else
             {
-                machine[Models.Internal.Machine.NameKey] = item.Driver;
+                machine[Machine.NameKey] = item.Driver;
             }
 
             if (item.Row != null && item.Row.Any())
             {
-                var datItems = new List<Models.Internal.DatItem>();
+                var datItems = new List<DatItem>();
                 foreach (var file in item.Row)
                 {
                     datItems.Add(ConvertFromListrom(file));
                 }
 
-                machine[Models.Internal.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Internal.DatItem.TypeKey) == "disk")?.ToArray();
-                machine[Models.Internal.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Internal.DatItem.TypeKey) == "rom")?.ToArray();
+                machine[Machine.DiskKey] = datItems.Where(i => i.ReadString(DatItem.TypeKey) == "disk")?.ToArray();
+                machine[Machine.RomKey] = datItems.Where(i => i.ReadString(DatItem.TypeKey) == "rom")?.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listrom.Row"/> to <cref="Models.Internal.DatItem"/>
+        /// Convert from <cref="Models.Listrom.Row"/> to <cref="DatItem"/>
         /// </summary>
-        public static Models.Internal.DatItem ConvertFromListrom(Models.Listrom.Row item)
+        public static DatItem ConvertFromListrom(Models.Listrom.Row item)
         {
             if (item.Size == null)
             {
-                var disk = new Models.Internal.Disk
+                var disk = new Disk
                 {
-                    [Models.Internal.Disk.NameKey] = item.Name,
-                    [Models.Internal.Disk.MD5Key] = item.MD5,
-                    [Models.Internal.Disk.SHA1Key] = item.SHA1,
+                    [Disk.NameKey] = item.Name,
+                    [Disk.MD5Key] = item.MD5,
+                    [Disk.SHA1Key] = item.SHA1,
                 };
 
                 if (item.NoGoodDumpKnown)
-                    disk[Models.Internal.Disk.StatusKey] = "nodump";
+                    disk[Disk.StatusKey] = "nodump";
                 else if (item.Bad)
-                    disk[Models.Internal.Disk.StatusKey] = "baddump";
+                    disk[Disk.StatusKey] = "baddump";
 
                 return disk;
             }
             else
             {
-                var rom = new Models.Internal.Rom
+                var rom = new Rom
                 {
-                    [Models.Internal.Rom.NameKey] = item.Name,
-                    [Models.Internal.Rom.SizeKey] = item.Size,
-                    [Models.Internal.Rom.CRCKey] = item.CRC,
-                    [Models.Internal.Rom.SHA1Key] = item.SHA1,
+                    [Rom.NameKey] = item.Name,
+                    [Rom.SizeKey] = item.Size,
+                    [Rom.CRCKey] = item.CRC,
+                    [Rom.SHA1Key] = item.SHA1,
                 };
 
                 if (item.NoGoodDumpKnown)
-                    rom[Models.Internal.Rom.StatusKey] = "nodump";
+                    rom[Rom.StatusKey] = "nodump";
                 else if (item.Bad)
-                    rom[Models.Internal.Rom.StatusKey] = "baddump";
+                    rom[Rom.StatusKey] = "baddump";
 
                 return rom;
             }
@@ -98,26 +99,26 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.Listrom.Set"/>
+        /// Convert from <cref="Machine"/> to <cref="Models.Listrom.Set"/>
         /// </summary>
-        public static Models.Listrom.Set? ConvertMachineToListrom(Models.Internal.Machine? item)
+        public static Models.Listrom.Set? ConvertMachineToListrom(Machine? item)
         {
             if (item == null)
                 return null;
 
             var set = new Models.Listrom.Set();
-            if (item.ReadString(Models.Internal.Machine.IsDeviceKey) == "yes")
-                set.Device = item.ReadString(Models.Internal.Machine.NameKey);
+            if (item.ReadString(Machine.IsDeviceKey) == "yes")
+                set.Device = item.ReadString(Machine.NameKey);
             else
-                set.Driver = item.ReadString(Models.Internal.Machine.NameKey);
+                set.Driver = item.ReadString(Machine.NameKey);
 
             var rowItems = new List<Models.Listrom.Row>();
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             if (roms != null)
                 rowItems.AddRange(roms.Select(ConvertToListrom));
 
-            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
+            var disks = item.Read<Disk[]>(Machine.DiskKey);
             if (disks != null)
                 rowItems.AddRange(disks.Select(ConvertToListrom));
 
@@ -126,47 +127,47 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.Listrom.Row"/>
+        /// Convert from <cref="Disk"/> to <cref="Models.Listrom.Row"/>
         /// </summary>
-        private static Models.Listrom.Row? ConvertToListrom(Models.Internal.Disk? item)
+        private static Models.Listrom.Row? ConvertToListrom(Disk? item)
         {
             if (item == null)
                 return null;
             
             var row = new Models.Listrom.Row
             {
-                Name = item.ReadString(Models.Internal.Disk.NameKey),
-                MD5 = item.ReadString(Models.Internal.Disk.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key),
+                Name = item.ReadString(Disk.NameKey),
+                MD5 = item.ReadString(Disk.MD5Key),
+                SHA1 = item.ReadString(Disk.SHA1Key),
             };
 
-            if (item[Models.Internal.Disk.StatusKey] as string == "nodump")
+            if (item[Disk.StatusKey] as string == "nodump")
                 row.NoGoodDumpKnown = true;
-            else if (item[Models.Internal.Disk.StatusKey] as string == "baddump")
+            else if (item[Disk.StatusKey] as string == "baddump")
                 row.Bad = true;
 
             return row;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Listrom.Row"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Listrom.Row"/>
         /// </summary>
-        private static Models.Listrom.Row? ConvertToListrom(Models.Internal.Rom? item)
+        private static Models.Listrom.Row? ConvertToListrom(Rom? item)
         {
             if (item == null)
                 return null;
             
             var row = new Models.Listrom.Row
             {
-                Name = item.ReadString(Models.Internal.Rom.NameKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
-                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
-                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
+                Name = item.ReadString(Rom.NameKey),
+                Size = item.ReadString(Rom.SizeKey),
+                CRC = item.ReadString(Rom.CRCKey),
+                SHA1 = item.ReadString(Rom.SHA1Key),
             };
 
-            if (item[Models.Internal.Rom.StatusKey] as string == "nodump")
+            if (item[Rom.StatusKey] as string == "nodump")
                 row.NoGoodDumpKnown = true;
-            else if (item[Models.Internal.Rom.StatusKey] as string == "baddump")
+            else if (item[Rom.StatusKey] as string == "baddump")
                 row.Bad = true;
 
             return row;
diff --git a/SabreTools.Serialization/Internal.Listxml.cs b/SabreTools.Serialization/Internal.Listxml.cs
index c144973c..27da5d50 100644
--- a/SabreTools.Serialization/Internal.Listxml.cs
+++ b/SabreTools.Serialization/Internal.Listxml.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,797 +12,797 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.M1"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.Listxml.M1"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromListxml(Models.Listxml.M1 item)
+        public static Header ConvertHeaderFromListxml(Models.Listxml.M1 item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.VersionKey] = item.Version,
+                [Header.VersionKey] = item.Version,
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Mame"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.Listxml.Mame"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromListxml(Models.Listxml.Mame item)
+        public static Header ConvertHeaderFromListxml(Models.Listxml.Mame item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.BuildKey] = item.Build,
-                [Models.Internal.Header.DebugKey] = item.Debug,
-                [Models.Internal.Header.MameConfigKey] = item.MameConfig,
+                [Header.BuildKey] = item.Build,
+                [Header.DebugKey] = item.Debug,
+                [Header.MameConfigKey] = item.MameConfig,
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.GameBase"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.Listxml.GameBase"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromListxml(Models.Listxml.GameBase item)
+        public static Machine ConvertMachineFromListxml(Models.Listxml.GameBase item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new 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,
+                [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<Models.Internal.BiosSet>();
+                var biosSets = new List<BiosSet>();
                 foreach (var biosSet in item.BiosSet)
                 {
                     biosSets.Add(ConvertFromListxml(biosSet));
                 }
-                machine[Models.Internal.Machine.BiosSetKey] = biosSets.ToArray();
+                machine[Machine.BiosSetKey] = biosSets.ToArray();
             }
 
             if (item.Rom != null && item.Rom.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
                     roms.Add(ConvertFromListxml(rom));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             if (item.Disk != null && item.Disk.Any())
             {
-                var disks = new List<Models.Internal.Disk>();
+                var disks = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
                     disks.Add(ConvertFromListxml(disk));
                 }
-                machine[Models.Internal.Machine.DiskKey] = disks.ToArray();
+                machine[Machine.DiskKey] = disks.ToArray();
             }
 
             if (item.DeviceRef != null && item.DeviceRef.Any())
             {
-                var deviceRefs = new List<Models.Internal.DeviceRef>();
+                var deviceRefs = new List<DeviceRef>();
                 foreach (var deviceRef in item.DeviceRef)
                 {
                     deviceRefs.Add(ConvertFromListxml(deviceRef));
                 }
-                machine[Models.Internal.Machine.DeviceRefKey] = deviceRefs.ToArray();
+                machine[Machine.DeviceRefKey] = deviceRefs.ToArray();
             }
 
             if (item.Sample != null && item.Sample.Any())
             {
-                var samples = new List<Models.Internal.Sample>();
+                var samples = new List<Sample>();
                 foreach (var sample in item.Sample)
                 {
                     samples.Add(ConvertFromListxml(sample));
                 }
-                machine[Models.Internal.Machine.SampleKey] = samples.ToArray();
+                machine[Machine.SampleKey] = samples.ToArray();
             }
 
             if (item.Chip != null && item.Chip.Any())
             {
-                var chips = new List<Models.Internal.Chip>();
+                var chips = new List<Chip>();
                 foreach (var chip in item.Chip)
                 {
                     chips.Add(ConvertFromListxml(chip));
                 }
-                machine[Models.Internal.Machine.ChipKey] = chips.ToArray();
+                machine[Machine.ChipKey] = chips.ToArray();
             }
 
             if (item.Display != null && item.Display.Any())
             {
-                var displays = new List<Models.Internal.Display>();
+                var displays = new List<Display>();
                 foreach (var display in item.Display)
                 {
                     displays.Add(ConvertFromListxml(display));
                 }
-                machine[Models.Internal.Machine.DisplayKey] = displays.ToArray();
+                machine[Machine.DisplayKey] = displays.ToArray();
             }
 
             if (item.Video != null && item.Video.Any())
             {
-                var videos = new List<Models.Internal.Video>();
+                var videos = new List<Video>();
                 foreach (var video in item.Video)
                 {
                     videos.Add(ConvertFromListxml(video));
                 }
-                machine[Models.Internal.Machine.VideoKey] = videos.ToArray();
+                machine[Machine.VideoKey] = videos.ToArray();
             }
 
             if (item.Sound != null)
-                machine[Models.Internal.Machine.SoundKey] = ConvertFromListxml(item.Sound);
+                machine[Machine.SoundKey] = ConvertFromListxml(item.Sound);
 
             if (item.Input != null)
-                machine[Models.Internal.Machine.InputKey] = ConvertFromListxml(item.Input);
+                machine[Machine.InputKey] = ConvertFromListxml(item.Input);
 
             if (item.DipSwitch != null && item.DipSwitch.Any())
             {
-                var dipSwitches = new List<Models.Internal.DipSwitch>();
+                var dipSwitches = new List<DipSwitch>();
                 foreach (var dipSwitch in item.DipSwitch)
                 {
                     dipSwitches.Add(ConvertFromListxml(dipSwitch));
                 }
-                machine[Models.Internal.Machine.DipSwitchKey] = dipSwitches.ToArray();
+                machine[Machine.DipSwitchKey] = dipSwitches.ToArray();
             }
 
             if (item.Configuration != null && item.Configuration.Any())
             {
-                var configurations = new List<Models.Internal.Configuration>();
+                var configurations = new List<Configuration>();
                 foreach (var configuration in item.Configuration)
                 {
                     configurations.Add(ConvertFromListxml(configuration));
                 }
-                machine[Models.Internal.Machine.ConfigurationKey] = configurations.ToArray();
+                machine[Machine.ConfigurationKey] = configurations.ToArray();
             }
 
             if (item.Port != null && item.Port.Any())
             {
-                var ports = new List<Models.Internal.Port>();
+                var ports = new List<Port>();
                 foreach (var port in item.Port)
                 {
                     ports.Add(ConvertFromListxml(port));
                 }
-                machine[Models.Internal.Machine.PortKey] = ports.ToArray();
+                machine[Machine.PortKey] = ports.ToArray();
             }
 
             if (item.Adjuster != null && item.Adjuster.Any())
             {
-                var adjusters = new List<Models.Internal.Adjuster>();
+                var adjusters = new List<Adjuster>();
                 foreach (var adjuster in item.Adjuster)
                 {
                     adjusters.Add(ConvertFromListxml(adjuster));
                 }
-                machine[Models.Internal.Machine.AdjusterKey] = adjusters.ToArray();
+                machine[Machine.AdjusterKey] = adjusters.ToArray();
             }
 
             if (item.Driver != null)
-                machine[Models.Internal.Machine.DriverKey] = ConvertFromListxml(item.Driver);
+                machine[Machine.DriverKey] = ConvertFromListxml(item.Driver);
 
             if (item.Feature != null && item.Feature.Any())
             {
-                var features = new List<Models.Internal.Feature>();
+                var features = new List<Feature>();
                 foreach (var feature in item.Feature)
                 {
                     features.Add(ConvertFromListxml(feature));
                 }
-                machine[Models.Internal.Machine.FeatureKey] = features.ToArray();
+                machine[Machine.FeatureKey] = features.ToArray();
             }
 
             if (item.Device != null && item.Device.Any())
             {
-                var devices = new List<Models.Internal.Device>();
+                var devices = new List<Device>();
                 foreach (var device in item.Device)
                 {
                     devices.Add(ConvertFromListxml(device));
                 }
-                machine[Models.Internal.Machine.DeviceKey] = devices.ToArray();
+                machine[Machine.DeviceKey] = devices.ToArray();
             }
 
             if (item.Slot != null && item.Slot.Any())
             {
-                var slots = new List<Models.Internal.Slot>();
+                var slots = new List<Slot>();
                 foreach (var slot in item.Slot)
                 {
                     slots.Add(ConvertFromListxml(slot));
                 }
-                machine[Models.Internal.Machine.SlotKey] = slots.ToArray();
+                machine[Machine.SlotKey] = slots.ToArray();
             }
 
             if (item.SoftwareList != null && item.SoftwareList.Any())
             {
-                var softwareLists = new List<Models.Internal.SoftwareList>();
+                var softwareLists = new List<SoftwareList>();
                 foreach (var softwareList in item.SoftwareList)
                 {
                     softwareLists.Add(ConvertFromListxml(softwareList));
                 }
-                machine[Models.Internal.Machine.SoftwareListKey] = softwareLists.ToArray();
+                machine[Machine.SoftwareListKey] = softwareLists.ToArray();
             }
 
             if (item.RamOption != null && item.RamOption.Any())
             {
-                var ramOptions = new List<Models.Internal.RamOption>();
+                var ramOptions = new List<RamOption>();
                 foreach (var ramOption in item.RamOption)
                 {
                     ramOptions.Add(ConvertFromListxml(ramOption));
                 }
-                machine[Models.Internal.Machine.RamOptionKey] = ramOptions.ToArray();
+                machine[Machine.RamOptionKey] = ramOptions.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Adjuster"/> to <cref="Models.Internal.Adjuster"/>
+        /// Convert from <cref="Models.Listxml.Adjuster"/> to <cref="Adjuster"/>
         /// </summary>
-        public static Models.Internal.Adjuster ConvertFromListxml(Models.Listxml.Adjuster item)
+        public static Adjuster ConvertFromListxml(Models.Listxml.Adjuster item)
         {
-            var adjuster = new Models.Internal.Adjuster
+            var adjuster = new Adjuster
             {
-                [Models.Internal.Adjuster.NameKey] = item.Name,
-                [Models.Internal.Adjuster.DefaultKey] = item.Default,
+                [Adjuster.NameKey] = item.Name,
+                [Adjuster.DefaultKey] = item.Default,
             };
 
             if (item.Condition != null)
-                adjuster[Models.Internal.Adjuster.ConditionKey] = ConvertFromListxml(item.Condition);
+                adjuster[Adjuster.ConditionKey] = ConvertFromListxml(item.Condition);
 
             return adjuster;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Analog"/> to <cref="Models.Internal.Analog"/>
+        /// Convert from <cref="Models.Listxml.Analog"/> to <cref="Analog"/>
         /// </summary>
-        public static Models.Internal.Analog ConvertFromListxml(Models.Listxml.Analog item)
+        public static Analog ConvertFromListxml(Models.Listxml.Analog item)
         {
-            var analog = new Models.Internal.Analog
+            var analog = new Analog
             {
-                [Models.Internal.Analog.MaskKey] = item.Mask,
+                [Analog.MaskKey] = item.Mask,
             };
             return analog;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.BiosSet"/> to <cref="Models.Internal.BiosSet"/>
+        /// Convert from <cref="Models.Listxml.BiosSet"/> to <cref="BiosSet"/>
         /// </summary>
-        public static Models.Internal.BiosSet ConvertFromListxml(Models.Listxml.BiosSet item)
+        public static BiosSet ConvertFromListxml(Models.Listxml.BiosSet item)
         {
-            var biosset = new Models.Internal.BiosSet
+            var biosset = new BiosSet
             {
-                [Models.Internal.BiosSet.NameKey] = item.Name,
-                [Models.Internal.BiosSet.DescriptionKey] = item.Description,
-                [Models.Internal.BiosSet.DefaultKey] = item.Default,
+                [BiosSet.NameKey] = item.Name,
+                [BiosSet.DescriptionKey] = item.Description,
+                [BiosSet.DefaultKey] = item.Default,
             };
             return biosset;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Chip"/> to <cref="Models.Internal.Chip"/>
+        /// Convert from <cref="Models.Listxml.Chip"/> to <cref="Chip"/>
         /// </summary>
-        public static Models.Internal.Chip ConvertFromListxml(Models.Listxml.Chip item)
+        public static Chip ConvertFromListxml(Models.Listxml.Chip item)
         {
-            var chip = new Models.Internal.Chip
+            var chip = new 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,
+                [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="Models.Internal.Condition"/>
+        /// Convert from <cref="Models.Listxml.Condition"/> to <cref="Condition"/>
         /// </summary>
-        public static Models.Internal.Condition ConvertFromListxml(Models.Listxml.Condition item)
+        public static Condition ConvertFromListxml(Models.Listxml.Condition item)
         {
-            var condition = new Models.Internal.Condition
+            var condition = new 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,
+                [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="Models.Internal.Configuration"/>
+        /// Convert from <cref="Models.Listxml.Configuration"/> to <cref="Configuration"/>
         /// </summary>
-        public static Models.Internal.Configuration ConvertFromListxml(Models.Listxml.Configuration item)
+        public static Configuration ConvertFromListxml(Models.Listxml.Configuration item)
         {
-            var configuration = new Models.Internal.Configuration
+            var configuration = new Configuration
             {
-                [Models.Internal.Configuration.NameKey] = item.Name,
-                [Models.Internal.Configuration.TagKey] = item.Tag,
-                [Models.Internal.Configuration.MaskKey] = item.Mask,
+                [Configuration.NameKey] = item.Name,
+                [Configuration.TagKey] = item.Tag,
+                [Configuration.MaskKey] = item.Mask,
             };
 
             if (item.Condition != null)
-                configuration[Models.Internal.Configuration.ConditionKey] = ConvertFromListxml(item.Condition);
+                configuration[Configuration.ConditionKey] = ConvertFromListxml(item.Condition);
 
             if (item.ConfLocation != null && item.ConfLocation.Any())
             {
-                var confLocations = new List<Models.Internal.ConfLocation>();
+                var confLocations = new List<ConfLocation>();
                 foreach (var confLocation in item.ConfLocation)
                 {
                     confLocations.Add(ConvertFromListxml(confLocation));
                 }
-                configuration[Models.Internal.Configuration.ConfLocationKey] = confLocations.ToArray();
+                configuration[Configuration.ConfLocationKey] = confLocations.ToArray();
             }
 
             if (item.ConfSetting != null && item.ConfSetting.Any())
             {
-                var confSettings = new List<Models.Internal.ConfSetting>();
+                var confSettings = new List<ConfSetting>();
                 foreach (var confSetting in item.ConfSetting)
                 {
                     confSettings.Add(ConvertFromListxml(confSetting));
                 }
-                configuration[Models.Internal.Configuration.ConfSettingKey] = confSettings.ToArray();
+                configuration[Configuration.ConfSettingKey] = confSettings.ToArray();
             }
 
             return configuration;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.ConfLocation"/> to <cref="Models.Internal.ConfLocation"/>
+        /// Convert from <cref="Models.Listxml.ConfLocation"/> to <cref="ConfLocation"/>
         /// </summary>
-        public static Models.Internal.ConfLocation ConvertFromListxml(Models.Listxml.ConfLocation item)
+        public static ConfLocation ConvertFromListxml(Models.Listxml.ConfLocation item)
         {
-            var confLocation = new Models.Internal.ConfLocation
+            var confLocation = new ConfLocation
             {
-                [Models.Internal.ConfLocation.NameKey] = item.Name,
-                [Models.Internal.ConfLocation.NumberKey] = item.Number,
-                [Models.Internal.ConfLocation.InvertedKey] = item.Inverted,
+                [ConfLocation.NameKey] = item.Name,
+                [ConfLocation.NumberKey] = item.Number,
+                [ConfLocation.InvertedKey] = item.Inverted,
             };
             return confLocation;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.ConfSetting"/> to <cref="Models.Internal.ConfSetting"/>
+        /// Convert from <cref="Models.Listxml.ConfSetting"/> to <cref="ConfSetting"/>
         /// </summary>
-        public static Models.Internal.ConfSetting ConvertFromListxml(Models.Listxml.ConfSetting item)
+        public static ConfSetting ConvertFromListxml(Models.Listxml.ConfSetting item)
         {
-            var confSetting = new Models.Internal.ConfSetting
+            var confSetting = new ConfSetting
             {
-                [Models.Internal.ConfSetting.NameKey] = item.Name,
-                [Models.Internal.ConfSetting.ValueKey] = item.Value,
-                [Models.Internal.ConfSetting.DefaultKey] = item.Default,
+                [ConfSetting.NameKey] = item.Name,
+                [ConfSetting.ValueKey] = item.Value,
+                [ConfSetting.DefaultKey] = item.Default,
             };
 
             if (item.Condition != null)
-                confSetting[Models.Internal.ConfSetting.ConditionKey] = ConvertFromListxml(item.Condition);
+                confSetting[ConfSetting.ConditionKey] = ConvertFromListxml(item.Condition);
 
             return confSetting;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Control"/> to <cref="Models.Internal.Control"/>
+        /// Convert from <cref="Models.Listxml.Control"/> to <cref="Control"/>
         /// </summary>
-        public static Models.Internal.Control ConvertFromListxml(Models.Listxml.Control item)
+        public static Control ConvertFromListxml(Models.Listxml.Control item)
         {
-            var control = new Models.Internal.Control
+            var control = new 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,
+                [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="Models.Internal.Device"/>
+        /// Convert from <cref="Models.Listxml.Device"/> to <cref="Device"/>
         /// </summary>
-        public static Models.Internal.Device ConvertFromListxml(Models.Listxml.Device item)
+        public static Device ConvertFromListxml(Models.Listxml.Device item)
         {
-            var device = new Models.Internal.Device
+            var device = new 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,
+                [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[Models.Internal.Device.InstanceKey] = ConvertFromListxml(item.Instance);
+                device[Device.InstanceKey] = ConvertFromListxml(item.Instance);
 
             if (item.Extension != null && item.Extension.Any())
             {
-                var extensions = new List<Models.Internal.Extension>();
+                var extensions = new List<Extension>();
                 foreach (var extension in item.Extension)
                 {
                     extensions.Add(ConvertFromListxml(extension));
                 }
-                device[Models.Internal.Device.ExtensionKey] = extensions.ToArray();
+                device[Device.ExtensionKey] = extensions.ToArray();
             }
 
             return device;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.DeviceRef"/> to <cref="Models.Internal.DeviceRef"/>
+        /// Convert from <cref="Models.Listxml.DeviceRef"/> to <cref="DeviceRef"/>
         /// </summary>
-        public static Models.Internal.DeviceRef ConvertFromListxml(Models.Listxml.DeviceRef item)
+        public static DeviceRef ConvertFromListxml(Models.Listxml.DeviceRef item)
         {
-            var deviceRef = new Models.Internal.DeviceRef
+            var deviceRef = new DeviceRef
             {
-                [Models.Internal.DeviceRef.NameKey] = item.Name,
+                [DeviceRef.NameKey] = item.Name,
             };
             return deviceRef;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.DipLocation"/> to <cref="Models.Internal.DipLocation"/>
+        /// Convert from <cref="Models.Listxml.DipLocation"/> to <cref="DipLocation"/>
         /// </summary>
-        public static Models.Internal.DipLocation ConvertFromListxml(Models.Listxml.DipLocation item)
+        public static DipLocation ConvertFromListxml(Models.Listxml.DipLocation item)
         {
-            var dipLocation = new Models.Internal.DipLocation
+            var dipLocation = new DipLocation
             {
-                [Models.Internal.DipLocation.NameKey] = item.Name,
-                [Models.Internal.DipLocation.NumberKey] = item.Number,
-                [Models.Internal.DipLocation.InvertedKey] = item.Inverted,
+                [DipLocation.NameKey] = item.Name,
+                [DipLocation.NumberKey] = item.Number,
+                [DipLocation.InvertedKey] = item.Inverted,
             };
             return dipLocation;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.DipSwitch"/> to <cref="Models.Internal.DipSwitch"/>
+        /// Convert from <cref="Models.Listxml.DipSwitch"/> to <cref="DipSwitch"/>
         /// </summary>
-        public static Models.Internal.DipSwitch ConvertFromListxml(Models.Listxml.DipSwitch item)
+        public static DipSwitch ConvertFromListxml(Models.Listxml.DipSwitch item)
         {
-            var dipSwitch = new Models.Internal.DipSwitch
+            var dipSwitch = new DipSwitch
             {
-                [Models.Internal.DipSwitch.NameKey] = item.Name,
-                [Models.Internal.DipSwitch.TagKey] = item.Tag,
-                [Models.Internal.DipSwitch.MaskKey] = item.Mask,
+                [DipSwitch.NameKey] = item.Name,
+                [DipSwitch.TagKey] = item.Tag,
+                [DipSwitch.MaskKey] = item.Mask,
             };
 
             if (item.Condition != null)
-                dipSwitch[Models.Internal.DipSwitch.ConditionKey] = ConvertFromListxml(item.Condition);
+                dipSwitch[DipSwitch.ConditionKey] = ConvertFromListxml(item.Condition);
 
             if (item.DipLocation != null && item.DipLocation.Any())
             {
-                var dipLocations = new List<Models.Internal.DipLocation>();
+                var dipLocations = new List<DipLocation>();
                 foreach (var dipLocation in item.DipLocation)
                 {
                     dipLocations.Add(ConvertFromListxml(dipLocation));
                 }
-                dipSwitch[Models.Internal.DipSwitch.DipLocationKey] = dipLocations.ToArray();
+                dipSwitch[DipSwitch.DipLocationKey] = dipLocations.ToArray();
             }
 
             if (item.DipValue != null && item.DipValue.Any())
             {
-                var dipValues = new List<Models.Internal.DipValue>();
+                var dipValues = new List<DipValue>();
                 foreach (var dipValue in item.DipValue)
                 {
                     dipValues.Add(ConvertFromListxml(dipValue));
                 }
-                dipSwitch[Models.Internal.DipSwitch.DipValueKey] = dipValues.ToArray();
+                dipSwitch[DipSwitch.DipValueKey] = dipValues.ToArray();
             }
 
             return dipSwitch;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.DipValue"/> to <cref="Models.Internal.DipValue"/>
+        /// Convert from <cref="Models.Listxml.DipValue"/> to <cref="DipValue"/>
         /// </summary>
-        public static Models.Internal.DipValue ConvertFromListxml(Models.Listxml.DipValue item)
+        public static DipValue ConvertFromListxml(Models.Listxml.DipValue item)
         {
-            var dipValue = new Models.Internal.DipValue
+            var dipValue = new DipValue
             {
-                [Models.Internal.DipValue.NameKey] = item.Name,
-                [Models.Internal.DipValue.ValueKey] = item.Value,
-                [Models.Internal.DipValue.DefaultKey] = item.Default,
+                [DipValue.NameKey] = item.Name,
+                [DipValue.ValueKey] = item.Value,
+                [DipValue.DefaultKey] = item.Default,
             };
 
             if (item.Condition != null)
-                dipValue[Models.Internal.DipValue.ConditionKey] = ConvertFromListxml(item.Condition);
+                dipValue[DipValue.ConditionKey] = ConvertFromListxml(item.Condition);
 
             return dipValue;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Disk"/> to <cref="Models.Internal.Disk"/>
+        /// Convert from <cref="Models.Listxml.Disk"/> to <cref="Disk"/>
         /// </summary>
-        public static Models.Internal.Disk ConvertFromListxml(Models.Listxml.Disk item)
+        public static Disk ConvertFromListxml(Models.Listxml.Disk item)
         {
-            var disk = new Models.Internal.Disk
+            var disk = new 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,
+                [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="Models.Internal.Display"/>
+        /// Convert from <cref="Models.Listxml.Display"/> to <cref="Display"/>
         /// </summary>
-        public static Models.Internal.Display ConvertFromListxml(Models.Listxml.Display item)
+        public static Display ConvertFromListxml(Models.Listxml.Display item)
         {
-            var display = new Models.Internal.Display
+            var display = new 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,
+                [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="Models.Internal.Driver"/>
+        /// Convert from <cref="Models.Listxml.Driver"/> to <cref="Driver"/>
         /// </summary>
-        public static Models.Internal.Driver ConvertFromListxml(Models.Listxml.Driver item)
+        public static Driver ConvertFromListxml(Models.Listxml.Driver item)
         {
-            var driver = new Models.Internal.Driver
+            var driver = new 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,
+                [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="Models.Internal.Extension"/>
+        /// Convert from <cref="Models.Listxml.Extension"/> to <cref="Extension"/>
         /// </summary>
-        public static Models.Internal.Extension ConvertFromListxml(Models.Listxml.Extension item)
+        public static Extension ConvertFromListxml(Models.Listxml.Extension item)
         {
-            var extension = new Models.Internal.Extension
+            var extension = new Extension
             {
-                [Models.Internal.Extension.NameKey] = item.Name,
+                [Extension.NameKey] = item.Name,
             };
             return extension;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Feature"/> to <cref="Models.Internal.Feature"/>
+        /// Convert from <cref="Models.Listxml.Feature"/> to <cref="Feature"/>
         /// </summary>
-        public static Models.Internal.Feature ConvertFromListxml(Models.Listxml.Feature item)
+        public static Feature ConvertFromListxml(Models.Listxml.Feature item)
         {
-            var feature = new Models.Internal.Feature
+            var feature = new Feature
             {
-                [Models.Internal.Feature.TypeKey] = item.Type,
-                [Models.Internal.Feature.StatusKey] = item.Status,
-                [Models.Internal.Feature.OverallKey] = item.Overall,
+                [Feature.TypeKey] = item.Type,
+                [Feature.StatusKey] = item.Status,
+                [Feature.OverallKey] = item.Overall,
             };
             return feature;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Input"/> to <cref="Models.Internal.Input"/>
+        /// Convert from <cref="Models.Listxml.Input"/> to <cref="Input"/>
         /// </summary>
-        public static Models.Internal.Input ConvertFromListxml(Models.Listxml.Input item)
+        public static Input ConvertFromListxml(Models.Listxml.Input item)
         {
-            var input = new Models.Internal.Input
+            var input = new 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,
+                [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<Models.Internal.Control>();
+                var controls = new List<Control>();
                 foreach (var control in item.Control)
                 {
                     controls.Add(ConvertFromListxml(control));
                 }
-                input[Models.Internal.Input.ControlKey] = controls.ToArray();
+                input[Input.ControlKey] = controls.ToArray();
             }
 
             return input;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Instance"/> to <cref="Models.Internal.Instance"/>
+        /// Convert from <cref="Models.Listxml.Instance"/> to <cref="Instance"/>
         /// </summary>
-        public static Models.Internal.Instance ConvertFromListxml(Models.Listxml.Instance item)
+        public static Instance ConvertFromListxml(Models.Listxml.Instance item)
         {
-            var instance = new Models.Internal.Instance
+            var instance = new Instance
             {
-                [Models.Internal.Instance.NameKey] = item.Name,
-                [Models.Internal.Instance.BriefNameKey] = item.BriefName,
+                [Instance.NameKey] = item.Name,
+                [Instance.BriefNameKey] = item.BriefName,
             };
             return instance;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Port"/> to <cref="Models.Internal.Port"/>
+        /// Convert from <cref="Models.Listxml.Port"/> to <cref="Port"/>
         /// </summary>
-        public static Models.Internal.Port ConvertFromListxml(Models.Listxml.Port item)
+        public static Port ConvertFromListxml(Models.Listxml.Port item)
         {
-            var port = new Models.Internal.Port
+            var port = new Port
             {
-                [Models.Internal.Port.TagKey] = item.Tag,
+                [Port.TagKey] = item.Tag,
             };
 
             if (item.Analog != null && item.Analog.Any())
             {
-                var analogs = new List<Models.Internal.Analog>();
+                var analogs = new List<Analog>();
                 foreach (var analog in item.Analog)
                 {
                     analogs.Add(ConvertFromListxml(analog));
                 }
-                port[Models.Internal.Port.AnalogKey] = analogs.ToArray();
+                port[Port.AnalogKey] = analogs.ToArray();
             }
 
             return port;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.RamOption"/> to <cref="Models.Internal.RamOption"/>
+        /// Convert from <cref="Models.Listxml.RamOption"/> to <cref="RamOption"/>
         /// </summary>
-        public static Models.Internal.RamOption ConvertFromListxml(Models.Listxml.RamOption item)
+        public static RamOption ConvertFromListxml(Models.Listxml.RamOption item)
         {
-            var ramOption = new Models.Internal.RamOption
+            var ramOption = new RamOption
             {
-                [Models.Internal.RamOption.NameKey] = item.Name,
-                [Models.Internal.RamOption.DefaultKey] = item.Default,
+                [RamOption.NameKey] = item.Name,
+                [RamOption.DefaultKey] = item.Default,
             };
             return ramOption;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Rom"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Listxml.Rom"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromListxml(Models.Listxml.Rom item)
+        public static Rom ConvertFromListxml(Models.Listxml.Rom item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new 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,
+                [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="Models.Internal.Sample"/>
+        /// Convert from <cref="Models.Listxml.Sample"/> to <cref="Sample"/>
         /// </summary>
-        public static Models.Internal.Sample ConvertFromListxml(Models.Listxml.Sample item)
+        public static Sample ConvertFromListxml(Models.Listxml.Sample item)
         {
-            var sample = new Models.Internal.Sample
+            var sample = new Sample
             {
-                [Models.Internal.Sample.NameKey] = item.Name,
+                [Sample.NameKey] = item.Name,
             };
             return sample;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Slot"/> to <cref="Models.Internal.Slot"/>
+        /// Convert from <cref="Models.Listxml.Slot"/> to <cref="Slot"/>
         /// </summary>
-        public static Models.Internal.Slot ConvertFromListxml(Models.Listxml.Slot item)
+        public static Slot ConvertFromListxml(Models.Listxml.Slot item)
         {
-            var slot = new Models.Internal.Slot
+            var slot = new Slot
             {
-                [Models.Internal.Slot.NameKey] = item.Name,
+                [Slot.NameKey] = item.Name,
             };
 
             if (item.SlotOption != null && item.SlotOption.Any())
             {
-                var slotOptions = new List<Models.Internal.SlotOption>();
+                var slotOptions = new List<SlotOption>();
                 foreach (var slotOption in item.SlotOption)
                 {
                     slotOptions.Add(ConvertFromListxml(slotOption));
                 }
-                slot[Models.Internal.Slot.SlotOptionKey] = slotOptions.ToArray();
+                slot[Slot.SlotOptionKey] = slotOptions.ToArray();
             }
 
             return slot;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.SlotOption"/> to <cref="Models.Internal.SlotOption"/>
+        /// Convert from <cref="Models.Listxml.SlotOption"/> to <cref="SlotOption"/>
         /// </summary>
-        public static Models.Internal.SlotOption ConvertFromListxml(Models.Listxml.SlotOption item)
+        public static SlotOption ConvertFromListxml(Models.Listxml.SlotOption item)
         {
-            var slotOption = new Models.Internal.SlotOption
+            var slotOption = new SlotOption
             {
-                [Models.Internal.SlotOption.NameKey] = item.Name,
-                [Models.Internal.SlotOption.DevNameKey] = item.DevName,
-                [Models.Internal.SlotOption.DefaultKey] = item.Default,
+                [SlotOption.NameKey] = item.Name,
+                [SlotOption.DevNameKey] = item.DevName,
+                [SlotOption.DefaultKey] = item.Default,
             };
             return slotOption;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.SoftwareList"/> to <cref="Models.Internal.SoftwareList"/>
+        /// Convert from <cref="Models.Listxml.SoftwareList"/> to <cref="SoftwareList"/>
         /// </summary>
-        public static Models.Internal.SoftwareList ConvertFromListxml(Models.Listxml.SoftwareList item)
+        public static SoftwareList ConvertFromListxml(Models.Listxml.SoftwareList item)
         {
-            var softwareList = new Models.Internal.SoftwareList
+            var softwareList = new 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,
+                [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="Models.Internal.Sound"/>
+        /// Convert from <cref="Models.Listxml.Sound"/> to <cref="Sound"/>
         /// </summary>
-        public static Models.Internal.Sound ConvertFromListxml(Models.Listxml.Sound item)
+        public static Sound ConvertFromListxml(Models.Listxml.Sound item)
         {
-            var sound = new Models.Internal.Sound
+            var sound = new Sound
             {
-                [Models.Internal.Sound.ChannelsKey] = item.Channels,
+                [Sound.ChannelsKey] = item.Channels,
             };
             return sound;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Listxml.Video"/> to <cref="Models.Internal.Video"/>
+        /// Convert from <cref="Models.Listxml.Video"/> to <cref="Video"/>
         /// </summary>
-        public static Models.Internal.Video ConvertFromListxml(Models.Listxml.Video item)
+        public static Video ConvertFromListxml(Models.Listxml.Video item)
         {
-            var video = new Models.Internal.Video
+            var video = new 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,
+                [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;
         }
@@ -811,721 +812,721 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.Listxml.M1"/>
+        /// Convert from <cref="Header"/> to <cref="Models.Listxml.M1"/>
         /// </summary>
-        public static Models.Listxml.M1? ConvertHeaderToListxmlM1(Models.Internal.Header? item)
+        public static Models.Listxml.M1? ConvertHeaderToListxmlM1(Header? item)
         {
             if (item == null)
                 return null;
 
             var m1 = new Models.Listxml.M1
             {
-                Version = item.ReadString(Models.Internal.Header.VersionKey),
+                Version = item.ReadString(Header.VersionKey),
             };
             return m1;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.Listxml.Mame"/>
+        /// Convert from <cref="Header"/> to <cref="Models.Listxml.Mame"/>
         /// </summary>
-        public static Models.Listxml.Mame? ConvertHeaderToListxmlMame(Models.Internal.Header? item)
+        public static Models.Listxml.Mame? ConvertHeaderToListxmlMame(Header? item)
         {
             if (item == null)
                 return null;
 
             var mame = new Models.Listxml.Mame
             {
-                Build = item.ReadString(Models.Internal.Header.BuildKey),
-                Debug = item.ReadString(Models.Internal.Header.DebugKey),
-                MameConfig = item.ReadString(Models.Internal.Header.MameConfigKey),
+                Build = item.ReadString(Header.BuildKey),
+                Debug = item.ReadString(Header.DebugKey),
+                MameConfig = item.ReadString(Header.MameConfigKey),
             };
             return mame;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.Listxml.GameBase"/>
+        /// Convert from <cref="Machine"/> to <cref="Models.Listxml.GameBase"/>
         /// </summary>
-        public static Models.Listxml.GameBase? ConvertMachineToListxml(Models.Internal.Machine? item)
+        public static Models.Listxml.GameBase? ConvertMachineToListxml(Machine? item)
         {
             if (item == null)
                 return null;
 
             var machine = new Models.Listxml.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),
+                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<Models.Internal.BiosSet[]>(Models.Internal.Machine.BiosSetKey);
+            var biosSets = item.Read<BiosSet[]>(Machine.BiosSetKey);
             machine.BiosSet = biosSets?.Select(ConvertToListxml)?.ToArray();
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             machine.Rom = roms?.Select(ConvertToListxml)?.ToArray();
 
-            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
+            var disks = item.Read<Disk[]>(Machine.DiskKey);
             machine.Disk = disks?.Select(ConvertToListxml)?.ToArray();
 
-            var deviceRefs = item.Read<Models.Internal.DeviceRef[]>(Models.Internal.Machine.DeviceRefKey);
+            var deviceRefs = item.Read<DeviceRef[]>(Machine.DeviceRefKey);
             machine.DeviceRef = deviceRefs?.Select(ConvertToListxml)?.ToArray();
 
-            var samples = item.Read<Models.Internal.Sample[]>(Models.Internal.Machine.SampleKey);
+            var samples = item.Read<Sample[]>(Machine.SampleKey);
             machine.Sample = samples?.Select(ConvertToListxml)?.ToArray();
 
-            var chips = item.Read<Models.Internal.Chip[]>(Models.Internal.Machine.ChipKey);
+            var chips = item.Read<Chip[]>(Machine.ChipKey);
             machine.Chip = chips?.Select(ConvertToListxml)?.ToArray();
 
-            var displays = item.Read<Models.Internal.Display[]>(Models.Internal.Machine.DisplayKey);
+            var displays = item.Read<Display[]>(Machine.DisplayKey);
             machine.Display = displays?.Select(ConvertToListxml)?.ToArray();
 
-            var videos = item.Read<Models.Internal.Video[]>(Models.Internal.Machine.VideoKey);
+            var videos = item.Read<Video[]>(Machine.VideoKey);
             machine.Video = videos?.Select(ConvertToListxml)?.ToArray();
 
-            var sound = item.Read<Models.Internal.Sound>(Models.Internal.Machine.SoundKey);
+            var sound = item.Read<Sound>(Machine.SoundKey);
             machine.Sound = ConvertToListxml(sound);
 
-            var input = item.Read<Models.Internal.Input>(Models.Internal.Machine.InputKey);
+            var input = item.Read<Input>(Machine.InputKey);
             machine.Input = ConvertToListxml(input);
 
-            var dipSwitches = item.Read<Models.Internal.DipSwitch[]>(Models.Internal.Machine.DipSwitchKey);
+            var dipSwitches = item.Read<DipSwitch[]>(Machine.DipSwitchKey);
             machine.DipSwitch = dipSwitches?.Select(ConvertToListxml)?.ToArray();
 
-            var configurations = item.Read<Models.Internal.Configuration[]>(Models.Internal.Machine.ConfigurationKey);
+            var configurations = item.Read<Configuration[]>(Machine.ConfigurationKey);
             machine.Configuration = configurations?.Select(ConvertToListxml)?.ToArray();
 
-            var ports = item.Read<Models.Internal.Port[]>(Models.Internal.Machine.PortKey);
+            var ports = item.Read<Port[]>(Machine.PortKey);
             machine.Port = ports?.Select(ConvertToListxml)?.ToArray();
 
-            var adjusters = item.Read<Models.Internal.Adjuster[]>(Models.Internal.Machine.AdjusterKey);
+            var adjusters = item.Read<Adjuster[]>(Machine.AdjusterKey);
             machine.Adjuster = adjusters?.Select(ConvertToListxml)?.ToArray();
 
-            var driver = item.Read<Models.Internal.Driver>(Models.Internal.Machine.DriverKey);
+            var driver = item.Read<Driver>(Machine.DriverKey);
             machine.Driver = ConvertToListxml(driver);
 
-            var features = item.Read<Models.Internal.Feature[]>(Models.Internal.Machine.FeatureKey);
+            var features = item.Read<Feature[]>(Machine.FeatureKey);
             machine.Feature = features?.Select(ConvertToListxml)?.ToArray();
 
-            var devices = item.Read<Models.Internal.Device[]>(Models.Internal.Machine.DeviceKey);
+            var devices = item.Read<Device[]>(Machine.DeviceKey);
             machine.Device = devices?.Select(ConvertToListxml)?.ToArray();
 
-            var slots = item.Read<Models.Internal.Slot[]>(Models.Internal.Machine.SlotKey);
+            var slots = item.Read<Slot[]>(Machine.SlotKey);
             machine.Slot = slots?.Select(ConvertToListxml)?.ToArray();
 
-            var softwareLists = item.Read<Models.Internal.SoftwareList[]>(Models.Internal.Machine.SoftwareListKey);
+            var softwareLists = item.Read<SoftwareList[]>(Machine.SoftwareListKey);
             machine.SoftwareList = softwareLists?.Select(ConvertToListxml)?.ToArray();
 
-            var ramOptions = item.Read<Models.Internal.RamOption[]>(Models.Internal.Machine.RamOptionKey);
+            var ramOptions = item.Read<RamOption[]>(Machine.RamOptionKey);
             machine.RamOption = ramOptions?.Select(ConvertToListxml)?.ToArray();
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Adjuster"/> to <cref="Models.Listxml.Adjuster"/>
+        /// Convert from <cref="Adjuster"/> to <cref="Models.Listxml.Adjuster"/>
         /// </summary>
-        private static Models.Listxml.Adjuster? ConvertToListxml(Models.Internal.Adjuster? item)
+        private static Models.Listxml.Adjuster? ConvertToListxml(Adjuster? item)
         {
             if (item == null)
                 return null;
 
             var adjuster = new Models.Listxml.Adjuster
             {
-                Name = item.ReadString(Models.Internal.Adjuster.NameKey),
-                Default = item.ReadString(Models.Internal.Adjuster.DefaultKey),
+                Name = item.ReadString(Adjuster.NameKey),
+                Default = item.ReadString(Adjuster.DefaultKey),
             };
 
-            var condition = item.Read<Models.Internal.Condition>(Models.Internal.Adjuster.ConditionKey);
+            var condition = item.Read<Condition>(Adjuster.ConditionKey);
             adjuster.Condition = ConvertToListxml(condition);
 
             return adjuster;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Analog"/> to <cref="Models.Listxml.Analog"/>
+        /// Convert from <cref="Analog"/> to <cref="Models.Listxml.Analog"/>
         /// </summary>
-        private static Models.Listxml.Analog? ConvertToListxml(Models.Internal.Analog? item)
+        private static Models.Listxml.Analog? ConvertToListxml(Analog? item)
         {
             if (item == null)
                 return null;
 
             var analog = new Models.Listxml.Analog
             {
-                Mask = item.ReadString(Models.Internal.Analog.MaskKey),
+                Mask = item.ReadString(Analog.MaskKey),
             };
             return analog;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.BiosSet"/> to <cref="Models.Listxml.BiosSet"/>
+        /// Convert from <cref="BiosSet"/> to <cref="Models.Listxml.BiosSet"/>
         /// </summary>
-        private static Models.Listxml.BiosSet? ConvertToListxml(Models.Internal.BiosSet? item)
+        private static Models.Listxml.BiosSet? ConvertToListxml(BiosSet? item)
         {
             if (item == null)
                 return null;
 
             var biosset = new Models.Listxml.BiosSet
             {
-                Name = item.ReadString(Models.Internal.BiosSet.NameKey),
-                Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey),
-                Default = item.ReadString(Models.Internal.BiosSet.DefaultKey),
+                Name = item.ReadString(BiosSet.NameKey),
+                Description = item.ReadString(BiosSet.DescriptionKey),
+                Default = item.ReadString(BiosSet.DefaultKey),
             };
             return biosset;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Chip"/> to <cref="Models.Listxml.Chip"/>
+        /// Convert from <cref="Chip"/> to <cref="Models.Listxml.Chip"/>
         /// </summary>
-        private static Models.Listxml.Chip? ConvertToListxml(Models.Internal.Chip? item)
+        private static Models.Listxml.Chip? ConvertToListxml(Chip? item)
         {
             if (item == null)
                 return null;
 
             var chip = new Models.Listxml.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),
+                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="Models.Internal.Condition"/> to <cref="Models.Listxml.Condition"/>
+        /// Convert from <cref="Condition"/> to <cref="Models.Listxml.Condition"/>
         /// </summary>
-        private static Models.Listxml.Condition? ConvertToListxml(Models.Internal.Condition? item)
+        private static Models.Listxml.Condition? ConvertToListxml(Condition? item)
         {
             if (item == null)
                 return null;
 
             var condition = new Models.Listxml.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),
+                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="Models.Internal.Configuration"/> to <cref="Models.Listxml.Configuration"/>
+        /// Convert from <cref="Configuration"/> to <cref="Models.Listxml.Configuration"/>
         /// </summary>
-        private static Models.Listxml.Configuration? ConvertToListxml(Models.Internal.Configuration? item)
+        private static Models.Listxml.Configuration? ConvertToListxml(Configuration? item)
         {
             if (item == null)
                 return null;
 
             var configuration = new Models.Listxml.Configuration
             {
-                Name = item.ReadString(Models.Internal.Configuration.NameKey),
-                Tag = item.ReadString(Models.Internal.Configuration.TagKey),
-                Mask = item.ReadString(Models.Internal.Configuration.MaskKey),
+                Name = item.ReadString(Configuration.NameKey),
+                Tag = item.ReadString(Configuration.TagKey),
+                Mask = item.ReadString(Configuration.MaskKey),
             };
 
-            var condition = item.Read<Models.Internal.Condition>(Models.Internal.Configuration.ConditionKey);
+            var condition = item.Read<Condition>(Configuration.ConditionKey);
             configuration.Condition = ConvertToListxml(condition);
 
-            var confLocations = item.Read<Models.Internal.ConfLocation[]>(Models.Internal.Configuration.ConfLocationKey);
+            var confLocations = item.Read<ConfLocation[]>(Configuration.ConfLocationKey);
             configuration.ConfLocation = confLocations?.Select(ConvertToListxml)?.ToArray();
 
-            var confSettings = item.Read<Models.Internal.ConfSetting[]>(Models.Internal.Configuration.ConfSettingKey);
+            var confSettings = item.Read<ConfSetting[]>(Configuration.ConfSettingKey);
             configuration.ConfSetting = confSettings?.Select(ConvertToListxml)?.ToArray();
 
             return configuration;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.ConfLocation"/> to <cref="Models.Listxml.ConfLocation"/>
+        /// Convert from <cref="ConfLocation"/> to <cref="Models.Listxml.ConfLocation"/>
         /// </summary>
-        private static Models.Listxml.ConfLocation? ConvertToListxml(Models.Internal.ConfLocation? item)
+        private static Models.Listxml.ConfLocation? ConvertToListxml(ConfLocation? item)
         {
             if (item == null)
                 return null;
 
             var confLocation = new Models.Listxml.ConfLocation
             {
-                Name = item.ReadString(Models.Internal.ConfLocation.NameKey),
-                Number = item.ReadString(Models.Internal.ConfLocation.NumberKey),
-                Inverted = item.ReadString(Models.Internal.ConfLocation.InvertedKey),
+                Name = item.ReadString(ConfLocation.NameKey),
+                Number = item.ReadString(ConfLocation.NumberKey),
+                Inverted = item.ReadString(ConfLocation.InvertedKey),
             };
             return confLocation;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.ConfSetting"/> to <cref="Models.Listxml.ConfSetting"/>
+        /// Convert from <cref="ConfSetting"/> to <cref="Models.Listxml.ConfSetting"/>
         /// </summary>
-        private static Models.Listxml.ConfSetting? ConvertToListxml(Models.Internal.ConfSetting? item)
+        private static Models.Listxml.ConfSetting? ConvertToListxml(ConfSetting? item)
         {
             if (item == null)
                 return null;
 
             var confSetting = new Models.Listxml.ConfSetting
             {
-                Name = item.ReadString(Models.Internal.ConfSetting.NameKey),
-                Value = item.ReadString(Models.Internal.ConfSetting.ValueKey),
-                Default = item.ReadString(Models.Internal.ConfSetting.DefaultKey),
+                Name = item.ReadString(ConfSetting.NameKey),
+                Value = item.ReadString(ConfSetting.ValueKey),
+                Default = item.ReadString(ConfSetting.DefaultKey),
             };
 
-            var condition = item.Read<Models.Internal.Condition>(Models.Internal.ConfSetting.ConditionKey);
+            var condition = item.Read<Condition>(ConfSetting.ConditionKey);
             confSetting.Condition = ConvertToListxml(condition);
 
             return confSetting;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Control"/> to <cref="Models.Listxml.Control"/>
+        /// Convert from <cref="Control"/> to <cref="Models.Listxml.Control"/>
         /// </summary>
-        private static Models.Listxml.Control? ConvertToListxml(Models.Internal.Control? item)
+        private static Models.Listxml.Control? ConvertToListxml(Control? item)
         {
             if (item == null)
                 return null;
 
             var control = new Models.Listxml.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),
+                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="Models.Internal.Device"/> to <cref="Models.Listxml.Device"/>
+        /// Convert from <cref="Device"/> to <cref="Models.Listxml.Device"/>
         /// </summary>
-        private static Models.Listxml.Device? ConvertToListxml(Models.Internal.Device? item)
+        private static Models.Listxml.Device? ConvertToListxml(Device? item)
         {
             if (item == null)
                 return null;
 
             var device = new Models.Listxml.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),
+                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<Models.Internal.Instance>(Models.Internal.Device.InstanceKey);
+            var instance = item.Read<Instance>(Device.InstanceKey);
             device.Instance = ConvertToListxml(instance);
 
-            var extensions = item.Read<Models.Internal.Extension[]>(Models.Internal.Device.ExtensionKey);
+            var extensions = item.Read<Extension[]>(Device.ExtensionKey);
             device.Extension = extensions?.Select(ConvertToListxml)?.ToArray();
 
             return device;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DeviceRef"/> to <cref="Models.Listxml.DeviceRef"/>
+        /// Convert from <cref="DeviceRef"/> to <cref="Models.Listxml.DeviceRef"/>
         /// </summary>
-        private static Models.Listxml.DeviceRef? ConvertToListxml(Models.Internal.DeviceRef? item)
+        private static Models.Listxml.DeviceRef? ConvertToListxml(DeviceRef? item)
         {
             if (item == null)
                 return null;
 
             var deviceRef = new Models.Listxml.DeviceRef
             {
-                Name = item.ReadString(Models.Internal.DeviceRef.NameKey),
+                Name = item.ReadString(DeviceRef.NameKey),
             };
             return deviceRef;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DipLocation"/> to <cref="Models.Listxml.DipLocation"/>
+        /// Convert from <cref="DipLocation"/> to <cref="Models.Listxml.DipLocation"/>
         /// </summary>
-        private static Models.Listxml.DipLocation? ConvertToListxml(Models.Internal.DipLocation? item)
+        private static Models.Listxml.DipLocation? ConvertToListxml(DipLocation? item)
         {
             if (item == null)
                 return null;
 
             var dipLocation = new Models.Listxml.DipLocation
             {
-                Name = item.ReadString(Models.Internal.DipLocation.NameKey),
-                Number = item.ReadString(Models.Internal.DipLocation.NumberKey),
-                Inverted = item.ReadString(Models.Internal.DipLocation.InvertedKey),
+                Name = item.ReadString(DipLocation.NameKey),
+                Number = item.ReadString(DipLocation.NumberKey),
+                Inverted = item.ReadString(DipLocation.InvertedKey),
             };
             return dipLocation;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DipSwitch"/> to <cref="Models.Listxml.DipSwitch"/>
+        /// Convert from <cref="DipSwitch"/> to <cref="Models.Listxml.DipSwitch"/>
         /// </summary>
-        private static Models.Listxml.DipSwitch? ConvertToListxml(Models.Internal.DipSwitch? item)
+        private static Models.Listxml.DipSwitch? ConvertToListxml(DipSwitch? item)
         {
             if (item == null)
                 return null;
 
             var dipSwitch = new Models.Listxml.DipSwitch
             {
-                Name = item.ReadString(Models.Internal.DipSwitch.NameKey),
-                Tag = item.ReadString(Models.Internal.DipSwitch.TagKey),
-                Mask = item.ReadString(Models.Internal.DipSwitch.MaskKey),
+                Name = item.ReadString(DipSwitch.NameKey),
+                Tag = item.ReadString(DipSwitch.TagKey),
+                Mask = item.ReadString(DipSwitch.MaskKey),
             };
 
-            var condition = item.Read<Models.Internal.Condition>(Models.Internal.DipSwitch.ConditionKey);
+            var condition = item.Read<Condition>(DipSwitch.ConditionKey);
             dipSwitch.Condition = ConvertToListxml(condition);
 
-            var dipLocations = item.Read<Models.Internal.DipLocation[]>(Models.Internal.DipSwitch.DipLocationKey);
+            var dipLocations = item.Read<DipLocation[]>(DipSwitch.DipLocationKey);
             dipSwitch.DipLocation = dipLocations?.Select(ConvertToListxml)?.ToArray();
 
-            var dipValues = item.Read<Models.Internal.DipValue[]>(Models.Internal.DipSwitch.DipValueKey);
+            var dipValues = item.Read<DipValue[]>(DipSwitch.DipValueKey);
             dipSwitch.DipValue = dipValues?.Select(ConvertToListxml)?.ToArray();
 
             return dipSwitch;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DipValue"/> to <cref="Models.Listxml.DipValue"/>
+        /// Convert from <cref="DipValue"/> to <cref="Models.Listxml.DipValue"/>
         /// </summary>
-        private static Models.Listxml.DipValue? ConvertToListxml(Models.Internal.DipValue? item)
+        private static Models.Listxml.DipValue? ConvertToListxml(DipValue? item)
         {
             if (item == null)
                 return null;
 
             var dipValue = new Models.Listxml.DipValue
             {
-                Name = item.ReadString(Models.Internal.DipValue.NameKey),
-                Value = item.ReadString(Models.Internal.DipValue.ValueKey),
-                Default = item.ReadString(Models.Internal.DipValue.DefaultKey),
+                Name = item.ReadString(DipValue.NameKey),
+                Value = item.ReadString(DipValue.ValueKey),
+                Default = item.ReadString(DipValue.DefaultKey),
             };
 
-            var condition = item.Read<Models.Internal.Condition>(Models.Internal.DipValue.ConditionKey);
+            var condition = item.Read<Condition>(DipValue.ConditionKey);
             dipValue.Condition = ConvertToListxml(condition);
 
             return dipValue;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.Listxml.Disk"/>
+        /// Convert from <cref="Disk"/> to <cref="Models.Listxml.Disk"/>
         /// </summary>
-        private static Models.Listxml.Disk? ConvertToListxml(Models.Internal.Disk? item)
+        private static Models.Listxml.Disk? ConvertToListxml(Disk? item)
         {
             if (item == null)
                 return null;
 
             var disk = new Models.Listxml.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),
+                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="Models.Internal.Display"/> to <cref="Models.Listxml.Display"/>
+        /// Convert from <cref="Display"/> to <cref="Models.Listxml.Display"/>
         /// </summary>
-        private static Models.Listxml.Display? ConvertToListxml(Models.Internal.Display? item)
+        private static Models.Listxml.Display? ConvertToListxml(Display? item)
         {
             if (item == null)
                 return null;
 
             var display = new Models.Listxml.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),
+                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="Models.Internal.Driver"/> to <cref="Models.Listxml.Driver"/>
+        /// Convert from <cref="Driver"/> to <cref="Models.Listxml.Driver"/>
         /// </summary>
-        private static Models.Listxml.Driver? ConvertToListxml(Models.Internal.Driver? item)
+        private static Models.Listxml.Driver? ConvertToListxml(Driver? item)
         {
             if (item == null)
                 return null;
 
             var driver = new Models.Listxml.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),
+                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="Models.Internal.Extension"/> to <cref="Models.Listxml.Extension"/>
+        /// Convert from <cref="Extension"/> to <cref="Models.Listxml.Extension"/>
         /// </summary>
-        private static Models.Listxml.Extension? ConvertToListxml(Models.Internal.Extension? item)
+        private static Models.Listxml.Extension? ConvertToListxml(Extension? item)
         {
             if (item == null)
                 return null;
 
             var extension = new Models.Listxml.Extension
             {
-                Name = item.ReadString(Models.Internal.Extension.NameKey),
+                Name = item.ReadString(Extension.NameKey),
             };
             return extension;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Feature"/> to <cref="Models.Listxml.Feature"/>
+        /// Convert from <cref="Feature"/> to <cref="Models.Listxml.Feature"/>
         /// </summary>
-        private static Models.Listxml.Feature? ConvertToListxml(Models.Internal.Feature? item)
+        private static Models.Listxml.Feature? ConvertToListxml(Feature? item)
         {
             if (item == null)
                 return null;
 
             var feature = new Models.Listxml.Feature
             {
-                Type = item.ReadString(Models.Internal.Feature.TypeKey),
-                Status = item.ReadString(Models.Internal.Feature.StatusKey),
-                Overall = item.ReadString(Models.Internal.Feature.OverallKey),
+                Type = item.ReadString(Feature.TypeKey),
+                Status = item.ReadString(Feature.StatusKey),
+                Overall = item.ReadString(Feature.OverallKey),
             };
             return feature;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Input"/> to <cref="Models.Listxml.Input"/>
+        /// Convert from <cref="Input"/> to <cref="Models.Listxml.Input"/>
         /// </summary>
-        private static Models.Listxml.Input? ConvertToListxml(Models.Internal.Input? item)
+        private static Models.Listxml.Input? ConvertToListxml(Input? item)
         {
             if (item == null)
                 return null;
 
             var input = new Models.Listxml.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),
+                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<Models.Internal.Control[]>(Models.Internal.Input.ControlKey);
+            var controls = item.Read<Control[]>(Input.ControlKey);
             input.Control = controls?.Select(ConvertToListxml)?.ToArray();
 
             return input;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Instance"/> to <cref="Models.Listxml.Instance"/>
+        /// Convert from <cref="Instance"/> to <cref="Models.Listxml.Instance"/>
         /// </summary>
-        private static Models.Listxml.Instance? ConvertToListxml(Models.Internal.Instance? item)
+        private static Models.Listxml.Instance? ConvertToListxml(Instance? item)
         {
             if (item == null)
                 return null;
 
             var instance = new Models.Listxml.Instance
             {
-                Name = item.ReadString(Models.Internal.Instance.NameKey),
-                BriefName = item.ReadString(Models.Internal.Instance.BriefNameKey),
+                Name = item.ReadString(Instance.NameKey),
+                BriefName = item.ReadString(Instance.BriefNameKey),
             };
             return instance;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Port"/> to <cref="Models.Listxml.Port"/>
+        /// Convert from <cref="Port"/> to <cref="Models.Listxml.Port"/>
         /// </summary>
-        private static Models.Listxml.Port? ConvertToListxml(Models.Internal.Port? item)
+        private static Models.Listxml.Port? ConvertToListxml(Port? item)
         {
             if (item == null)
                 return null;
 
             var port = new Models.Listxml.Port
             {
-                Tag = item.ReadString(Models.Internal.Port.TagKey),
+                Tag = item.ReadString(Port.TagKey),
             };
 
-            var analogs = item.Read<Models.Internal.Analog[]>(Models.Internal.Port.AnalogKey);
+            var analogs = item.Read<Analog[]>(Port.AnalogKey);
             port.Analog = analogs?.Select(ConvertToListxml)?.ToArray();
 
             return port;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.RamOption"/> to <cref="Models.Listxml.RamOption"/>
+        /// Convert from <cref="RamOption"/> to <cref="Models.Listxml.RamOption"/>
         /// </summary>
-        private static Models.Listxml.RamOption? ConvertToListxml(Models.Internal.RamOption? item)
+        private static Models.Listxml.RamOption? ConvertToListxml(RamOption? item)
         {
             if (item == null)
                 return null;
 
             var ramOption = new Models.Listxml.RamOption
             {
-                Name = item.ReadString(Models.Internal.RamOption.NameKey),
-                Default = item.ReadString(Models.Internal.RamOption.DefaultKey),
+                Name = item.ReadString(RamOption.NameKey),
+                Default = item.ReadString(RamOption.DefaultKey),
             };
             return ramOption;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Listxml.Rom"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Listxml.Rom"/>
         /// </summary>
-        private static Models.Listxml.Rom? ConvertToListxml(Models.Internal.Rom? item)
+        private static Models.Listxml.Rom? ConvertToListxml(Rom? item)
         {
             if (item == null)
                 return null;
 
             var rom = new Models.Listxml.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),
+                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="Models.Internal.Sample"/> to <cref="Models.Listxml.Sample"/>
+        /// Convert from <cref="Sample"/> to <cref="Models.Listxml.Sample"/>
         /// </summary>
-        private static Models.Listxml.Sample? ConvertToListxml(Models.Internal.Sample? item)
+        private static Models.Listxml.Sample? ConvertToListxml(Sample? item)
         {
             if (item == null)
                 return null;
 
             var sample = new Models.Listxml.Sample
             {
-                Name = item.ReadString(Models.Internal.Sample.NameKey),
+                Name = item.ReadString(Sample.NameKey),
             };
             return sample;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Slot"/> to <cref="Models.Listxml.Slot"/>
+        /// Convert from <cref="Slot"/> to <cref="Models.Listxml.Slot"/>
         /// </summary>
-        private static Models.Listxml.Slot? ConvertToListxml(Models.Internal.Slot? item)
+        private static Models.Listxml.Slot? ConvertToListxml(Slot? item)
         {
             if (item == null)
                 return null;
 
             var slot = new Models.Listxml.Slot
             {
-                Name = item.ReadString(Models.Internal.Slot.NameKey),
+                Name = item.ReadString(Slot.NameKey),
             };
 
-            var slotOptions = item.Read<Models.Internal.SlotOption[]>(Models.Internal.Slot.SlotOptionKey);
+            var slotOptions = item.Read<SlotOption[]>(Slot.SlotOptionKey);
             slot.SlotOption = slotOptions?.Select(ConvertToListxml)?.ToArray();
 
             return slot;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.SlotOption"/> to <cref="Models.Listxml.SlotOption"/>
+        /// Convert from <cref="SlotOption"/> to <cref="Models.Listxml.SlotOption"/>
         /// </summary>
-        private static Models.Listxml.SlotOption? ConvertToListxml(Models.Internal.SlotOption? item)
+        private static Models.Listxml.SlotOption? ConvertToListxml(SlotOption? item)
         {
             if (item == null)
                 return null;
 
             var slotOption = new Models.Listxml.SlotOption
             {
-                Name = item.ReadString(Models.Internal.SlotOption.NameKey),
-                DevName = item.ReadString(Models.Internal.SlotOption.DevNameKey),
-                Default = item.ReadString(Models.Internal.SlotOption.DefaultKey),
+                Name = item.ReadString(SlotOption.NameKey),
+                DevName = item.ReadString(SlotOption.DevNameKey),
+                Default = item.ReadString(SlotOption.DefaultKey),
             };
             return slotOption;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.SoftwareList"/> to <cref="Models.Listxml.SoftwareList"/>
+        /// Convert from <cref="SoftwareList"/> to <cref="Models.Listxml.SoftwareList"/>
         /// </summary>
-        private static Models.Listxml.SoftwareList? ConvertToListxml(Models.Internal.SoftwareList? item)
+        private static Models.Listxml.SoftwareList? ConvertToListxml(SoftwareList? item)
         {
             if (item == null)
                 return null;
 
             var softwareList = new Models.Listxml.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),
+                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="Models.Internal.Sound"/> to <cref="Models.Listxml.Sound"/>
+        /// Convert from <cref="Sound"/> to <cref="Models.Listxml.Sound"/>
         /// </summary>
-        private static Models.Listxml.Sound? ConvertToListxml(Models.Internal.Sound? item)
+        private static Models.Listxml.Sound? ConvertToListxml(Sound? item)
         {
             if (item == null)
                 return null;
 
             var sound = new Models.Listxml.Sound
             {
-                Channels = item.ReadString(Models.Internal.Sound.ChannelsKey),
+                Channels = item.ReadString(Sound.ChannelsKey),
             };
             return sound;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Video"/> to <cref="Models.Listxml.Video"/>
+        /// Convert from <cref="Video"/> to <cref="Models.Listxml.Video"/>
         /// </summary>
-        private static Models.Listxml.Video? ConvertToListxml(Models.Internal.Video? item)
+        private static Models.Listxml.Video? ConvertToListxml(Video? item)
         {
             if (item == null)
                 return null;
 
             var video = new Models.Listxml.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),
+                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;
         }
diff --git a/SabreTools.Serialization/Internal.Logiqx.cs b/SabreTools.Serialization/Internal.Logiqx.cs
index 3567df52..086e613c 100644
--- a/SabreTools.Serialization/Internal.Logiqx.cs
+++ b/SabreTools.Serialization/Internal.Logiqx.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,339 +12,339 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.Header"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.Logiqx.Header"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromLogiqx(Models.Logiqx.Header item)
+        public static Header ConvertHeaderFromLogiqx(Models.Logiqx.Header item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.IdKey] = item.Id,
-                [Models.Internal.Header.NameKey] = item.Name,
-                [Models.Internal.Header.DescriptionKey] = item.Description,
-                [Models.Internal.Header.RootDirKey] = item.RootDir,
-                [Models.Internal.Header.CategoryKey] = item.Category,
-                [Models.Internal.Header.VersionKey] = item.Version,
-                [Models.Internal.Header.DateKey] = item.Date,
-                [Models.Internal.Header.AuthorKey] = item.Author,
-                [Models.Internal.Header.EmailKey] = item.Email,
-                [Models.Internal.Header.HomepageKey] = item.Homepage,
-                [Models.Internal.Header.UrlKey] = item.Url,
-                [Models.Internal.Header.CommentKey] = item.Comment,
-                [Models.Internal.Header.TypeKey] = item.Type,
+                [Header.IdKey] = item.Id,
+                [Header.NameKey] = item.Name,
+                [Header.DescriptionKey] = item.Description,
+                [Header.RootDirKey] = item.RootDir,
+                [Header.CategoryKey] = item.Category,
+                [Header.VersionKey] = item.Version,
+                [Header.DateKey] = item.Date,
+                [Header.AuthorKey] = item.Author,
+                [Header.EmailKey] = item.Email,
+                [Header.HomepageKey] = item.Homepage,
+                [Header.UrlKey] = item.Url,
+                [Header.CommentKey] = item.Comment,
+                [Header.TypeKey] = item.Type,
             };
 
             if (item.ClrMamePro != null)
             {
-                header[Models.Internal.Header.HeaderKey] = item.ClrMamePro.Header;
-                header[Models.Internal.Header.ForceMergingKey] = item.ClrMamePro.ForceMerging;
-                header[Models.Internal.Header.ForceNodumpKey] = item.ClrMamePro.ForceNodump;
-                header[Models.Internal.Header.ForcePackingKey] = item.ClrMamePro.ForcePacking;
+                header[Header.HeaderKey] = item.ClrMamePro.Header;
+                header[Header.ForceMergingKey] = item.ClrMamePro.ForceMerging;
+                header[Header.ForceNodumpKey] = item.ClrMamePro.ForceNodump;
+                header[Header.ForcePackingKey] = item.ClrMamePro.ForcePacking;
             }
 
             if (item.RomCenter != null)
             {
-                header[Models.Internal.Header.PluginKey] = item.RomCenter.Plugin;
-                header[Models.Internal.Header.RomModeKey] = item.RomCenter.RomMode;
-                header[Models.Internal.Header.BiosModeKey] = item.RomCenter.BiosMode;
-                header[Models.Internal.Header.SampleModeKey] = item.RomCenter.SampleMode;
-                header[Models.Internal.Header.LockRomModeKey] = item.RomCenter.LockRomMode;
-                header[Models.Internal.Header.LockBiosModeKey] = item.RomCenter.LockBiosMode;
-                header[Models.Internal.Header.LockSampleModeKey] = item.RomCenter.LockSampleMode;
+                header[Header.PluginKey] = item.RomCenter.Plugin;
+                header[Header.RomModeKey] = item.RomCenter.RomMode;
+                header[Header.BiosModeKey] = item.RomCenter.BiosMode;
+                header[Header.SampleModeKey] = item.RomCenter.SampleMode;
+                header[Header.LockRomModeKey] = item.RomCenter.LockRomMode;
+                header[Header.LockBiosModeKey] = item.RomCenter.LockBiosMode;
+                header[Header.LockSampleModeKey] = item.RomCenter.LockSampleMode;
             }
 
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.GameBase"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.Logiqx.GameBase"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromLogiqx(Models.Logiqx.GameBase item)
+        public static Machine ConvertMachineFromLogiqx(Models.Logiqx.GameBase item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new 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.CloneOfKey] = item.CloneOf,
-                [Models.Internal.Machine.RomOfKey] = item.RomOf,
-                [Models.Internal.Machine.SampleOfKey] = item.SampleOf,
-                [Models.Internal.Machine.BoardKey] = item.Board,
-                [Models.Internal.Machine.RebuildToKey] = item.RebuildTo,
-                [Models.Internal.Machine.IdKey] = item.Id,
-                [Models.Internal.Machine.CloneOfIdKey] = item.CloneOfId,
-                [Models.Internal.Machine.RunnableKey] = item.Runnable,
-                [Models.Internal.Machine.CommentKey] = item.Comment,
-                [Models.Internal.Machine.DescriptionKey] = item.Description,
-                [Models.Internal.Machine.YearKey] = item.Year,
-                [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer,
-                [Models.Internal.Machine.PublisherKey] = item.Publisher,
-                [Models.Internal.Machine.CategoryKey] = item.Category,
-                [Models.Internal.Machine.TruripKey] = item.Trurip,
+                [Machine.NameKey] = item.Name,
+                [Machine.SourceFileKey] = item.SourceFile,
+                [Machine.IsBiosKey] = item.IsBios,
+                [Machine.IsDeviceKey] = item.IsDevice,
+                [Machine.IsMechanicalKey] = item.IsMechanical,
+                [Machine.CloneOfKey] = item.CloneOf,
+                [Machine.RomOfKey] = item.RomOf,
+                [Machine.SampleOfKey] = item.SampleOf,
+                [Machine.BoardKey] = item.Board,
+                [Machine.RebuildToKey] = item.RebuildTo,
+                [Machine.IdKey] = item.Id,
+                [Machine.CloneOfIdKey] = item.CloneOfId,
+                [Machine.RunnableKey] = item.Runnable,
+                [Machine.CommentKey] = item.Comment,
+                [Machine.DescriptionKey] = item.Description,
+                [Machine.YearKey] = item.Year,
+                [Machine.ManufacturerKey] = item.Manufacturer,
+                [Machine.PublisherKey] = item.Publisher,
+                [Machine.CategoryKey] = item.Category,
+                [Machine.TruripKey] = item.Trurip,
             };
 
             if (item.Release != null && item.Release.Any())
             {
-                var releases = new List<Models.Internal.Release>();
+                var releases = new List<Release>();
                 foreach (var release in item.Release)
                 {
                     releases.Add(ConvertFromLogiqx(release));
                 }
-                machine[Models.Internal.Machine.ReleaseKey] = releases.ToArray();
+                machine[Machine.ReleaseKey] = releases.ToArray();
             }
 
             if (item.BiosSet != null && item.BiosSet.Any())
             {
-                var biosSets = new List<Models.Internal.BiosSet>();
+                var biosSets = new List<BiosSet>();
                 foreach (var biosSet in item.BiosSet)
                 {
                     biosSets.Add(ConvertFromLogiqx(biosSet));
                 }
-                machine[Models.Internal.Machine.BiosSetKey] = biosSets.ToArray();
+                machine[Machine.BiosSetKey] = biosSets.ToArray();
             }
 
             if (item.Rom != null && item.Rom.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
                     roms.Add(ConvertFromLogiqx(rom));
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             if (item.Disk != null && item.Disk.Any())
             {
-                var disks = new List<Models.Internal.Disk>();
+                var disks = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
                     disks.Add(ConvertFromLogiqx(disk));
                 }
-                machine[Models.Internal.Machine.DiskKey] = disks.ToArray();
+                machine[Machine.DiskKey] = disks.ToArray();
             }
 
             if (item.Media != null && item.Media.Any())
             {
-                var medias = new List<Models.Internal.Media>();
+                var medias = new List<Media>();
                 foreach (var media in item.Media)
                 {
                     medias.Add(ConvertFromLogiqx(media));
                 }
-                machine[Models.Internal.Machine.MediaKey] = medias.ToArray();
+                machine[Machine.MediaKey] = medias.ToArray();
             }
 
             if (item.DeviceRef != null && item.DeviceRef.Any())
             {
-                var deviceRefs = new List<Models.Internal.DeviceRef>();
+                var deviceRefs = new List<DeviceRef>();
                 foreach (var deviceRef in item.DeviceRef)
                 {
                     deviceRefs.Add(ConvertFromLogiqx(deviceRef));
                 }
-                machine[Models.Internal.Machine.DeviceRefKey] = deviceRefs.ToArray();
+                machine[Machine.DeviceRefKey] = deviceRefs.ToArray();
             }
 
             if (item.Sample != null && item.Sample.Any())
             {
-                var samples = new List<Models.Internal.Sample>();
+                var samples = new List<Sample>();
                 foreach (var sample in item.Sample)
                 {
                     samples.Add(ConvertFromLogiqx(sample));
                 }
-                machine[Models.Internal.Machine.SampleKey] = samples.ToArray();
+                machine[Machine.SampleKey] = samples.ToArray();
             }
 
             if (item.Archive != null && item.Archive.Any())
             {
-                var archives = new List<Models.Internal.Archive>();
+                var archives = new List<Archive>();
                 foreach (var archive in item.Archive)
                 {
                     archives.Add(ConvertFromLogiqx(archive));
                 }
-                machine[Models.Internal.Machine.ArchiveKey] = archives.ToArray();
+                machine[Machine.ArchiveKey] = archives.ToArray();
             }
 
             if (item.Driver != null && item.Driver.Any())
             {
-                var drivers = new List<Models.Internal.Driver>();
+                var drivers = new List<Driver>();
                 foreach (var driver in item.Driver)
                 {
                     drivers.Add(ConvertFromLogiqx(driver));
                 }
-                machine[Models.Internal.Machine.DriverKey] = drivers.ToArray();
+                machine[Machine.DriverKey] = drivers.ToArray();
             }
 
             if (item.SoftwareList != null && item.SoftwareList.Any())
             {
-                var softwareLists = new List<Models.Internal.SoftwareList>();
+                var softwareLists = new List<SoftwareList>();
                 foreach (var softwareList in item.SoftwareList)
                 {
                     softwareLists.Add(ConvertFromLogiqx(softwareList));
                 }
-                machine[Models.Internal.Machine.SoftwareListKey] = softwareLists.ToArray();
+                machine[Machine.SoftwareListKey] = softwareLists.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.Archive"/> to <cref="Models.Internal.Archive"/>
+        /// Convert from <cref="Models.Logiqx.Archive"/> to <cref="Archive"/>
         /// </summary>
-        public static Models.Internal.Archive ConvertFromLogiqx(Models.Logiqx.Archive item)
+        public static Archive ConvertFromLogiqx(Models.Logiqx.Archive item)
         {
-            var archive = new Models.Internal.Archive
+            var archive = new Archive
             {
-                [Models.Internal.Archive.NameKey] = item.Name,
+                [Archive.NameKey] = item.Name,
             };
             return archive;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.BiosSet"/> to <cref="Models.Internal.BiosSet"/>
+        /// Convert from <cref="Models.Logiqx.BiosSet"/> to <cref="BiosSet"/>
         /// </summary>
-        public static Models.Internal.BiosSet ConvertFromLogiqx(Models.Logiqx.BiosSet item)
+        public static BiosSet ConvertFromLogiqx(Models.Logiqx.BiosSet item)
         {
-            var biosset = new Models.Internal.BiosSet
+            var biosset = new BiosSet
             {
-                [Models.Internal.BiosSet.NameKey] = item.Name,
-                [Models.Internal.BiosSet.DescriptionKey] = item.Description,
-                [Models.Internal.BiosSet.DefaultKey] = item.Default,
+                [BiosSet.NameKey] = item.Name,
+                [BiosSet.DescriptionKey] = item.Description,
+                [BiosSet.DefaultKey] = item.Default,
             };
             return biosset;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.DeviceRef"/> to <cref="Models.Internal.DeviceRef"/>
+        /// Convert from <cref="Models.Logiqx.DeviceRef"/> to <cref="DeviceRef"/>
         /// </summary>
-        public static Models.Internal.DeviceRef ConvertFromLogiqx(Models.Logiqx.DeviceRef item)
+        public static DeviceRef ConvertFromLogiqx(Models.Logiqx.DeviceRef item)
         {
-            var deviceRef = new Models.Internal.DeviceRef
+            var deviceRef = new DeviceRef
             {
-                [Models.Internal.DeviceRef.NameKey] = item.Name,
+                [DeviceRef.NameKey] = item.Name,
             };
             return deviceRef;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.Disk"/> to <cref="Models.Internal.Disk"/>
+        /// Convert from <cref="Models.Logiqx.Disk"/> to <cref="Disk"/>
         /// </summary>
-        public static Models.Internal.Disk ConvertFromLogiqx(Models.Logiqx.Disk item)
+        public static Disk ConvertFromLogiqx(Models.Logiqx.Disk item)
         {
-            var disk = new Models.Internal.Disk
+            var disk = new 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.StatusKey] = item.Status,
-                [Models.Internal.Disk.RegionKey] = item.Region,
+                [Disk.NameKey] = item.Name,
+                [Disk.MD5Key] = item.MD5,
+                [Disk.SHA1Key] = item.SHA1,
+                [Disk.MergeKey] = item.Merge,
+                [Disk.StatusKey] = item.Status,
+                [Disk.RegionKey] = item.Region,
             };
             return disk;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.Driver"/> to <cref="Models.Internal.Driver"/>
+        /// Convert from <cref="Models.Logiqx.Driver"/> to <cref="Driver"/>
         /// </summary>
-        public static Models.Internal.Driver ConvertFromLogiqx(Models.Logiqx.Driver item)
+        public static Driver ConvertFromLogiqx(Models.Logiqx.Driver item)
         {
-            var driver = new Models.Internal.Driver
+            var driver = new Driver
             {
-                [Models.Internal.Driver.StatusKey] = item.Status,
-                [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,
+                [Driver.StatusKey] = item.Status,
+                [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.Logiqx.Media"/> to <cref="Models.Internal.Media"/>
+        /// Convert from <cref="Models.Logiqx.Media"/> to <cref="Media"/>
         /// </summary>
-        public static Models.Internal.Media ConvertFromLogiqx(Models.Logiqx.Media item)
+        public static Media ConvertFromLogiqx(Models.Logiqx.Media item)
         {
-            var media = new Models.Internal.Media
+            var media = new Media
             {
-                [Models.Internal.Media.NameKey] = item.Name,
-                [Models.Internal.Media.MD5Key] = item.MD5,
-                [Models.Internal.Media.SHA1Key] = item.SHA1,
-                [Models.Internal.Media.SHA256Key] = item.SHA256,
-                [Models.Internal.Media.SpamSumKey] = item.SpamSum,
+                [Media.NameKey] = item.Name,
+                [Media.MD5Key] = item.MD5,
+                [Media.SHA1Key] = item.SHA1,
+                [Media.SHA256Key] = item.SHA256,
+                [Media.SpamSumKey] = item.SpamSum,
             };
             return media;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.Release"/> to <cref="Models.Internal.Release"/>
+        /// Convert from <cref="Models.Logiqx.Release"/> to <cref="Release"/>
         /// </summary>
-        public static Models.Internal.Release ConvertFromLogiqx(Models.Logiqx.Release item)
+        public static Release ConvertFromLogiqx(Models.Logiqx.Release item)
         {
-            var release = new Models.Internal.Release
+            var release = new Release
             {
-                [Models.Internal.Release.NameKey] = item.Name,
-                [Models.Internal.Release.RegionKey] = item.Region,
-                [Models.Internal.Release.LanguageKey] = item.Language,
-                [Models.Internal.Release.DateKey] = item.Date,
-                [Models.Internal.Release.DefaultKey] = item.Default,
+                [Release.NameKey] = item.Name,
+                [Release.RegionKey] = item.Region,
+                [Release.LanguageKey] = item.Language,
+                [Release.DateKey] = item.Date,
+                [Release.DefaultKey] = item.Default,
             };
             return release;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.Rom"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.Logiqx.Rom"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromLogiqx(Models.Logiqx.Rom item)
+        public static Rom ConvertFromLogiqx(Models.Logiqx.Rom item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.Name,
-                [Models.Internal.Rom.SizeKey] = item.Size,
-                [Models.Internal.Rom.CRCKey] = item.CRC,
-                [Models.Internal.Rom.MD5Key] = item.MD5,
-                [Models.Internal.Rom.SHA1Key] = item.SHA1,
-                [Models.Internal.Rom.SHA256Key] = item.SHA256,
-                [Models.Internal.Rom.SHA384Key] = item.SHA384,
-                [Models.Internal.Rom.SHA512Key] = item.SHA512,
-                [Models.Internal.Rom.SpamSumKey] = item.SpamSum,
-                [Models.Internal.Rom.xxHash364Key] = item.xxHash364,
-                [Models.Internal.Rom.xxHash3128Key] = item.xxHash3128,
-                [Models.Internal.Rom.MergeKey] = item.Merge,
-                [Models.Internal.Rom.StatusKey] = item.Status,
-                [Models.Internal.Rom.SerialKey] = item.Serial,
-                [Models.Internal.Rom.HeaderKey] = item.Header,
-                [Models.Internal.Rom.DateKey] = item.Date,
-                [Models.Internal.Rom.InvertedKey] = item.Inverted,
-                [Models.Internal.Rom.MIAKey] = item.MIA,
+                [Rom.NameKey] = item.Name,
+                [Rom.SizeKey] = item.Size,
+                [Rom.CRCKey] = item.CRC,
+                [Rom.MD5Key] = item.MD5,
+                [Rom.SHA1Key] = item.SHA1,
+                [Rom.SHA256Key] = item.SHA256,
+                [Rom.SHA384Key] = item.SHA384,
+                [Rom.SHA512Key] = item.SHA512,
+                [Rom.SpamSumKey] = item.SpamSum,
+                [Rom.xxHash364Key] = item.xxHash364,
+                [Rom.xxHash3128Key] = item.xxHash3128,
+                [Rom.MergeKey] = item.Merge,
+                [Rom.StatusKey] = item.Status,
+                [Rom.SerialKey] = item.Serial,
+                [Rom.HeaderKey] = item.Header,
+                [Rom.DateKey] = item.Date,
+                [Rom.InvertedKey] = item.Inverted,
+                [Rom.MIAKey] = item.MIA,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.Sample"/> to <cref="Models.Internal.Sample"/>
+        /// Convert from <cref="Models.Logiqx.Sample"/> to <cref="Sample"/>
         /// </summary>
-        public static Models.Internal.Sample ConvertFromLogiqx(Models.Logiqx.Sample item)
+        public static Sample ConvertFromLogiqx(Models.Logiqx.Sample item)
         {
-            var sample = new Models.Internal.Sample
+            var sample = new Sample
             {
-                [Models.Internal.Sample.NameKey] = item.Name,
+                [Sample.NameKey] = item.Name,
             };
             return sample;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Logiqx.SoftwareList"/> to <cref="Models.Internal.SoftwareList"/>
+        /// Convert from <cref="Models.Logiqx.SoftwareList"/> to <cref="SoftwareList"/>
         /// </summary>
-        public static Models.Internal.SoftwareList ConvertFromLogiqx(Models.Logiqx.SoftwareList item)
+        public static SoftwareList ConvertFromLogiqx(Models.Logiqx.SoftwareList item)
         {
-            var softwareList = new Models.Internal.SoftwareList
+            var softwareList = new 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,
+                [SoftwareList.TagKey] = item.Tag,
+                [SoftwareList.NameKey] = item.Name,
+                [SoftwareList.StatusKey] = item.Status,
+                [SoftwareList.FilterKey] = item.Filter,
             };
             return softwareList;
         }
@@ -353,61 +354,61 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.Logiqx.Header"/>
+        /// Convert from <cref="Header"/> to <cref="Models.Logiqx.Header"/>
         /// </summary>
-        public static Models.Logiqx.Header? ConvertHeaderToLogiqx(Models.Internal.Header? item)
+        public static Models.Logiqx.Header? ConvertHeaderToLogiqx(Header? item)
         {
             if (item == null)
                 return null;
 
             var header = new Models.Logiqx.Header
             {
-                Id = item.ReadString(Models.Internal.Header.IdKey),
-                Name = item.ReadString(Models.Internal.Header.NameKey),
-                Description = item.ReadString(Models.Internal.Header.DescriptionKey),
-                RootDir = item.ReadString(Models.Internal.Header.RootDirKey),
-                Category = item.ReadString(Models.Internal.Header.CategoryKey),
-                Version = item.ReadString(Models.Internal.Header.VersionKey),
-                Date = item.ReadString(Models.Internal.Header.DateKey),
-                Author = item.ReadString(Models.Internal.Header.AuthorKey),
-                Email = item.ReadString(Models.Internal.Header.EmailKey),
-                Homepage = item.ReadString(Models.Internal.Header.HomepageKey),
-                Url = item.ReadString(Models.Internal.Header.UrlKey),
-                Comment = item.ReadString(Models.Internal.Header.CommentKey),
-                Type = item.ReadString(Models.Internal.Header.TypeKey),
+                Id = item.ReadString(Header.IdKey),
+                Name = item.ReadString(Header.NameKey),
+                Description = item.ReadString(Header.DescriptionKey),
+                RootDir = item.ReadString(Header.RootDirKey),
+                Category = item.ReadString(Header.CategoryKey),
+                Version = item.ReadString(Header.VersionKey),
+                Date = item.ReadString(Header.DateKey),
+                Author = item.ReadString(Header.AuthorKey),
+                Email = item.ReadString(Header.EmailKey),
+                Homepage = item.ReadString(Header.HomepageKey),
+                Url = item.ReadString(Header.UrlKey),
+                Comment = item.ReadString(Header.CommentKey),
+                Type = item.ReadString(Header.TypeKey),
             };
 
-            if (item.ContainsKey(Models.Internal.Header.HeaderKey)
-                || item.ContainsKey(Models.Internal.Header.ForceMergingKey)
-                || item.ContainsKey(Models.Internal.Header.ForceNodumpKey)
-                || item.ContainsKey(Models.Internal.Header.ForcePackingKey))
+            if (item.ContainsKey(Header.HeaderKey)
+                || item.ContainsKey(Header.ForceMergingKey)
+                || item.ContainsKey(Header.ForceNodumpKey)
+                || item.ContainsKey(Header.ForcePackingKey))
             {
                 header.ClrMamePro = new Models.Logiqx.ClrMamePro
                 {
-                    Header = item.ReadString(Models.Internal.Header.HeaderKey),
-                    ForceMerging = item.ReadString(Models.Internal.Header.ForceMergingKey),
-                    ForceNodump = item.ReadString(Models.Internal.Header.ForceNodumpKey),
-                    ForcePacking = item.ReadString(Models.Internal.Header.ForcePackingKey),
+                    Header = item.ReadString(Header.HeaderKey),
+                    ForceMerging = item.ReadString(Header.ForceMergingKey),
+                    ForceNodump = item.ReadString(Header.ForceNodumpKey),
+                    ForcePacking = item.ReadString(Header.ForcePackingKey),
                 };
             }
 
-            if (item.ContainsKey(Models.Internal.Header.PluginKey)
-                || item.ContainsKey(Models.Internal.Header.RomModeKey)
-                || item.ContainsKey(Models.Internal.Header.BiosModeKey)
-                || item.ContainsKey(Models.Internal.Header.SampleModeKey)
-                || item.ContainsKey(Models.Internal.Header.LockRomModeKey)
-                || item.ContainsKey(Models.Internal.Header.LockBiosModeKey)
-                || item.ContainsKey(Models.Internal.Header.LockSampleModeKey))
+            if (item.ContainsKey(Header.PluginKey)
+                || item.ContainsKey(Header.RomModeKey)
+                || item.ContainsKey(Header.BiosModeKey)
+                || item.ContainsKey(Header.SampleModeKey)
+                || item.ContainsKey(Header.LockRomModeKey)
+                || item.ContainsKey(Header.LockBiosModeKey)
+                || item.ContainsKey(Header.LockSampleModeKey))
             {
                 header.RomCenter = new Models.Logiqx.RomCenter
                 {
-                    Plugin = item.ReadString(Models.Internal.Header.PluginKey),
-                    RomMode = item.ReadString(Models.Internal.Header.RomModeKey),
-                    BiosMode = item.ReadString(Models.Internal.Header.BiosModeKey),
-                    SampleMode = item.ReadString(Models.Internal.Header.SampleModeKey),
-                    LockRomMode = item.ReadString(Models.Internal.Header.LockRomModeKey),
-                    LockBiosMode = item.ReadString(Models.Internal.Header.LockBiosModeKey),
-                    LockSampleMode = item.ReadString(Models.Internal.Header.LockSampleModeKey),
+                    Plugin = item.ReadString(Header.PluginKey),
+                    RomMode = item.ReadString(Header.RomModeKey),
+                    BiosMode = item.ReadString(Header.BiosModeKey),
+                    SampleMode = item.ReadString(Header.SampleModeKey),
+                    LockRomMode = item.ReadString(Header.LockRomModeKey),
+                    LockBiosMode = item.ReadString(Header.LockBiosModeKey),
+                    LockSampleMode = item.ReadString(Header.LockSampleModeKey),
                 };
             }
 
@@ -415,259 +416,259 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.Logiqx.Archive"/>
+        /// Convert from <cref="Archive"/> to <cref="Models.Logiqx.Archive"/>
         /// </summary>
-        public static Models.Logiqx.GameBase? ConvertMachineToLogiqx(Models.Internal.Machine? item, bool game = false)
+        public static Models.Logiqx.GameBase? ConvertMachineToLogiqx(Machine? item, bool game = false)
         {
             if (item == null)
                 return null;
 
             Models.Logiqx.GameBase gameBase = game ? new Models.Logiqx.Game() : new Models.Logiqx.Machine();
 
-            gameBase.Name = item.ReadString(Models.Internal.Machine.NameKey);
-            gameBase.SourceFile = item.ReadString(Models.Internal.Machine.SourceFileKey);
-            gameBase.IsBios = item.ReadString(Models.Internal.Machine.IsBiosKey);
-            gameBase.IsDevice = item.ReadString(Models.Internal.Machine.IsDeviceKey);
-            gameBase.IsMechanical = item.ReadString(Models.Internal.Machine.IsMechanicalKey);
-            gameBase.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey);
-            gameBase.RomOf = item.ReadString(Models.Internal.Machine.RomOfKey);
-            gameBase.SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey);
-            gameBase.Board = item.ReadString(Models.Internal.Machine.BoardKey);
-            gameBase.RebuildTo = item.ReadString(Models.Internal.Machine.RebuildToKey);
-            gameBase.Id = item.ReadString(Models.Internal.Machine.IdKey);
-            gameBase.CloneOfId = item.ReadString(Models.Internal.Machine.CloneOfIdKey);
-            gameBase.Runnable = item.ReadString(Models.Internal.Machine.RunnableKey);
-            gameBase.Comment = item.ReadStringArray(Models.Internal.Machine.CommentKey);
-            gameBase.Description = item.ReadString(Models.Internal.Machine.DescriptionKey);
-            gameBase.Year = item.ReadString(Models.Internal.Machine.YearKey);
-            gameBase.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey);
-            gameBase.Publisher = item.ReadString(Models.Internal.Machine.PublisherKey);
-            gameBase.Category = item.ReadStringArray(Models.Internal.Machine.CategoryKey);
+            gameBase.Name = item.ReadString(Machine.NameKey);
+            gameBase.SourceFile = item.ReadString(Machine.SourceFileKey);
+            gameBase.IsBios = item.ReadString(Machine.IsBiosKey);
+            gameBase.IsDevice = item.ReadString(Machine.IsDeviceKey);
+            gameBase.IsMechanical = item.ReadString(Machine.IsMechanicalKey);
+            gameBase.CloneOf = item.ReadString(Machine.CloneOfKey);
+            gameBase.RomOf = item.ReadString(Machine.RomOfKey);
+            gameBase.SampleOf = item.ReadString(Machine.SampleOfKey);
+            gameBase.Board = item.ReadString(Machine.BoardKey);
+            gameBase.RebuildTo = item.ReadString(Machine.RebuildToKey);
+            gameBase.Id = item.ReadString(Machine.IdKey);
+            gameBase.CloneOfId = item.ReadString(Machine.CloneOfIdKey);
+            gameBase.Runnable = item.ReadString(Machine.RunnableKey);
+            gameBase.Comment = item.ReadStringArray(Machine.CommentKey);
+            gameBase.Description = item.ReadString(Machine.DescriptionKey);
+            gameBase.Year = item.ReadString(Machine.YearKey);
+            gameBase.Manufacturer = item.ReadString(Machine.ManufacturerKey);
+            gameBase.Publisher = item.ReadString(Machine.PublisherKey);
+            gameBase.Category = item.ReadStringArray(Machine.CategoryKey);
 
-            var trurip = item.Read<Models.Logiqx.Trurip>(Models.Internal.Machine.TruripKey);
+            var trurip = item.Read<Models.Logiqx.Trurip>(Machine.TruripKey);
             gameBase.Trurip = trurip;
 
-            var releases = item.Read<Models.Internal.Release[]>(Models.Internal.Machine.ReleaseKey);
+            var releases = item.Read<Release[]>(Machine.ReleaseKey);
             gameBase.Release = releases?.Select(ConvertToLogiqx)?.ToArray();
 
-            var biosSets = item.Read<Models.Internal.BiosSet[]>(Models.Internal.Machine.BiosSetKey);
+            var biosSets = item.Read<BiosSet[]>(Machine.BiosSetKey);
             gameBase.BiosSet = biosSets?.Select(ConvertToLogiqx)?.ToArray();
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             gameBase.Rom = roms?.Select(ConvertToLogiqx)?.ToArray();
 
-            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
+            var disks = item.Read<Disk[]>(Machine.DiskKey);
             gameBase.Disk = disks?.Select(ConvertToLogiqx)?.ToArray();
 
-            var medias = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey);
+            var medias = item.Read<Media[]>(Machine.MediaKey);
             gameBase.Media = medias?.Select(ConvertToLogiqx)?.ToArray();
 
-            var deviceRefs = item.Read<Models.Internal.DeviceRef[]>(Models.Internal.Machine.DeviceRefKey);
+            var deviceRefs = item.Read<DeviceRef[]>(Machine.DeviceRefKey);
             gameBase.DeviceRef = deviceRefs?.Select(ConvertToLogiqx)?.ToArray();
 
-            var samples = item.Read<Models.Internal.Sample[]>(Models.Internal.Machine.SampleKey);
+            var samples = item.Read<Sample[]>(Machine.SampleKey);
             gameBase.Sample = samples?.Select(ConvertToLogiqx)?.ToArray();
 
-            var archives = item.Read<Models.Internal.Archive[]>(Models.Internal.Machine.ArchiveKey);
+            var archives = item.Read<Archive[]>(Machine.ArchiveKey);
             gameBase.Archive = archives?.Select(ConvertToLogiqx)?.ToArray();
 
-            var drivers = item.Read<Models.Internal.Driver[]>(Models.Internal.Machine.DriverKey);
+            var drivers = item.Read<Driver[]>(Machine.DriverKey);
             gameBase.Driver = drivers?.Select(ConvertToLogiqx)?.ToArray();
 
-            var softwareLists = item.Read<Models.Internal.SoftwareList[]>(Models.Internal.Machine.SoftwareListKey);
+            var softwareLists = item.Read<SoftwareList[]>(Machine.SoftwareListKey);
             gameBase.SoftwareList = softwareLists?.Select(ConvertToLogiqx)?.ToArray();
 
             return gameBase;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.Logiqx.Archive"/>
+        /// Convert from <cref="Archive"/> to <cref="Models.Logiqx.Archive"/>
         /// </summary>
-        private static Models.Logiqx.Archive? ConvertToLogiqx(Models.Internal.Archive? item)
+        private static Models.Logiqx.Archive? ConvertToLogiqx(Archive? item)
         {
             if (item == null)
                 return null;
 
             var archive = new Models.Logiqx.Archive
             {
-                Name = item.ReadString(Models.Internal.Archive.NameKey),
+                Name = item.ReadString(Archive.NameKey),
             };
             return archive;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.BiosSet"/> to <cref="Models.Logiqx.BiosSet"/>
+        /// Convert from <cref="BiosSet"/> to <cref="Models.Logiqx.BiosSet"/>
         /// </summary>
-        private static Models.Logiqx.BiosSet? ConvertToLogiqx(Models.Internal.BiosSet? item)
+        private static Models.Logiqx.BiosSet? ConvertToLogiqx(BiosSet? item)
         {
             if (item == null)
                 return null;
 
             var biosset = new Models.Logiqx.BiosSet
             {
-                Name = item.ReadString(Models.Internal.BiosSet.NameKey),
-                Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey),
-                Default = item.ReadString(Models.Internal.BiosSet.DefaultKey),
+                Name = item.ReadString(BiosSet.NameKey),
+                Description = item.ReadString(BiosSet.DescriptionKey),
+                Default = item.ReadString(BiosSet.DefaultKey),
             };
             return biosset;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DeviceRef"/> to <cref="Models.Logiqx.DeviceRef"/>
+        /// Convert from <cref="DeviceRef"/> to <cref="Models.Logiqx.DeviceRef"/>
         /// </summary>
-        private static Models.Logiqx.DeviceRef? ConvertToLogiqx(Models.Internal.DeviceRef? item)
+        private static Models.Logiqx.DeviceRef? ConvertToLogiqx(DeviceRef? item)
         {
             if (item == null)
                 return null;
 
             var deviceRef = new Models.Logiqx.DeviceRef
             {
-                Name = item.ReadString(Models.Internal.DipSwitch.NameKey),
+                Name = item.ReadString(DipSwitch.NameKey),
             };
             return deviceRef;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.Logiqx.Disk"/>
+        /// Convert from <cref="Disk"/> to <cref="Models.Logiqx.Disk"/>
         /// </summary>
-        private static Models.Logiqx.Disk? ConvertToLogiqx(Models.Internal.Disk? item)
+        private static Models.Logiqx.Disk? ConvertToLogiqx(Disk? item)
         {
             if (item == null)
                 return null;
 
             var disk = new Models.Logiqx.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),
-                Status = item.ReadString(Models.Internal.Disk.StatusKey),
-                Region = item.ReadString(Models.Internal.Disk.RegionKey),
+                Name = item.ReadString(Disk.NameKey),
+                MD5 = item.ReadString(Disk.MD5Key),
+                SHA1 = item.ReadString(Disk.SHA1Key),
+                Merge = item.ReadString(Disk.MergeKey),
+                Status = item.ReadString(Disk.StatusKey),
+                Region = item.ReadString(Disk.RegionKey),
             };
             return disk;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Driver"/> to <cref="Models.Logiqx.Driver"/>
+        /// Convert from <cref="Driver"/> to <cref="Models.Logiqx.Driver"/>
         /// </summary>
-        private static Models.Logiqx.Driver? ConvertToLogiqx(Models.Internal.Driver? item)
+        private static Models.Logiqx.Driver? ConvertToLogiqx(Driver? item)
         {
             if (item == null)
                 return null;
 
             var driver = new Models.Logiqx.Driver
             {
-                Status = item.ReadString(Models.Internal.Driver.StatusKey),
-                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),
+                Status = item.ReadString(Driver.StatusKey),
+                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="Models.Internal.Media"/> to <cref="Models.Logiqx.Media"/>
+        /// Convert from <cref="Media"/> to <cref="Models.Logiqx.Media"/>
         /// </summary>
-        private static Models.Logiqx.Media? ConvertToLogiqx(Models.Internal.Media? item)
+        private static Models.Logiqx.Media? ConvertToLogiqx(Media? item)
         {
             if (item == null)
                 return null;
 
             var media = new Models.Logiqx.Media
             {
-                Name = item.ReadString(Models.Internal.Media.NameKey),
-                MD5 = item.ReadString(Models.Internal.Media.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Media.SHA1Key),
-                SHA256 = item.ReadString(Models.Internal.Media.SHA256Key),
-                SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey),
+                Name = item.ReadString(Media.NameKey),
+                MD5 = item.ReadString(Media.MD5Key),
+                SHA1 = item.ReadString(Media.SHA1Key),
+                SHA256 = item.ReadString(Media.SHA256Key),
+                SpamSum = item.ReadString(Media.SpamSumKey),
             };
             return media;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Release"/> to <cref="Models.Logiqx.Release"/>
+        /// Convert from <cref="Release"/> to <cref="Models.Logiqx.Release"/>
         /// </summary>
-        private static Models.Logiqx.Release? ConvertToLogiqx(Models.Internal.Release? item)
+        private static Models.Logiqx.Release? ConvertToLogiqx(Release? item)
         {
             if (item == null)
                 return null;
 
             var release = new Models.Logiqx.Release
             {
-                Name = item.ReadString(Models.Internal.Release.NameKey),
-                Region = item.ReadString(Models.Internal.Release.RegionKey),
-                Language = item.ReadString(Models.Internal.Release.LanguageKey),
-                Date = item.ReadString(Models.Internal.Release.DateKey),
-                Default = item.ReadString(Models.Internal.Release.DefaultKey),
+                Name = item.ReadString(Release.NameKey),
+                Region = item.ReadString(Release.RegionKey),
+                Language = item.ReadString(Release.LanguageKey),
+                Date = item.ReadString(Release.DateKey),
+                Default = item.ReadString(Release.DefaultKey),
             };
             return release;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Logiqx.Rom"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.Logiqx.Rom"/>
         /// </summary>
-        private static Models.Logiqx.Rom? ConvertToLogiqx(Models.Internal.Rom? item)
+        private static Models.Logiqx.Rom? ConvertToLogiqx(Rom? item)
         {
             if (item == null)
                 return null;
 
             var rom = new Models.Logiqx.Rom
             {
-                Name = item.ReadString(Models.Internal.Rom.NameKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
-                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
-                MD5 = item.ReadString(Models.Internal.Rom.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
-                SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key),
-                SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key),
-                SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key),
-                SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey),
-                xxHash364 = item.ReadString(Models.Internal.Rom.xxHash364Key),
-                xxHash3128 = item.ReadString(Models.Internal.Rom.xxHash3128Key),
-                Merge = item.ReadString(Models.Internal.Rom.MergeKey),
-                Status = item.ReadString(Models.Internal.Rom.StatusKey),
-                Serial = item.ReadString(Models.Internal.Rom.SerialKey),
-                Header = item.ReadString(Models.Internal.Rom.HeaderKey),
-                Date = item.ReadString(Models.Internal.Rom.DateKey),
-                Inverted = item.ReadString(Models.Internal.Rom.InvertedKey),
-                MIA = item.ReadString(Models.Internal.Rom.MIAKey),
+                Name = item.ReadString(Rom.NameKey),
+                Size = item.ReadString(Rom.SizeKey),
+                CRC = item.ReadString(Rom.CRCKey),
+                MD5 = item.ReadString(Rom.MD5Key),
+                SHA1 = item.ReadString(Rom.SHA1Key),
+                SHA256 = item.ReadString(Rom.SHA256Key),
+                SHA384 = item.ReadString(Rom.SHA384Key),
+                SHA512 = item.ReadString(Rom.SHA512Key),
+                SpamSum = item.ReadString(Rom.SpamSumKey),
+                xxHash364 = item.ReadString(Rom.xxHash364Key),
+                xxHash3128 = item.ReadString(Rom.xxHash3128Key),
+                Merge = item.ReadString(Rom.MergeKey),
+                Status = item.ReadString(Rom.StatusKey),
+                Serial = item.ReadString(Rom.SerialKey),
+                Header = item.ReadString(Rom.HeaderKey),
+                Date = item.ReadString(Rom.DateKey),
+                Inverted = item.ReadString(Rom.InvertedKey),
+                MIA = item.ReadString(Rom.MIAKey),
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Sample"/> to <cref="Models.Logiqx.Sample"/>
+        /// Convert from <cref="Sample"/> to <cref="Models.Logiqx.Sample"/>
         /// </summary>
-        private static Models.Logiqx.Sample? ConvertToLogiqx(Models.Internal.Sample? item)
+        private static Models.Logiqx.Sample? ConvertToLogiqx(Sample? item)
         {
             if (item == null)
                 return null;
 
             var sample = new Models.Logiqx.Sample
             {
-                Name = item.ReadString(Models.Internal.Sample.NameKey),
+                Name = item.ReadString(Sample.NameKey),
             };
             return sample;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.SoftwareList"/> to <cref="Models.Logiqx.SoftwareList"/>
+        /// Convert from <cref="SoftwareList"/> to <cref="Models.Logiqx.SoftwareList"/>
         /// </summary>
-        private static Models.Logiqx.SoftwareList? ConvertToLogiqx(Models.Internal.SoftwareList? item)
+        private static Models.Logiqx.SoftwareList? ConvertToLogiqx(SoftwareList? item)
         {
             if (item == null)
                 return null;
 
             var softwareList = new Models.Logiqx.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),
+                Tag = item.ReadString(SoftwareList.TagKey),
+                Name = item.ReadString(SoftwareList.NameKey),
+                Status = item.ReadString(SoftwareList.StatusKey),
+                Filter = item.ReadString(SoftwareList.FilterKey),
             };
             return softwareList;
         }
diff --git a/SabreTools.Serialization/Internal.OfflineList.cs b/SabreTools.Serialization/Internal.OfflineList.cs
index e49fdbd1..e8497108 100644
--- a/SabreTools.Serialization/Internal.OfflineList.cs
+++ b/SabreTools.Serialization/Internal.OfflineList.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,80 +12,80 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.OfflineList.Dat"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.OfflineList.Dat"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromOfflineList(Models.OfflineList.Dat item)
+        public static Header ConvertHeaderFromOfflineList(Models.OfflineList.Dat item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NoNamespaceSchemaLocationKey] = item.NoNamespaceSchemaLocation,
+                [Header.NoNamespaceSchemaLocationKey] = item.NoNamespaceSchemaLocation,
             };
 
             if (item.Configuration != null)
             {
-                header[Models.Internal.Header.NameKey] = item.Configuration.DatName;
-                header[Models.Internal.Header.ImFolderKey] = item.Configuration.ImFolder;
-                header[Models.Internal.Header.DatVersionKey] = item.Configuration.DatVersion;
-                header[Models.Internal.Header.SystemKey] = item.Configuration.System;
-                header[Models.Internal.Header.ScreenshotsWidthKey] = item.Configuration.ScreenshotsWidth;
-                header[Models.Internal.Header.ScreenshotsHeightKey] = item.Configuration.ScreenshotsHeight;
-                header[Models.Internal.Header.InfosKey] = item.Configuration.Infos;
-                header[Models.Internal.Header.CanOpenKey] = item.Configuration.CanOpen;
-                header[Models.Internal.Header.NewDatKey] = item.Configuration.NewDat;
-                header[Models.Internal.Header.SearchKey] = item.Configuration.Search;
-                header[Models.Internal.Header.RomTitleKey] = item.Configuration.RomTitle;
+                header[Header.NameKey] = item.Configuration.DatName;
+                header[Header.ImFolderKey] = item.Configuration.ImFolder;
+                header[Header.DatVersionKey] = item.Configuration.DatVersion;
+                header[Header.SystemKey] = item.Configuration.System;
+                header[Header.ScreenshotsWidthKey] = item.Configuration.ScreenshotsWidth;
+                header[Header.ScreenshotsHeightKey] = item.Configuration.ScreenshotsHeight;
+                header[Header.InfosKey] = item.Configuration.Infos;
+                header[Header.CanOpenKey] = item.Configuration.CanOpen;
+                header[Header.NewDatKey] = item.Configuration.NewDat;
+                header[Header.SearchKey] = item.Configuration.Search;
+                header[Header.RomTitleKey] = item.Configuration.RomTitle;
             }
 
             if (item.GUI != null)
             {
-                header[Models.Internal.Header.ImagesKey] = item.GUI.Images;
+                header[Header.ImagesKey] = item.GUI.Images;
             }
 
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.OfflineList.Game"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.OfflineList.Game"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromOfflineList(Models.OfflineList.Game item)
+        public static Machine ConvertMachineFromOfflineList(Models.OfflineList.Game item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.ImageNumberKey] = item.ImageNumber,
-                [Models.Internal.Machine.ReleaseNumberKey] = item.ReleaseNumber,
-                [Models.Internal.Machine.NameKey] = item.Title,
-                [Models.Internal.Machine.SaveTypeKey] = item.SaveType,
-                [Models.Internal.Machine.PublisherKey] = item.Publisher,
-                [Models.Internal.Machine.LocationKey] = item.Location,
-                [Models.Internal.Machine.SourceRomKey] = item.SourceRom,
-                [Models.Internal.Machine.LanguageKey] = item.Language,
-                [Models.Internal.Machine.Im1CRCKey] = item.Im1CRC,
-                [Models.Internal.Machine.Im2CRCKey] = item.Im2CRC,
-                [Models.Internal.Machine.CommentKey] = item.Comment,
-                [Models.Internal.Machine.DuplicateIDKey] = item.DuplicateID,
+                [Machine.ImageNumberKey] = item.ImageNumber,
+                [Machine.ReleaseNumberKey] = item.ReleaseNumber,
+                [Machine.NameKey] = item.Title,
+                [Machine.SaveTypeKey] = item.SaveType,
+                [Machine.PublisherKey] = item.Publisher,
+                [Machine.LocationKey] = item.Location,
+                [Machine.SourceRomKey] = item.SourceRom,
+                [Machine.LanguageKey] = item.Language,
+                [Machine.Im1CRCKey] = item.Im1CRC,
+                [Machine.Im2CRCKey] = item.Im2CRC,
+                [Machine.CommentKey] = item.Comment,
+                [Machine.DuplicateIDKey] = item.DuplicateID,
             };
 
             if (item.Files?.RomCRC != null && item.Files.RomCRC.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var file in item.Files.RomCRC)
                 {
                     var rom = ConvertFromOfflineList(file);
-                    rom[Models.Internal.Rom.SizeKey] = item.RomSize;
+                    rom[Rom.SizeKey] = item.RomSize;
                     roms.Add(rom);
                 }
-                machine[Models.Internal.Machine.RomKey] = roms.ToArray();
+                machine[Machine.RomKey] = roms.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.OfflineList.Files"/> to an array of <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.OfflineList.Files"/> to an array of <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom[] ConvertFromOfflineList(Models.OfflineList.Files item)
+        public static Rom[] ConvertFromOfflineList(Models.OfflineList.Files item)
         {
-            var roms = new List<Models.Internal.Rom>();
+            var roms = new List<Rom>();
             foreach (var romCRC in item.RomCRC)
             {
                 roms.Add(ConvertFromOfflineList(romCRC));
@@ -93,14 +94,14 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.OfflineList.FileRomCRC"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.OfflineList.FileRomCRC"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromOfflineList(Models.OfflineList.FileRomCRC item)
+        public static Rom ConvertFromOfflineList(Models.OfflineList.FileRomCRC item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.ExtensionKey] = item.Extension,
-                [Models.Internal.Rom.CRCKey] = item.Content,
+                [Rom.ExtensionKey] = item.Extension,
+                [Rom.CRCKey] = item.Content,
             };
             return rom;
         }
@@ -110,51 +111,51 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.OfflineList.Dat"/>
+        /// Convert from <cref="Header"/> to <cref="Models.OfflineList.Dat"/>
         /// </summary>
-        public static Models.OfflineList.Dat? ConvertHeaderToOfflineList(Models.Internal.Header? item)
+        public static Models.OfflineList.Dat? ConvertHeaderToOfflineList(Header? item)
         {
             if (item == null)
                 return null;
 
             var dat = new Models.OfflineList.Dat
             {
-                NoNamespaceSchemaLocation = item.ReadString(Models.Internal.Header.NoNamespaceSchemaLocationKey),
+                NoNamespaceSchemaLocation = item.ReadString(Header.NoNamespaceSchemaLocationKey),
             };
 
-            if (item.ContainsKey(Models.Internal.Header.NameKey)
-                || item.ContainsKey(Models.Internal.Header.ImFolderKey)
-                || item.ContainsKey(Models.Internal.Header.DatVersionKey)
-                || item.ContainsKey(Models.Internal.Header.SystemKey)
-                || item.ContainsKey(Models.Internal.Header.ScreenshotsWidthKey)
-                || item.ContainsKey(Models.Internal.Header.ScreenshotsHeightKey)
-                || item.ContainsKey(Models.Internal.Header.InfosKey)
-                || item.ContainsKey(Models.Internal.Header.CanOpenKey)
-                || item.ContainsKey(Models.Internal.Header.NewDatKey)
-                || item.ContainsKey(Models.Internal.Header.SearchKey)
-                || item.ContainsKey(Models.Internal.Header.RomTitleKey))
+            if (item.ContainsKey(Header.NameKey)
+                || item.ContainsKey(Header.ImFolderKey)
+                || item.ContainsKey(Header.DatVersionKey)
+                || item.ContainsKey(Header.SystemKey)
+                || item.ContainsKey(Header.ScreenshotsWidthKey)
+                || item.ContainsKey(Header.ScreenshotsHeightKey)
+                || item.ContainsKey(Header.InfosKey)
+                || item.ContainsKey(Header.CanOpenKey)
+                || item.ContainsKey(Header.NewDatKey)
+                || item.ContainsKey(Header.SearchKey)
+                || item.ContainsKey(Header.RomTitleKey))
             {
                 dat.Configuration = new Models.OfflineList.Configuration
                 {
-                    DatName = item.ReadString(Models.Internal.Header.NameKey),
-                    ImFolder = item.ReadString(Models.Internal.Header.ImFolderKey),
-                    DatVersion = item.ReadString(Models.Internal.Header.DatVersionKey),
-                    System = item.ReadString(Models.Internal.Header.SystemKey),
-                    ScreenshotsWidth = item.ReadString(Models.Internal.Header.ScreenshotsWidthKey),
-                    ScreenshotsHeight = item.ReadString(Models.Internal.Header.ScreenshotsHeightKey),
-                    Infos = item.Read<Models.OfflineList.Infos>(Models.Internal.Header.InfosKey),
-                    CanOpen = item.Read<Models.OfflineList.CanOpen>(Models.Internal.Header.CanOpenKey),
-                    NewDat = item.Read<Models.OfflineList.NewDat>(Models.Internal.Header.NewDatKey),
-                    Search = item.Read<Models.OfflineList.Search>(Models.Internal.Header.SearchKey),
-                    RomTitle = item.ReadString(Models.Internal.Header.RomTitleKey),
+                    DatName = item.ReadString(Header.NameKey),
+                    ImFolder = item.ReadString(Header.ImFolderKey),
+                    DatVersion = item.ReadString(Header.DatVersionKey),
+                    System = item.ReadString(Header.SystemKey),
+                    ScreenshotsWidth = item.ReadString(Header.ScreenshotsWidthKey),
+                    ScreenshotsHeight = item.ReadString(Header.ScreenshotsHeightKey),
+                    Infos = item.Read<Models.OfflineList.Infos>(Header.InfosKey),
+                    CanOpen = item.Read<Models.OfflineList.CanOpen>(Header.CanOpenKey),
+                    NewDat = item.Read<Models.OfflineList.NewDat>(Header.NewDatKey),
+                    Search = item.Read<Models.OfflineList.Search>(Header.SearchKey),
+                    RomTitle = item.ReadString(Header.RomTitleKey),
                 };
             }
 
-            if (item.ContainsKey(Models.Internal.Header.ImagesKey))
+            if (item.ContainsKey(Header.ImagesKey))
             {
                 dat.GUI = new Models.OfflineList.GUI
                 {
-                    Images = item.Read<Models.OfflineList.Images>(Models.Internal.Header.ImagesKey),
+                    Images = item.Read<Models.OfflineList.Images>(Header.ImagesKey),
                 };
             }
 
@@ -162,32 +163,32 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.OfflineList.Game"/>
+        /// Convert from <cref="Machine"/> to <cref="Models.OfflineList.Game"/>
         /// </summary>
-        public static Models.OfflineList.Game? ConvertMachineToOfflineList(Models.Internal.Machine? item)
+        public static Models.OfflineList.Game? ConvertMachineToOfflineList(Machine? item)
         {
             if (item == null)
                 return null;
 
             var game = new Models.OfflineList.Game
             {
-                ImageNumber = item.ReadString(Models.Internal.Machine.ImageNumberKey),
-                ReleaseNumber = item.ReadString(Models.Internal.Machine.ReleaseNumberKey),
-                Title = item.ReadString(Models.Internal.Machine.NameKey),
-                SaveType = item.ReadString(Models.Internal.Machine.SaveTypeKey),
-                Publisher = item.ReadString(Models.Internal.Machine.PublisherKey),
-                Location = item.ReadString(Models.Internal.Machine.LocationKey),
-                SourceRom = item.ReadString(Models.Internal.Machine.SourceRomKey),
-                Language = item.ReadString(Models.Internal.Machine.LanguageKey),
-                Im1CRC = item.ReadString(Models.Internal.Machine.Im1CRCKey),
-                Im2CRC = item.ReadString(Models.Internal.Machine.Im2CRCKey),
-                Comment = item.ReadString(Models.Internal.Machine.CommentKey),
-                DuplicateID = item.ReadString(Models.Internal.Machine.DuplicateIDKey),
+                ImageNumber = item.ReadString(Machine.ImageNumberKey),
+                ReleaseNumber = item.ReadString(Machine.ReleaseNumberKey),
+                Title = item.ReadString(Machine.NameKey),
+                SaveType = item.ReadString(Machine.SaveTypeKey),
+                Publisher = item.ReadString(Machine.PublisherKey),
+                Location = item.ReadString(Machine.LocationKey),
+                SourceRom = item.ReadString(Machine.SourceRomKey),
+                Language = item.ReadString(Machine.LanguageKey),
+                Im1CRC = item.ReadString(Machine.Im1CRCKey),
+                Im2CRC = item.ReadString(Machine.Im2CRCKey),
+                Comment = item.ReadString(Machine.CommentKey),
+                DuplicateID = item.ReadString(Machine.DuplicateIDKey),
             };
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             game.RomSize = roms?
-                .Select(rom => rom.ReadString(Models.Internal.Rom.SizeKey))?
+                .Select(rom => rom.ReadString(Rom.SizeKey))?
                 .FirstOrDefault(s => s != null);
             var romCRCs = roms?.Select(ConvertToOfflineList).ToArray();
             game.Files = new Models.OfflineList.Files { RomCRC = romCRCs };
@@ -196,17 +197,17 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OfflineList.FileRomCRC"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.OfflineList.FileRomCRC"/>
         /// </summary>
-        private static Models.OfflineList.FileRomCRC? ConvertToOfflineList(Models.Internal.Rom? item)
+        private static Models.OfflineList.FileRomCRC? ConvertToOfflineList(Rom? item)
         {
             if (item == null)
                 return null;
 
             var fileRomCRC = new Models.OfflineList.FileRomCRC
             {
-                Extension = item.ReadString(Models.Internal.Rom.ExtensionKey),
-                Content = item.ReadString(Models.Internal.Rom.CRCKey),
+                Extension = item.ReadString(Rom.ExtensionKey),
+                Content = item.ReadString(Rom.CRCKey),
             };
             return fileRomCRC;
         }
diff --git a/SabreTools.Serialization/Internal.OpenMSX.cs b/SabreTools.Serialization/Internal.OpenMSX.cs
index ebd915f7..0bfc27ee 100644
--- a/SabreTools.Serialization/Internal.OpenMSX.cs
+++ b/SabreTools.Serialization/Internal.OpenMSX.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,67 +12,67 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromOpenMSX(Models.OpenMSX.SoftwareDb item)
+        public static Header ConvertHeaderFromOpenMSX(Models.OpenMSX.SoftwareDb item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.TimestampKey] = item.Timestamp,
+                [Header.TimestampKey] = item.Timestamp,
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.OpenMSX.Software"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.OpenMSX.Software"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromOpenMSX(Models.OpenMSX.Software item)
+        public static Machine ConvertMachineFromOpenMSX(Models.OpenMSX.Software item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.NameKey] = item.Title,
-                [Models.Internal.Machine.GenMSXIDKey] = item.GenMSXID,
-                [Models.Internal.Machine.SystemKey] = item.System,
-                [Models.Internal.Machine.CompanyKey] = item.Company,
-                [Models.Internal.Machine.YearKey] = item.Year,
-                [Models.Internal.Machine.CountryKey] = item.Country,
+                [Machine.NameKey] = item.Title,
+                [Machine.GenMSXIDKey] = item.GenMSXID,
+                [Machine.SystemKey] = item.System,
+                [Machine.CompanyKey] = item.Company,
+                [Machine.YearKey] = item.Year,
+                [Machine.CountryKey] = item.Country,
             };
 
             if (item.Dump != null && item.Dump.Any())
             {
-                var dumps = new List<Models.Internal.Dump>();
+                var dumps = new List<Dump>();
                 foreach (var dump in item.Dump)
                 {
                     dumps.Add(ConvertFromOpenMSX(dump));
                 }
-                machine[Models.Internal.Machine.DumpKey] = dumps.ToArray();
+                machine[Machine.DumpKey] = dumps.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.OpenMSX.Dump"/> to <cref="Models.Internal.Dump"/>
+        /// Convert from <cref="Models.OpenMSX.Dump"/> to <cref="Dump"/>
         /// </summary>
-        public static Models.Internal.Dump ConvertFromOpenMSX(Models.OpenMSX.Dump item)
+        public static Dump ConvertFromOpenMSX(Models.OpenMSX.Dump item)
         {
-            var dump = new Models.Internal.Dump();
+            var dump = new Dump();
 
             if (item.Original != null)
-                dump[Models.Internal.Dump.OriginalKey] = ConvertFromOpenMSX(item.Original);
+                dump[Dump.OriginalKey] = ConvertFromOpenMSX(item.Original);
 
             switch (item.Rom)
             {
                 case Models.OpenMSX.Rom rom:
-                    dump[Models.Internal.Dump.RomKey] = ConvertFromOpenMSX(rom);
+                    dump[Dump.RomKey] = ConvertFromOpenMSX(rom);
                     break;
 
                 case Models.OpenMSX.MegaRom megaRom:
-                    dump[Models.Internal.Dump.MegaRomKey] = ConvertFromOpenMSX(megaRom);
+                    dump[Dump.MegaRomKey] = ConvertFromOpenMSX(megaRom);
                     break;
 
                 case Models.OpenMSX.SCCPlusCart sccPlusCart:
-                    dump[Models.Internal.Dump.SCCPlusCartKey] = ConvertFromOpenMSX(sccPlusCart);
+                    dump[Dump.SCCPlusCartKey] = ConvertFromOpenMSX(sccPlusCart);
                     break;
             }
 
@@ -79,29 +80,29 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.OpenMSX.Original"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.OpenMSX.Original"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Original ConvertFromOpenMSX(Models.OpenMSX.Original item)
+        public static Original ConvertFromOpenMSX(Models.OpenMSX.Original item)
         {
-            var original = new Models.Internal.Original
+            var original = new Original
             {
-                [Models.Internal.Original.ValueKey] = item.Value,
-                [Models.Internal.Original.ContentKey] = item.Content,
+                [Original.ValueKey] = item.Value,
+                [Original.ContentKey] = item.Content,
             };
             return original;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.OpenMSX.RomBase"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.OpenMSX.RomBase"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromOpenMSX(Models.OpenMSX.RomBase item)
+        public static Rom ConvertFromOpenMSX(Models.OpenMSX.RomBase item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.StartKey] = item.Start,
-                [Models.Internal.Rom.TypeKey] = item.Type,
-                [Models.Internal.Rom.SHA1Key] = item.Hash,
-                [Models.Internal.Rom.RemarkKey] = item.Remark,
+                [Rom.StartKey] = item.Start,
+                [Rom.TypeKey] = item.Type,
+                [Rom.SHA1Key] = item.Hash,
+                [Rom.RemarkKey] = item.Remark,
             };
             return rom;
         }
@@ -111,135 +112,135 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.OpenMSX.SoftwareDb"/>
+        /// Convert from <cref="Header"/> to <cref="Models.OpenMSX.SoftwareDb"/>
         /// </summary>
-        public static Models.OpenMSX.SoftwareDb? ConvertHeaderToOpenMSX(Models.Internal.Header? item)
+        public static Models.OpenMSX.SoftwareDb? ConvertHeaderToOpenMSX(Header? item)
         {
             if (item == null)
                 return null;
 
             var softwareDb = new Models.OpenMSX.SoftwareDb
             {
-                Timestamp = item.ReadString(Models.Internal.Header.TimestampKey),
+                Timestamp = item.ReadString(Header.TimestampKey),
             };
             return softwareDb;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.OpenMSX.Software"/>
+        /// Convert from <cref="Machine"/> to <cref="Models.OpenMSX.Software"/>
         /// </summary>
-        public static Models.OpenMSX.Software? ConvertMachineToOpenMSX(Models.Internal.Machine? item)
+        public static Models.OpenMSX.Software? ConvertMachineToOpenMSX(Machine? item)
         {
             if (item == null)
                 return null;
             
             var game = new Models.OpenMSX.Software
             {
-                Title = item.ReadString(Models.Internal.Machine.NameKey),
-                GenMSXID = item.ReadString(Models.Internal.Machine.GenMSXIDKey),
-                System = item.ReadString(Models.Internal.Machine.SystemKey),
-                Company = item.ReadString(Models.Internal.Machine.CompanyKey),
-                Year = item.ReadString(Models.Internal.Machine.YearKey),
-                Country = item.ReadString(Models.Internal.Machine.CountryKey),
+                Title = item.ReadString(Machine.NameKey),
+                GenMSXID = item.ReadString(Machine.GenMSXIDKey),
+                System = item.ReadString(Machine.SystemKey),
+                Company = item.ReadString(Machine.CompanyKey),
+                Year = item.ReadString(Machine.YearKey),
+                Country = item.ReadString(Machine.CountryKey),
             };
 
-            var dumps = item.Read<Models.Internal.Dump[]>(Models.Internal.Machine.DumpKey);
+            var dumps = item.Read<Dump[]>(Machine.DumpKey);
             game.Dump = dumps?.Select(ConvertToOpenMSX)?.ToArray();
 
             return game;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Dump"/> to <cref="Models.OpenMSX.Dump"/>
+        /// Convert from <cref="Dump"/> to <cref="Models.OpenMSX.Dump"/>
         /// </summary>
-        private static Models.OpenMSX.Dump? ConvertToOpenMSX(Models.Internal.Dump? item)
+        private static Models.OpenMSX.Dump? ConvertToOpenMSX(Dump? item)
         {
             if (item == null)
                 return null;
             
             var dump = new Models.OpenMSX.Dump();
 
-            var original = item.Read<Models.Internal.Original>(Models.Internal.Dump.OriginalKey);
+            var original = item.Read<Original>(Dump.OriginalKey);
             dump.Original = ConvertToOpenMSX(original);
 
-            var rom = item.Read<Models.Internal.Rom>(Models.Internal.Dump.RomKey);
+            var rom = item.Read<Rom>(Dump.RomKey);
             dump.Rom = ConvertToOpenMSXRom(rom);
 
-            var megaRom = item.Read<Models.Internal.Rom>(Models.Internal.Dump.MegaRomKey);
+            var megaRom = item.Read<Rom>(Dump.MegaRomKey);
             dump.Rom = ConvertToOpenMSXMegaRom(megaRom);
 
-            var sccPlusCart = item.Read<Models.Internal.Rom>(Models.Internal.Dump.SCCPlusCartKey);
+            var sccPlusCart = item.Read<Rom>(Dump.SCCPlusCartKey);
             dump.Rom = ConvertToOpenMSXSCCPlusCart(sccPlusCart);
 
             return dump;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.MegaRom"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.MegaRom"/>
         /// </summary>
-        private static Models.OpenMSX.MegaRom? ConvertToOpenMSXMegaRom(Models.Internal.Rom? item)
+        private static Models.OpenMSX.MegaRom? ConvertToOpenMSXMegaRom(Rom? item)
         {
             if (item == null)
                 return null;
             
             var megaRom = new Models.OpenMSX.MegaRom
             {
-                Start = item.ReadString(Models.Internal.Rom.StartKey),
-                Type = item.ReadString(Models.Internal.Rom.TypeKey),
-                Hash = item.ReadString(Models.Internal.Rom.SHA1Key),
-                Remark = item.ReadString(Models.Internal.Rom.RemarkKey),
+                Start = item.ReadString(Rom.StartKey),
+                Type = item.ReadString(Rom.TypeKey),
+                Hash = item.ReadString(Rom.SHA1Key),
+                Remark = item.ReadString(Rom.RemarkKey),
             };
             return megaRom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Original"/> to <cref="Models.OpenMSX.Original"/>
+        /// Convert from <cref="Original"/> to <cref="Models.OpenMSX.Original"/>
         /// </summary>
-        private static Models.OpenMSX.Original? ConvertToOpenMSX(Models.Internal.Original? item)
+        private static Models.OpenMSX.Original? ConvertToOpenMSX(Original? item)
         {
             if (item == null)
                 return null;
             
             var original = new Models.OpenMSX.Original
             {
-                Value = item.ReadString(Models.Internal.Original.ValueKey),
-                Content = item.ReadString(Models.Internal.Original.ContentKey),
+                Value = item.ReadString(Original.ValueKey),
+                Content = item.ReadString(Original.ContentKey),
             };
             return original;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.Rom"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.Rom"/>
         /// </summary>
-        private static Models.OpenMSX.Rom? ConvertToOpenMSXRom(Models.Internal.Rom? item)
+        private static Models.OpenMSX.Rom? ConvertToOpenMSXRom(Rom? item)
         {
             if (item == null)
                 return null;
             
             var rom = new Models.OpenMSX.Rom
             {
-                Start = item.ReadString(Models.Internal.Rom.StartKey),
-                Type = item.ReadString(Models.Internal.Rom.TypeKey),
-                Hash = item.ReadString(Models.Internal.Rom.SHA1Key),
-                Remark = item.ReadString(Models.Internal.Rom.RemarkKey),
+                Start = item.ReadString(Rom.StartKey),
+                Type = item.ReadString(Rom.TypeKey),
+                Hash = item.ReadString(Rom.SHA1Key),
+                Remark = item.ReadString(Rom.RemarkKey),
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.SCCPlusCart"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.SCCPlusCart"/>
         /// </summary>
-        private static Models.OpenMSX.SCCPlusCart? ConvertToOpenMSXSCCPlusCart(Models.Internal.Rom? item)
+        private static Models.OpenMSX.SCCPlusCart? ConvertToOpenMSXSCCPlusCart(Rom? item)
         {
             if (item == null)
                 return null;
             
             var sccPlusCart = new Models.OpenMSX.SCCPlusCart
             {
-                Start = item.ReadString(Models.Internal.Rom.StartKey),
-                Type = item.ReadString(Models.Internal.Rom.TypeKey),
-                Hash = item.ReadString(Models.Internal.Rom.SHA1Key),
-                Remark = item.ReadString(Models.Internal.Rom.RemarkKey),
+                Start = item.ReadString(Rom.StartKey),
+                Type = item.ReadString(Rom.TypeKey),
+                Hash = item.ReadString(Rom.SHA1Key),
+                Remark = item.ReadString(Rom.RemarkKey),
             };
             return sccPlusCart;
         }
diff --git a/SabreTools.Serialization/Internal.RomCenter.cs b/SabreTools.Serialization/Internal.RomCenter.cs
index 829a5eef..abc0fd05 100644
--- a/SabreTools.Serialization/Internal.RomCenter.cs
+++ b/SabreTools.Serialization/Internal.RomCenter.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -10,71 +11,71 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.RomCenter.MetadataFile"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.RomCenter.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromRomCenter(Models.RomCenter.MetadataFile item)
+        public static Header ConvertHeaderFromRomCenter(Models.RomCenter.MetadataFile item)
         {
-            var header = new Models.Internal.Header();
+            var header = new Header();
 
             if (item.Credits != null)
             {
-                header[Models.Internal.Header.AuthorKey] = item.Credits.Author;
-                header[Models.Internal.Header.VersionKey] = item.Credits.Version;
-                header[Models.Internal.Header.EmailKey] = item.Credits.Email;
-                header[Models.Internal.Header.HomepageKey] = item.Credits.Homepage;
-                header[Models.Internal.Header.UrlKey] = item.Credits.Url;
-                header[Models.Internal.Header.DateKey] = item.Credits.Date;
-                header[Models.Internal.Header.CommentKey] = item.Credits.Comment;
+                header[Header.AuthorKey] = item.Credits.Author;
+                header[Header.VersionKey] = item.Credits.Version;
+                header[Header.EmailKey] = item.Credits.Email;
+                header[Header.HomepageKey] = item.Credits.Homepage;
+                header[Header.UrlKey] = item.Credits.Url;
+                header[Header.DateKey] = item.Credits.Date;
+                header[Header.CommentKey] = item.Credits.Comment;
             }
 
             if (item.Dat != null)
             {
-                header[Models.Internal.Header.DatVersionKey] = item.Dat.Version;
-                header[Models.Internal.Header.PluginKey] = item.Dat.Plugin;
+                header[Header.DatVersionKey] = item.Dat.Version;
+                header[Header.PluginKey] = item.Dat.Plugin;
 
                 if (item.Dat.Split == "yes" || item.Dat.Split == "1")
-                    header[Models.Internal.Header.ForceMergingKey] = "split";
+                    header[Header.ForceMergingKey] = "split";
                 else if (item.Dat.Merge == "yes" || item.Dat.Merge == "1")
-                    header[Models.Internal.Header.ForceMergingKey] = "merge";
+                    header[Header.ForceMergingKey] = "merge";
             }
 
             if (item.Emulator != null)
             {
-                header[Models.Internal.Header.RefNameKey] = item.Emulator.RefName;
-                header[Models.Internal.Header.EmulatorVersionKey] = item.Emulator.Version;
+                header[Header.RefNameKey] = item.Emulator.RefName;
+                header[Header.EmulatorVersionKey] = item.Emulator.Version;
             }
 
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.RomCenter.Game"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.RomCenter.Game"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromRomCenter(Models.RomCenter.Rom item)
+        public static Machine ConvertMachineFromRomCenter(Models.RomCenter.Rom item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.RomOfKey] = item.ParentName,
-                //[Models.Internal.Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable
-                [Models.Internal.Machine.NameKey] = item.GameName,
-                [Models.Internal.Machine.DescriptionKey] = item.GameDescription,
-                [Models.Internal.Machine.RomKey] = new Models.Internal.Rom[] { ConvertFromRomCenter(item) },
+                [Machine.RomOfKey] = item.ParentName,
+                //[Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable
+                [Machine.NameKey] = item.GameName,
+                [Machine.DescriptionKey] = item.GameDescription,
+                [Machine.RomKey] = new Rom[] { ConvertFromRomCenter(item) },
             };
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.RomCenter.Rom"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.RomCenter.Rom"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromRomCenter(Models.RomCenter.Rom item)
+        public static Rom ConvertFromRomCenter(Models.RomCenter.Rom item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.RomName,
-                [Models.Internal.Rom.CRCKey] = item.RomCRC,
-                [Models.Internal.Rom.SizeKey] = item.RomSize,
-                [Models.Internal.Rom.MergeKey] = item.MergeName,
+                [Rom.NameKey] = item.RomName,
+                [Rom.CRCKey] = item.RomCRC,
+                [Rom.SizeKey] = item.RomSize,
+                [Rom.MergeKey] = item.MergeName,
             };
             return rom;
         }
@@ -84,55 +85,55 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.RomCenter.MetadataFile"/>
+        /// Convert from <cref="Header"/> to <cref="Models.RomCenter.MetadataFile"/>
         /// </summary>
-        public static Models.RomCenter.MetadataFile? ConvertHeaderToRomCenter(Models.Internal.Header? item)
+        public static Models.RomCenter.MetadataFile? ConvertHeaderToRomCenter(Header? item)
         {
             if (item == null)
                 return null;
 
             var metadataFile = new Models.RomCenter.MetadataFile();
 
-            if (item.ContainsKey(Models.Internal.Header.AuthorKey)
-                || item.ContainsKey(Models.Internal.Header.VersionKey)
-                || item.ContainsKey(Models.Internal.Header.EmailKey)
-                || item.ContainsKey(Models.Internal.Header.HomepageKey)
-                || item.ContainsKey(Models.Internal.Header.UrlKey)
-                || item.ContainsKey(Models.Internal.Header.DateKey)
-                || item.ContainsKey(Models.Internal.Header.CommentKey))
+            if (item.ContainsKey(Header.AuthorKey)
+                || item.ContainsKey(Header.VersionKey)
+                || item.ContainsKey(Header.EmailKey)
+                || item.ContainsKey(Header.HomepageKey)
+                || item.ContainsKey(Header.UrlKey)
+                || item.ContainsKey(Header.DateKey)
+                || item.ContainsKey(Header.CommentKey))
             {
                 metadataFile.Credits = new Models.RomCenter.Credits
                 {
-                    Author = item.ReadString(Models.Internal.Header.AuthorKey),
-                    Version = item.ReadString(Models.Internal.Header.VersionKey),
-                    Email = item.ReadString(Models.Internal.Header.EmailKey),
-                    Homepage = item.ReadString(Models.Internal.Header.HomepageKey),
-                    Url = item.ReadString(Models.Internal.Header.UrlKey),
-                    Date = item.ReadString(Models.Internal.Header.DateKey),
-                    Comment = item.ReadString(Models.Internal.Header.CommentKey),
+                    Author = item.ReadString(Header.AuthorKey),
+                    Version = item.ReadString(Header.VersionKey),
+                    Email = item.ReadString(Header.EmailKey),
+                    Homepage = item.ReadString(Header.HomepageKey),
+                    Url = item.ReadString(Header.UrlKey),
+                    Date = item.ReadString(Header.DateKey),
+                    Comment = item.ReadString(Header.CommentKey),
                 };
             }
 
-            if (item.ContainsKey(Models.Internal.Header.DatVersionKey)
-                || item.ContainsKey(Models.Internal.Header.PluginKey)
-                || item.ContainsKey(Models.Internal.Header.ForceMergingKey))
+            if (item.ContainsKey(Header.DatVersionKey)
+                || item.ContainsKey(Header.PluginKey)
+                || item.ContainsKey(Header.ForceMergingKey))
             {
                 metadataFile.Dat = new Models.RomCenter.Dat
                 {
-                    Version = item.ReadString(Models.Internal.Header.DatVersionKey),
-                    Plugin = item.ReadString(Models.Internal.Header.PluginKey),
-                    Split = item.ReadString(Models.Internal.Header.ForceMergingKey) == "split" ? "yes" : "no",
-                    Merge = item.ReadString(Models.Internal.Header.ForceMergingKey) == "merge" ? "yes" : "no",
+                    Version = item.ReadString(Header.DatVersionKey),
+                    Plugin = item.ReadString(Header.PluginKey),
+                    Split = item.ReadString(Header.ForceMergingKey) == "split" ? "yes" : "no",
+                    Merge = item.ReadString(Header.ForceMergingKey) == "merge" ? "yes" : "no",
                 };
             }
 
-            if (item.ContainsKey(Models.Internal.Header.RefNameKey)
-                || item.ContainsKey(Models.Internal.Header.EmulatorVersionKey))
+            if (item.ContainsKey(Header.RefNameKey)
+                || item.ContainsKey(Header.EmulatorVersionKey))
             {
                 metadataFile.Emulator = new Models.RomCenter.Emulator
                 {
-                    RefName = item.ReadString(Models.Internal.Header.RefNameKey),
-                    Version = item.ReadString(Models.Internal.Header.EmulatorVersionKey),
+                    RefName = item.ReadString(Header.RefNameKey),
+                    Version = item.ReadString(Header.EmulatorVersionKey),
                 };
             }
 
@@ -140,36 +141,36 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.RomCenter.Rom"/>
+        /// Convert from <cref="Machine"/> to an array of <cref="Models.RomCenter.Rom"/>
         /// </summary>
-        public static Models.RomCenter.Rom?[]? ConvertMachineToRomCenter(Models.Internal.Machine? item)
+        public static Models.RomCenter.Rom?[]? ConvertMachineToRomCenter(Machine? item)
         {
             if (item == null)
                 return null;
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             return roms?.Select(rom => ConvertToRomCenter(rom, item))?.ToArray();
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.RomCenter.Rom"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.RomCenter.Rom"/>
         /// </summary>
-        private static Models.RomCenter.Rom? ConvertToRomCenter(Models.Internal.Rom? item, Models.Internal.Machine? parent)
+        private static Models.RomCenter.Rom? ConvertToRomCenter(Rom? item, Machine? parent)
         {
             if (item == null)
                 return null;
 
             var row = new Models.RomCenter.Rom
             {
-                RomName = item.ReadString(Models.Internal.Rom.NameKey),
-                RomCRC = item.ReadString(Models.Internal.Rom.CRCKey),
-                RomSize = item.ReadString(Models.Internal.Rom.SizeKey),
-                MergeName = item.ReadString(Models.Internal.Rom.MergeKey),
+                RomName = item.ReadString(Rom.NameKey),
+                RomCRC = item.ReadString(Rom.CRCKey),
+                RomSize = item.ReadString(Rom.SizeKey),
+                MergeName = item.ReadString(Rom.MergeKey),
 
-                ParentName = parent?.ReadString(Models.Internal.Machine.RomOfKey),
-                //ParentDescription = parent?.ReadString(Models.Internal.Machine.ParentDescriptionKey), // This is unmappable
-                GameName = parent?.ReadString(Models.Internal.Machine.NameKey),
-                GameDescription = parent?.ReadString(Models.Internal.Machine.DescriptionKey),
+                ParentName = parent?.ReadString(Machine.RomOfKey),
+                //ParentDescription = parent?.ReadString(Machine.ParentDescriptionKey), // This is unmappable
+                GameName = parent?.ReadString(Machine.NameKey),
+                GameDescription = parent?.ReadString(Machine.DescriptionKey),
             };
             return row;
         }
diff --git a/SabreTools.Serialization/Internal.SeparatedValue.cs b/SabreTools.Serialization/Internal.SeparatedValue.cs
index d238188c..0376647f 100644
--- a/SabreTools.Serialization/Internal.SeparatedValue.cs
+++ b/SabreTools.Serialization/Internal.SeparatedValue.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,50 +12,50 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.SeparatedValue.MetadataFile"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.SeparatedValue.MetadataFile"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromSeparatedValue(Models.SeparatedValue.MetadataFile item)
+        public static Header ConvertHeaderFromSeparatedValue(Models.SeparatedValue.MetadataFile item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.HeaderKey] = item.Header,
+                [Header.HeaderKey] = item.Header,
             };
 
             if (item.Row != null && item.Row.Any())
             {
                 var first = item.Row[0];
-                //header[Models.Internal.Header.FileNameKey] = first.FileName; // Not possible to map
-                header[Models.Internal.Header.NameKey] = first.FileName;
-                header[Models.Internal.Header.DescriptionKey] = first.Description;
+                //header[Header.FileNameKey] = first.FileName; // Not possible to map
+                header[Header.NameKey] = first.FileName;
+                header[Header.DescriptionKey] = first.Description;
             }
 
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromSeparatedValue(Models.SeparatedValue.Row item)
+        public static Machine ConvertMachineFromSeparatedValue(Models.SeparatedValue.Row item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.NameKey] = item.GameName,
-                [Models.Internal.Machine.DescriptionKey] = item.GameDescription,
+                [Machine.NameKey] = item.GameName,
+                [Machine.DescriptionKey] = item.GameDescription,
             };
 
             var datItem = ConvertFromSeparatedValue(item);
             switch (datItem)
             {
-                case Models.Internal.Disk disk:
-                    machine[Models.Internal.Machine.DiskKey] = new Models.Internal.Disk[] { disk };
+                case Disk disk:
+                    machine[Machine.DiskKey] = new Disk[] { disk };
                     break;
 
-                case Models.Internal.Media media:
-                    machine[Models.Internal.Machine.MediaKey] = new Models.Internal.Media[] { media };
+                case Media media:
+                    machine[Machine.MediaKey] = new Media[] { media };
                     break;
 
-                case Models.Internal.Rom rom:
-                    machine[Models.Internal.Machine.RomKey] = new Models.Internal.Rom[] { rom };
+                case Rom rom:
+                    machine[Machine.RomKey] = new Rom[] { rom };
                     break;
             }
 
@@ -62,39 +63,39 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Models.Internal.DatItem"/>
+        /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="DatItem"/>
         /// </summary>
-        public static Models.Internal.DatItem? ConvertFromSeparatedValue(Models.SeparatedValue.Row item)
+        public static DatItem? ConvertFromSeparatedValue(Models.SeparatedValue.Row item)
         {
             return item.Type switch
             {
-                "disk" => new Models.Internal.Disk
+                "disk" => new Disk
                 {
-                    [Models.Internal.Disk.NameKey] = item.DiskName,
-                    [Models.Internal.Disk.MD5Key] = item.MD5,
-                    [Models.Internal.Disk.SHA1Key] = item.SHA1,
-                    [Models.Internal.Disk.StatusKey] = item.Status,
+                    [Disk.NameKey] = item.DiskName,
+                    [Disk.MD5Key] = item.MD5,
+                    [Disk.SHA1Key] = item.SHA1,
+                    [Disk.StatusKey] = item.Status,
                 },
-                "media" => new Models.Internal.Media
+                "media" => new Media
                 {
-                    [Models.Internal.Media.NameKey] = item.DiskName,
-                    [Models.Internal.Media.MD5Key] = item.MD5,
-                    [Models.Internal.Media.SHA1Key] = item.SHA1,
-                    [Models.Internal.Media.SHA256Key] = item.SHA256,
-                    [Models.Internal.Media.SpamSumKey] = item.SpamSum,
+                    [Media.NameKey] = item.DiskName,
+                    [Media.MD5Key] = item.MD5,
+                    [Media.SHA1Key] = item.SHA1,
+                    [Media.SHA256Key] = item.SHA256,
+                    [Media.SpamSumKey] = item.SpamSum,
                 },
-                "rom" => new Models.Internal.Rom
+                "rom" => new Rom
                 {
-                    [Models.Internal.Rom.NameKey] = item.RomName,
-                    [Models.Internal.Rom.SizeKey] = item.Size,
-                    [Models.Internal.Rom.CRCKey] = item.CRC,
-                    [Models.Internal.Rom.MD5Key] = item.MD5,
-                    [Models.Internal.Rom.SHA1Key] = item.SHA1,
-                    [Models.Internal.Rom.SHA256Key] = item.SHA256,
-                    [Models.Internal.Rom.SHA384Key] = item.SHA384,
-                    [Models.Internal.Rom.SHA512Key] = item.SHA512,
-                    [Models.Internal.Rom.SpamSumKey] = item.SpamSum,
-                    [Models.Internal.Rom.StatusKey] = item.Status,
+                    [Rom.NameKey] = item.RomName,
+                    [Rom.SizeKey] = item.Size,
+                    [Rom.CRCKey] = item.CRC,
+                    [Rom.MD5Key] = item.MD5,
+                    [Rom.SHA1Key] = item.SHA1,
+                    [Rom.SHA256Key] = item.SHA256,
+                    [Rom.SHA384Key] = item.SHA384,
+                    [Rom.SHA512Key] = item.SHA512,
+                    [Rom.SpamSumKey] = item.SpamSum,
+                    [Rom.StatusKey] = item.Status,
                 },
                 _ => null,
             };
@@ -105,39 +106,39 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.SeparatedValue.MetadataFile"/>
+        /// Convert from <cref="Header"/> to <cref="Models.SeparatedValue.MetadataFile"/>
         /// </summary>
-        public static Models.SeparatedValue.MetadataFile? ConvertHeaderToSeparatedValue(Models.Internal.Header? item)
+        public static Models.SeparatedValue.MetadataFile? ConvertHeaderToSeparatedValue(Header? item)
         {
             if (item == null)
                 return null;
 
             var metadataFile = new Models.SeparatedValue.MetadataFile
             {
-                Header = item.ReadStringArray(Models.Internal.Header.HeaderKey),
+                Header = item.ReadStringArray(Header.HeaderKey),
             };
             return metadataFile;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.SeparatedValue.Row"/>
+        /// Convert from <cref="Machine"/> to an array of <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        public static Models.SeparatedValue.Row[]? ConvertMachineToSeparatedValue(Models.Internal.Machine? item)
+        public static Models.SeparatedValue.Row[]? ConvertMachineToSeparatedValue(Machine? item)
         {
             if (item == null)
                 return null;
 
             var rowItems = new List<Models.SeparatedValue.Row>();
 
-            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
+            var disks = item.Read<Disk[]>(Machine.DiskKey);
             if (disks != null)
                 rowItems.AddRange(disks.Select(disk => ConvertToSeparatedValue(disk, item)));
 
-            var media = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey);
+            var media = item.Read<Media[]>(Machine.MediaKey);
             if (media != null)
                 rowItems.AddRange(media.Select(medium => ConvertToSeparatedValue(medium, item)));
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
+            var roms = item.Read<Rom[]>(Machine.RomKey);
             if (roms != null)
                 rowItems.AddRange(roms.Select(rom => ConvertToSeparatedValue(rom, item)));
 
@@ -145,71 +146,71 @@ namespace SabreTools.Serialization
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.SeparatedValue.Row"/>
+        /// Convert from <cref="Disk"/> to <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Disk? item, Models.Internal.Machine? parent)
+        private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Disk? item, Machine? parent)
         {
             if (item == null)
                 return null;
 
             var row = new Models.SeparatedValue.Row
             {
-                GameName = parent?.ReadString(Models.Internal.Machine.NameKey),
-                Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey),
+                GameName = parent?.ReadString(Machine.NameKey),
+                Description = parent?.ReadString(Machine.DescriptionKey),
                 Type = "disk",
-                DiskName = item.ReadString(Models.Internal.Disk.NameKey),
-                MD5 = item.ReadString(Models.Internal.Disk.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key),
-                Status = item.ReadString(Models.Internal.Disk.StatusKey),
+                DiskName = item.ReadString(Disk.NameKey),
+                MD5 = item.ReadString(Disk.MD5Key),
+                SHA1 = item.ReadString(Disk.SHA1Key),
+                Status = item.ReadString(Disk.StatusKey),
             };
             return row;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Media"/> to <cref="Models.SeparatedValue.Row"/>
+        /// Convert from <cref="Media"/> to <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Media? item, Models.Internal.Machine? parent)
+        private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Media? item, Machine? parent)
         {
             if (item == null)
                 return null;
 
             var row = new Models.SeparatedValue.Row
             {
-                GameName = parent?.ReadString(Models.Internal.Machine.NameKey),
-                Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey),
+                GameName = parent?.ReadString(Machine.NameKey),
+                Description = parent?.ReadString(Machine.DescriptionKey),
                 Type = "media",
-                DiskName = item.ReadString(Models.Internal.Media.NameKey),
-                MD5 = item.ReadString(Models.Internal.Media.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Media.SHA1Key),
-                SHA256 = item.ReadString(Models.Internal.Media.SHA256Key),
-                SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey),
+                DiskName = item.ReadString(Media.NameKey),
+                MD5 = item.ReadString(Media.MD5Key),
+                SHA1 = item.ReadString(Media.SHA1Key),
+                SHA256 = item.ReadString(Media.SHA256Key),
+                SpamSum = item.ReadString(Media.SpamSumKey),
             };
             return row;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.SeparatedValue.Row"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Rom? item, Models.Internal.Machine? parent)
+        private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Rom? item, Machine? parent)
         {
             if (item == null)
                 return null;
 
             var row = new Models.SeparatedValue.Row
             {
-                GameName = parent?.ReadString(Models.Internal.Machine.NameKey),
-                Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey),
+                GameName = parent?.ReadString(Machine.NameKey),
+                Description = parent?.ReadString(Machine.DescriptionKey),
                 Type = "rom",
-                RomName = item.ReadString(Models.Internal.Rom.NameKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
-                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
-                MD5 = item.ReadString(Models.Internal.Rom.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
-                SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key),
-                SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key),
-                SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key),
-                SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey),
-                Status = item.ReadString(Models.Internal.Rom.StatusKey),
+                RomName = item.ReadString(Rom.NameKey),
+                Size = item.ReadString(Rom.SizeKey),
+                CRC = item.ReadString(Rom.CRCKey),
+                MD5 = item.ReadString(Rom.MD5Key),
+                SHA1 = item.ReadString(Rom.SHA1Key),
+                SHA256 = item.ReadString(Rom.SHA256Key),
+                SHA384 = item.ReadString(Rom.SHA384Key),
+                SHA512 = item.ReadString(Rom.SHA512Key),
+                SpamSum = item.ReadString(Rom.SpamSumKey),
+                Status = item.ReadString(Rom.StatusKey),
             };
             return row;
         }
diff --git a/SabreTools.Serialization/Internal.SoftwareList.cs b/SabreTools.Serialization/Internal.SoftwareList.cs
index 382e53df..a9aa2a2f 100644
--- a/SabreTools.Serialization/Internal.SoftwareList.cs
+++ b/SabreTools.Serialization/Internal.SoftwareList.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using SabreTools.Models.Internal;
 
 namespace SabreTools.Serialization
 {
@@ -11,281 +12,281 @@ namespace SabreTools.Serialization
         #region Serialize
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.SoftwareList"/> to <cref="Models.Internal.Header"/>
+        /// Convert from <cref="Models.SoftwareList.SoftwareList"/> to <cref="Header"/>
         /// </summary>
-        public static Models.Internal.Header ConvertHeaderFromSoftwareList(Models.SoftwareList.SoftwareList item)
+        public static Header ConvertHeaderFromSoftwareList(Models.SoftwareList.SoftwareList item)
         {
-            var header = new Models.Internal.Header
+            var header = new Header
             {
-                [Models.Internal.Header.NameKey] = item.Name,
-                [Models.Internal.Header.DescriptionKey] = item.Description,
-                [Models.Internal.Header.NotesKey] = item.Notes,
+                [Header.NameKey] = item.Name,
+                [Header.DescriptionKey] = item.Description,
+                [Header.NotesKey] = item.Notes,
             };
             return header;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.Software"/> to <cref="Models.Internal.Machine"/>
+        /// Convert from <cref="Models.SoftwareList.Software"/> to <cref="Machine"/>
         /// </summary>
-        public static Models.Internal.Machine ConvertMachineFromSoftwareList(Models.SoftwareList.Software item)
+        public static Machine ConvertMachineFromSoftwareList(Models.SoftwareList.Software item)
         {
-            var machine = new Models.Internal.Machine
+            var machine = new Machine
             {
-                [Models.Internal.Machine.NameKey] = item.Name,
-                [Models.Internal.Machine.CloneOfKey] = item.CloneOf,
-                [Models.Internal.Machine.SupportedKey] = item.Supported,
-                [Models.Internal.Machine.DescriptionKey] = item.Description,
-                [Models.Internal.Machine.YearKey] = item.Year,
-                [Models.Internal.Machine.PublisherKey] = item.Publisher,
-                [Models.Internal.Machine.NotesKey] = item.Notes,
+                [Machine.NameKey] = item.Name,
+                [Machine.CloneOfKey] = item.CloneOf,
+                [Machine.SupportedKey] = item.Supported,
+                [Machine.DescriptionKey] = item.Description,
+                [Machine.YearKey] = item.Year,
+                [Machine.PublisherKey] = item.Publisher,
+                [Machine.NotesKey] = item.Notes,
             };
 
             if (item.Info != null && item.Info.Any())
             {
-                var infos = new List<Models.Internal.Info>();
+                var infos = new List<Info>();
                 foreach (var info in item.Info)
                 {
                     infos.Add(ConvertFromSoftwareList(info));
                 }
-                machine[Models.Internal.Machine.InfoKey] = infos.ToArray();
+                machine[Machine.InfoKey] = infos.ToArray();
             }
 
             if (item.SharedFeat != null && item.SharedFeat.Any())
             {
-                var sharedFeats = new List<Models.Internal.SharedFeat>();
+                var sharedFeats = new List<SharedFeat>();
                 foreach (var sharedFeat in item.SharedFeat)
                 {
                     sharedFeats.Add(ConvertFromSoftwareList(sharedFeat));
                 }
-                machine[Models.Internal.Machine.SharedFeatKey] = sharedFeats.ToArray();
+                machine[Machine.SharedFeatKey] = sharedFeats.ToArray();
             }
 
             if (item.Part != null && item.Part.Any())
             {
-                var parts = new List<Models.Internal.Part>();
+                var parts = new List<Part>();
                 foreach (var part in item.Part)
                 {
                     parts.Add(ConvertFromSoftwareList(part));
                 }
-                machine[Models.Internal.Machine.PartKey] = parts.ToArray();
+                machine[Machine.PartKey] = parts.ToArray();
             }
 
             return machine;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.DataArea"/> to <cref="Models.Internal.DataArea"/>
+        /// Convert from <cref="Models.SoftwareList.DataArea"/> to <cref="DataArea"/>
         /// </summary>
-        public static Models.Internal.DataArea ConvertFromSoftwareList(Models.SoftwareList.DataArea item)
+        public static DataArea ConvertFromSoftwareList(Models.SoftwareList.DataArea item)
         {
-            var dataArea = new Models.Internal.DataArea
+            var dataArea = new DataArea
             {
-                [Models.Internal.DataArea.NameKey] = item.Name,
-                [Models.Internal.DataArea.SizeKey] = item.Size,
-                [Models.Internal.DataArea.WidthKey] = item.Width,
-                [Models.Internal.DataArea.EndiannessKey] = item.Endianness,
+                [DataArea.NameKey] = item.Name,
+                [DataArea.SizeKey] = item.Size,
+                [DataArea.WidthKey] = item.Width,
+                [DataArea.EndiannessKey] = item.Endianness,
             };
 
             if (item.Rom != null && item.Rom.Any())
             {
-                var roms = new List<Models.Internal.Rom>();
+                var roms = new List<Rom>();
                 foreach (var rom in item.Rom)
                 {
                     roms.Add(ConvertFromSoftwareList(rom));
                 }
-                dataArea[Models.Internal.DataArea.RomKey] = roms.ToArray();
+                dataArea[DataArea.RomKey] = roms.ToArray();
             }
 
             return dataArea;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.DipSwitch"/> to <cref="Models.Internal.DipSwitch"/>
+        /// Convert from <cref="Models.SoftwareList.DipSwitch"/> to <cref="DipSwitch"/>
         /// </summary>
-        public static Models.Internal.DipSwitch ConvertFromSoftwareList(Models.SoftwareList.DipSwitch item)
+        public static DipSwitch ConvertFromSoftwareList(Models.SoftwareList.DipSwitch item)
         {
-            var dipSwitch = new Models.Internal.DipSwitch
+            var dipSwitch = new DipSwitch
             {
-                [Models.Internal.DipSwitch.NameKey] = item.Name,
-                [Models.Internal.DipSwitch.TagKey] = item.Tag,
-                [Models.Internal.DipSwitch.MaskKey] = item.Mask,
+                [DipSwitch.NameKey] = item.Name,
+                [DipSwitch.TagKey] = item.Tag,
+                [DipSwitch.MaskKey] = item.Mask,
             };
 
             if (item.DipValue != null && item.DipValue.Any())
             {
-                var dipValues = new List<Models.Internal.DipValue>();
+                var dipValues = new List<DipValue>();
                 foreach (var dipValue in item.DipValue)
                 {
                     dipValues.Add(ConvertFromSoftwareList(dipValue));
                 }
-                dipSwitch[Models.Internal.DipSwitch.DipValueKey] = dipValues.ToArray();
+                dipSwitch[DipSwitch.DipValueKey] = dipValues.ToArray();
             }
 
             return dipSwitch;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.DipValue"/> to <cref="Models.Internal.DipValue"/>
+        /// Convert from <cref="Models.SoftwareList.DipValue"/> to <cref="DipValue"/>
         /// </summary>
-        public static Models.Internal.DipValue ConvertFromSoftwareList(Models.SoftwareList.DipValue item)
+        public static DipValue ConvertFromSoftwareList(Models.SoftwareList.DipValue item)
         {
-            var dipValue = new Models.Internal.DipValue
+            var dipValue = new DipValue
             {
-                [Models.Internal.DipValue.NameKey] = item.Name,
-                [Models.Internal.DipValue.ValueKey] = item.Value,
-                [Models.Internal.DipValue.DefaultKey] = item.Default,
+                [DipValue.NameKey] = item.Name,
+                [DipValue.ValueKey] = item.Value,
+                [DipValue.DefaultKey] = item.Default,
             };
             return dipValue;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.Disk"/> to <cref="Models.Internal.Disk"/>
+        /// Convert from <cref="Models.SoftwareList.Disk"/> to <cref="Disk"/>
         /// </summary>
-        public static Models.Internal.Disk ConvertFromSoftwareList(Models.SoftwareList.Disk item)
+        public static Disk ConvertFromSoftwareList(Models.SoftwareList.Disk item)
         {
-            var disk = new Models.Internal.Disk
+            var disk = new Disk
             {
-                [Models.Internal.Disk.NameKey] = item.Name,
-                [Models.Internal.Disk.MD5Key] = item.MD5,
-                [Models.Internal.Disk.SHA1Key] = item.SHA1,
-                [Models.Internal.Disk.StatusKey] = item.Status,
-                [Models.Internal.Disk.WritableKey] = item.Writeable,
+                [Disk.NameKey] = item.Name,
+                [Disk.MD5Key] = item.MD5,
+                [Disk.SHA1Key] = item.SHA1,
+                [Disk.StatusKey] = item.Status,
+                [Disk.WritableKey] = item.Writeable,
             };
             return disk;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.DiskArea"/> to <cref="Models.Internal.DiskArea"/>
+        /// Convert from <cref="Models.SoftwareList.DiskArea"/> to <cref="DiskArea"/>
         /// </summary>
-        public static Models.Internal.DiskArea ConvertFromSoftwareList(Models.SoftwareList.DiskArea item)
+        public static DiskArea ConvertFromSoftwareList(Models.SoftwareList.DiskArea item)
         {
-            var diskArea = new Models.Internal.DiskArea
+            var diskArea = new DiskArea
             {
-                [Models.Internal.DiskArea.NameKey] = item.Name,
+                [DiskArea.NameKey] = item.Name,
             };
 
             if (item.Disk != null && item.Disk.Any())
             {
-                var roms = new List<Models.Internal.Disk>();
+                var roms = new List<Disk>();
                 foreach (var disk in item.Disk)
                 {
                     roms.Add(ConvertFromSoftwareList(disk));
                 }
-                diskArea[Models.Internal.DiskArea.DiskKey] = roms.ToArray();
+                diskArea[DiskArea.DiskKey] = roms.ToArray();
             }
 
             return diskArea;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.Feature"/> to <cref="Models.Internal.Feature"/>
+        /// Convert from <cref="Models.SoftwareList.Feature"/> to <cref="Feature"/>
         /// </summary>
-        public static Models.Internal.Feature ConvertFromSoftwareList(Models.SoftwareList.Feature item)
+        public static Feature ConvertFromSoftwareList(Models.SoftwareList.Feature item)
         {
-            var feature = new Models.Internal.Feature
+            var feature = new Feature
             {
-                [Models.Internal.Feature.NameKey] = item.Name,
-                [Models.Internal.Feature.ValueKey] = item.Value,
+                [Feature.NameKey] = item.Name,
+                [Feature.ValueKey] = item.Value,
             };
             return feature;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.Info"/> to <cref="Models.Internal.Info"/>
+        /// Convert from <cref="Models.SoftwareList.Info"/> to <cref="Info"/>
         /// </summary>
-        public static Models.Internal.Info ConvertFromSoftwareList(Models.SoftwareList.Info item)
+        public static Info ConvertFromSoftwareList(Models.SoftwareList.Info item)
         {
-            var info = new Models.Internal.Info
+            var info = new Info
             {
-                [Models.Internal.Info.NameKey] = item.Name,
-                [Models.Internal.Info.ValueKey] = item.Value,
+                [Info.NameKey] = item.Name,
+                [Info.ValueKey] = item.Value,
             };
             return info;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.Part"/> to <cref="Models.Internal.Part"/>
+        /// Convert from <cref="Models.SoftwareList.Part"/> to <cref="Part"/>
         /// </summary>
-        public static Models.Internal.Part ConvertFromSoftwareList(Models.SoftwareList.Part item)
+        public static Part ConvertFromSoftwareList(Models.SoftwareList.Part item)
         {
-            var part = new Models.Internal.Part
+            var part = new Part
             {
-                [Models.Internal.Part.NameKey] = item.Name,
-                [Models.Internal.Part.InterfaceKey] = item.Interface,
+                [Part.NameKey] = item.Name,
+                [Part.InterfaceKey] = item.Interface,
             };
 
             if (item.Feature != null && item.Feature.Any())
             {
-                var features = new List<Models.Internal.Feature>();
+                var features = new List<Feature>();
                 foreach (var feature in item.Feature)
                 {
                     features.Add(ConvertFromSoftwareList(feature));
                 }
-                part[Models.Internal.Part.FeatureKey] = features.ToArray();
+                part[Part.FeatureKey] = features.ToArray();
             }
 
             if (item.DataArea != null && item.DataArea.Any())
             {
-                var dataAreas = new List<Models.Internal.DataArea>();
+                var dataAreas = new List<DataArea>();
                 foreach (var dataArea in item.DataArea)
                 {
                     dataAreas.Add(ConvertFromSoftwareList(dataArea));
                 }
-                part[Models.Internal.Part.DataAreaKey] = dataAreas.ToArray();
+                part[Part.DataAreaKey] = dataAreas.ToArray();
             }
 
             if (item.DiskArea != null && item.DiskArea.Any())
             {
-                var diskAreas = new List<Models.Internal.DiskArea>();
+                var diskAreas = new List<DiskArea>();
                 foreach (var diskArea in item.DiskArea)
                 {
                     diskAreas.Add(ConvertFromSoftwareList(diskArea));
                 }
-                part[Models.Internal.Part.DiskAreaKey] = diskAreas.ToArray();
+                part[Part.DiskAreaKey] = diskAreas.ToArray();
             }
 
             if (item.DipSwitch != null && item.DipSwitch.Any())
             {
-                var dipSwitches = new List<Models.Internal.DipSwitch>();
+                var dipSwitches = new List<DipSwitch>();
                 foreach (var rom in item.DipSwitch)
                 {
                     dipSwitches.Add(ConvertFromSoftwareList(rom));
                 }
-                part[Models.Internal.Part.DipSwitchKey] = dipSwitches.ToArray();
+                part[Part.DipSwitchKey] = dipSwitches.ToArray();
             }
 
             return part;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.Rom"/> to <cref="Models.Internal.Rom"/>
+        /// Convert from <cref="Models.SoftwareList.Rom"/> to <cref="Rom"/>
         /// </summary>
-        public static Models.Internal.Rom ConvertFromSoftwareList(Models.SoftwareList.Rom item)
+        public static Rom ConvertFromSoftwareList(Models.SoftwareList.Rom item)
         {
-            var rom = new Models.Internal.Rom
+            var rom = new Rom
             {
-                [Models.Internal.Rom.NameKey] = item.Name,
-                [Models.Internal.Rom.SizeKey] = item.Size,
-                [Models.Internal.Rom.LengthKey] = item.Length,
-                [Models.Internal.Rom.CRCKey] = item.CRC,
-                [Models.Internal.Rom.SHA1Key] = item.SHA1,
-                [Models.Internal.Rom.OffsetKey] = item.Offset,
-                [Models.Internal.Rom.ValueKey] = item.Value,
-                [Models.Internal.Rom.StatusKey] = item.Status,
-                [Models.Internal.Rom.LoadFlagKey] = item.LoadFlag,
+                [Rom.NameKey] = item.Name,
+                [Rom.SizeKey] = item.Size,
+                [Rom.LengthKey] = item.Length,
+                [Rom.CRCKey] = item.CRC,
+                [Rom.SHA1Key] = item.SHA1,
+                [Rom.OffsetKey] = item.Offset,
+                [Rom.ValueKey] = item.Value,
+                [Rom.StatusKey] = item.Status,
+                [Rom.LoadFlagKey] = item.LoadFlag,
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.SoftwareList.SharedFeat"/> to <cref="Models.Internal.SharedFeat"/>
+        /// Convert from <cref="Models.SoftwareList.SharedFeat"/> to <cref="SharedFeat"/>
         /// </summary>
-        public static Models.Internal.SharedFeat ConvertFromSoftwareList(Models.SoftwareList.SharedFeat item)
+        public static SharedFeat ConvertFromSoftwareList(Models.SoftwareList.SharedFeat item)
         {
-            var sharedFeat = new Models.Internal.SharedFeat
+            var sharedFeat = new SharedFeat
             {
-                [Models.Internal.SharedFeat.NameKey] = item.Name,
-                [Models.Internal.SharedFeat.ValueKey] = item.Value,
+                [SharedFeat.NameKey] = item.Name,
+                [SharedFeat.ValueKey] = item.Value,
             };
             return sharedFeat;
         }
@@ -295,247 +296,247 @@ namespace SabreTools.Serialization
         #region Deserialize
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Header"/> to <cref="Models.SoftwareList.SoftwareList"/>
+        /// Convert from <cref="Header"/> to <cref="Models.SoftwareList.SoftwareList"/>
         /// </summary>
-        public static Models.SoftwareList.SoftwareList? ConvertHeaderToSoftwareList(Models.Internal.Header? item)
+        public static Models.SoftwareList.SoftwareList? ConvertHeaderToSoftwareList(Header? item)
         {
             if (item == null)
                 return null;
 
             var softwareList = new Models.SoftwareList.SoftwareList
             {
-                Name = item.ReadString(Models.Internal.Header.NameKey),
-                Description = item.ReadString(Models.Internal.Header.DescriptionKey),
-                Notes = item.ReadString(Models.Internal.Header.NotesKey),
+                Name = item.ReadString(Header.NameKey),
+                Description = item.ReadString(Header.DescriptionKey),
+                Notes = item.ReadString(Header.NotesKey),
             };
             return softwareList;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.SoftwareList.Software"/>
+        /// Convert from <cref="Machine"/> to <cref="Models.SoftwareList.Software"/>
         /// </summary>
-        public static Models.SoftwareList.Software? ConvertMachineToSoftwareList(Models.Internal.Machine? item)
+        public static Models.SoftwareList.Software? ConvertMachineToSoftwareList(Machine? item)
         {
             if (item == null)
                 return null;
             
             var software = new Models.SoftwareList.Software
             {
-                Name = item.ReadString(Models.Internal.Machine.NameKey),
-                CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey),
-                Supported = item.ReadString(Models.Internal.Machine.SupportedKey),
-                Description = item.ReadString(Models.Internal.Machine.DescriptionKey),
-                Year = item.ReadString(Models.Internal.Machine.YearKey),
-                Publisher = item.ReadString(Models.Internal.Machine.PublisherKey),
-                Notes = item.ReadString(Models.Internal.Machine.NotesKey),
+                Name = item.ReadString(Machine.NameKey),
+                CloneOf = item.ReadString(Machine.CloneOfKey),
+                Supported = item.ReadString(Machine.SupportedKey),
+                Description = item.ReadString(Machine.DescriptionKey),
+                Year = item.ReadString(Machine.YearKey),
+                Publisher = item.ReadString(Machine.PublisherKey),
+                Notes = item.ReadString(Machine.NotesKey),
             };
 
-            var infos = item.Read<Models.Internal.Info[]>(Models.Internal.Machine.InfoKey);
+            var infos = item.Read<Info[]>(Machine.InfoKey);
             software.Info = infos?.Select(ConvertToSoftwareList)?.ToArray();
 
-            var sharedFeats = item.Read<Models.Internal.SharedFeat[]>(Models.Internal.Machine.SharedFeatKey);
+            var sharedFeats = item.Read<SharedFeat[]>(Machine.SharedFeatKey);
             software.SharedFeat = sharedFeats?.Select(ConvertToSoftwareList)?.ToArray();
 
-            var parts = item.Read<Models.Internal.Part[]>(Models.Internal.Machine.PartKey);
+            var parts = item.Read<Part[]>(Machine.PartKey);
             software.Part = parts?.Select(ConvertToSoftwareList)?.ToArray();
 
             return software;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DataArea"/> to <cref="Models.SoftwareList.DataArea"/>
+        /// Convert from <cref="DataArea"/> to <cref="Models.SoftwareList.DataArea"/>
         /// </summary>
-        private static Models.SoftwareList.DataArea? ConvertToSoftwareList(Models.Internal.DataArea? item)
+        private static Models.SoftwareList.DataArea? ConvertToSoftwareList(DataArea? item)
         {
             if (item == null)
                 return null;
             
             var dataArea = new Models.SoftwareList.DataArea
             {
-                Name = item.ReadString(Models.Internal.DataArea.NameKey),
-                Size = item.ReadString(Models.Internal.DataArea.SizeKey),
-                Width = item.ReadString(Models.Internal.DataArea.WidthKey),
-                Endianness = item.ReadString(Models.Internal.DataArea.EndiannessKey),
+                Name = item.ReadString(DataArea.NameKey),
+                Size = item.ReadString(DataArea.SizeKey),
+                Width = item.ReadString(DataArea.WidthKey),
+                Endianness = item.ReadString(DataArea.EndiannessKey),
             };
 
-            var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.DataArea.RomKey);
+            var roms = item.Read<Rom[]>(DataArea.RomKey);
             dataArea.Rom = roms?.Select(ConvertToSoftwareList)?.ToArray();
 
             return dataArea;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DipSwitch"/> to <cref="Models.SoftwareList.DipSwitch"/>
+        /// Convert from <cref="DipSwitch"/> to <cref="Models.SoftwareList.DipSwitch"/>
         /// </summary>
-        private static Models.SoftwareList.DipSwitch? ConvertToSoftwareList(Models.Internal.DipSwitch? item)
+        private static Models.SoftwareList.DipSwitch? ConvertToSoftwareList(DipSwitch? item)
         {
             if (item == null)
                 return null;
             
             var dipSwitch = new Models.SoftwareList.DipSwitch
             {
-                Name = item.ReadString(Models.Internal.DipSwitch.NameKey),
-                Tag = item.ReadString(Models.Internal.DipSwitch.TagKey),
-                Mask = item.ReadString(Models.Internal.DipSwitch.MaskKey),
+                Name = item.ReadString(DipSwitch.NameKey),
+                Tag = item.ReadString(DipSwitch.TagKey),
+                Mask = item.ReadString(DipSwitch.MaskKey),
             };
 
-            var dipValues = item.Read<Models.Internal.DipValue[]>(Models.Internal.DipSwitch.DipValueKey);
+            var dipValues = item.Read<DipValue[]>(DipSwitch.DipValueKey);
             dipSwitch.DipValue = dipValues?.Select(ConvertToSoftwareList)?.ToArray();
 
             return dipSwitch;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DipValue"/> to <cref="Models.SoftwareList.DipValue"/>
+        /// Convert from <cref="DipValue"/> to <cref="Models.SoftwareList.DipValue"/>
         /// </summary>
-        private static Models.SoftwareList.DipValue? ConvertToSoftwareList(Models.Internal.DipValue? item)
+        private static Models.SoftwareList.DipValue? ConvertToSoftwareList(DipValue? item)
         {
             if (item == null)
                 return null;
             
             var dipValue = new Models.SoftwareList.DipValue
             {
-                Name = item.ReadString(Models.Internal.DipValue.NameKey),
-                Value = item.ReadString(Models.Internal.DipValue.ValueKey),
-                Default = item.ReadString(Models.Internal.DipValue.DefaultKey),
+                Name = item.ReadString(DipValue.NameKey),
+                Value = item.ReadString(DipValue.ValueKey),
+                Default = item.ReadString(DipValue.DefaultKey),
             };
             return dipValue;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.SoftwareList.Disk"/>
+        /// Convert from <cref="Disk"/> to <cref="Models.SoftwareList.Disk"/>
         /// </summary>
-        private static Models.SoftwareList.Disk? ConvertToSoftwareList(Models.Internal.Disk? item)
+        private static Models.SoftwareList.Disk? ConvertToSoftwareList(Disk? item)
         {
             if (item == null)
                 return null;
             
             var disk = new Models.SoftwareList.Disk
             {
-                Name = item.ReadString(Models.Internal.Disk.NameKey),
-                MD5 = item.ReadString(Models.Internal.Disk.MD5Key),
-                SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key),
-                Status = item.ReadString(Models.Internal.Disk.StatusKey),
-                Writeable = item.ReadString(Models.Internal.Disk.WritableKey),
+                Name = item.ReadString(Disk.NameKey),
+                MD5 = item.ReadString(Disk.MD5Key),
+                SHA1 = item.ReadString(Disk.SHA1Key),
+                Status = item.ReadString(Disk.StatusKey),
+                Writeable = item.ReadString(Disk.WritableKey),
             };
             return disk;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.DiskArea"/> to <cref="Models.SoftwareList.DiskArea"/>
+        /// Convert from <cref="DiskArea"/> to <cref="Models.SoftwareList.DiskArea"/>
         /// </summary>
-        private static Models.SoftwareList.DiskArea? ConvertToSoftwareList(Models.Internal.DiskArea? item)
+        private static Models.SoftwareList.DiskArea? ConvertToSoftwareList(DiskArea? item)
         {
             if (item == null)
                 return null;
             
             var diskArea = new Models.SoftwareList.DiskArea
             {
-                Name = item.ReadString(Models.Internal.DiskArea.NameKey),
+                Name = item.ReadString(DiskArea.NameKey),
             };
 
-            var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.DiskArea.DiskKey);
+            var disks = item.Read<Disk[]>(DiskArea.DiskKey);
             diskArea.Disk = disks?.Select(ConvertToSoftwareList)?.ToArray();
 
             return diskArea;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Feature"/> to <cref="Models.SoftwareList.Feature"/>
+        /// Convert from <cref="Feature"/> to <cref="Models.SoftwareList.Feature"/>
         /// </summary>
-        private static Models.SoftwareList.Feature? ConvertToSoftwareList(Models.Internal.Feature? item)
+        private static Models.SoftwareList.Feature? ConvertToSoftwareList(Feature? item)
         {
             if (item == null)
                 return null;
             
             var feature = new Models.SoftwareList.Feature
             {
-                Name = item.ReadString(Models.Internal.Feature.NameKey),
-                Value = item.ReadString(Models.Internal.Feature.ValueKey),
+                Name = item.ReadString(Feature.NameKey),
+                Value = item.ReadString(Feature.ValueKey),
             };
             return feature;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Info"/> to <cref="Models.SoftwareList.Info"/>
+        /// Convert from <cref="Info"/> to <cref="Models.SoftwareList.Info"/>
         /// </summary>
-        private static Models.SoftwareList.Info? ConvertToSoftwareList(Models.Internal.Info? item)
+        private static Models.SoftwareList.Info? ConvertToSoftwareList(Info? item)
         {
             if (item == null)
                 return null;
             
             var info = new Models.SoftwareList.Info
             {
-                Name = item.ReadString(Models.Internal.Info.NameKey),
-                Value = item.ReadString(Models.Internal.Info.ValueKey),
+                Name = item.ReadString(Info.NameKey),
+                Value = item.ReadString(Info.ValueKey),
             };
             return info;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Part"/> to <cref="Models.SoftwareList.Part"/>
+        /// Convert from <cref="Part"/> to <cref="Models.SoftwareList.Part"/>
         /// </summary>
-        private static Models.SoftwareList.Part? ConvertToSoftwareList(Models.Internal.Part? item)
+        private static Models.SoftwareList.Part? ConvertToSoftwareList(Part? item)
         {
             if (item == null)
                 return null;
             
             var part = new Models.SoftwareList.Part
             {
-                Name = item.ReadString(Models.Internal.Part.NameKey),
-                Interface = item.ReadString(Models.Internal.Part.InterfaceKey),
+                Name = item.ReadString(Part.NameKey),
+                Interface = item.ReadString(Part.InterfaceKey),
             };
 
-            var features = item.Read<Models.Internal.Feature[]>(Models.Internal.Part.FeatureKey);
+            var features = item.Read<Feature[]>(Part.FeatureKey);
             part.Feature = features?.Select(ConvertToSoftwareList)?.ToArray();
 
-            var dataAreas = item.Read<Models.Internal.DataArea[]>(Models.Internal.Part.DataAreaKey);
+            var dataAreas = item.Read<DataArea[]>(Part.DataAreaKey);
             part.DataArea = dataAreas?.Select(ConvertToSoftwareList)?.ToArray();
 
-            var diskAreas = item.Read<Models.Internal.DiskArea[]>(Models.Internal.Part.DiskAreaKey);
+            var diskAreas = item.Read<DiskArea[]>(Part.DiskAreaKey);
             part.DiskArea = diskAreas?.Select(ConvertToSoftwareList)?.ToArray();
 
-            var dipSwitches = item.Read<Models.Internal.DipSwitch[]>(Models.Internal.Part.DipSwitchKey);
+            var dipSwitches = item.Read<DipSwitch[]>(Part.DipSwitchKey);
             part.DipSwitch = dipSwitches?.Select(ConvertToSoftwareList)?.ToArray();
 
             return part;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.SoftwareList.Rom"/>
+        /// Convert from <cref="Rom"/> to <cref="Models.SoftwareList.Rom"/>
         /// </summary>
-        private static Models.SoftwareList.Rom? ConvertToSoftwareList(Models.Internal.Rom? item)
+        private static Models.SoftwareList.Rom? ConvertToSoftwareList(Rom? item)
         {
             if (item == null)
                 return null;
             
             var rom = new Models.SoftwareList.Rom
             {
-                Name = item.ReadString(Models.Internal.Rom.NameKey),
-                Size = item.ReadString(Models.Internal.Rom.SizeKey),
-                Length = item.ReadString(Models.Internal.Rom.LengthKey),
-                CRC = item.ReadString(Models.Internal.Rom.CRCKey),
-                SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key),
-                Offset = item.ReadString(Models.Internal.Rom.OffsetKey),
-                Value = item.ReadString(Models.Internal.Rom.ValueKey),
-                Status = item.ReadString(Models.Internal.Rom.StatusKey),
-                LoadFlag = item.ReadString(Models.Internal.Rom.LoadFlagKey),
+                Name = item.ReadString(Rom.NameKey),
+                Size = item.ReadString(Rom.SizeKey),
+                Length = item.ReadString(Rom.LengthKey),
+                CRC = item.ReadString(Rom.CRCKey),
+                SHA1 = item.ReadString(Rom.SHA1Key),
+                Offset = item.ReadString(Rom.OffsetKey),
+                Value = item.ReadString(Rom.ValueKey),
+                Status = item.ReadString(Rom.StatusKey),
+                LoadFlag = item.ReadString(Rom.LoadFlagKey),
             };
             return rom;
         }
 
         /// <summary>
-        /// Convert from <cref="Models.Internal.SharedFeat"/> to <cref="Models.SoftwareList.SharedFeat"/>
+        /// Convert from <cref="SharedFeat"/> to <cref="Models.SoftwareList.SharedFeat"/>
         /// </summary>
-        private static Models.SoftwareList.SharedFeat? ConvertToSoftwareList(Models.Internal.SharedFeat? item)
+        private static Models.SoftwareList.SharedFeat? ConvertToSoftwareList(SharedFeat? item)
         {
             if (item == null)
                 return null;
             
             var sharedFeat = new Models.SoftwareList.SharedFeat
             {
-                Name = item.ReadString(Models.Internal.SharedFeat.NameKey),
-                Value = item.ReadString(Models.Internal.SharedFeat.ValueKey),
+                Name = item.ReadString(SharedFeat.NameKey),
+                Value = item.ReadString(SharedFeat.ValueKey),
             };
             return sharedFeat;
         }