diff --git a/RombaSharp/RombaSharp.Helpers.cs b/RombaSharp/RombaSharp.Helpers.cs
index 04bfaf62..fb560fad 100644
--- a/RombaSharp/RombaSharp.Helpers.cs
+++ b/RombaSharp/RombaSharp.Helpers.cs
@@ -7,7 +7,7 @@ using Mono.Data.Sqlite;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/RombaSharp/RombaSharp.Inits.cs b/RombaSharp/RombaSharp.Inits.cs
index a6ffb914..fb32503b 100644
--- a/RombaSharp/RombaSharp.Inits.cs
+++ b/RombaSharp/RombaSharp.Inits.cs
@@ -5,7 +5,7 @@ using Mono.Data.Sqlite;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs
index 427795f3..579a9697 100644
--- a/SabreTools.Library/DatFiles/AttractMode.cs
+++ b/SabreTools.Library/DatFiles/AttractMode.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.Library/DatFiles/ClrMamePro.cs
index 9191fe9b..bb8720aa 100644
--- a/SabreTools.Library/DatFiles/ClrMamePro.cs
+++ b/SabreTools.Library/DatFiles/ClrMamePro.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index 51a95b98..e6acdb80 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -8,7 +8,7 @@ using System.Web;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.FileTypes;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Skippers;
 using SabreTools.Library.Tools;
 
diff --git a/SabreTools.Library/DatFiles/DatStats.cs b/SabreTools.Library/DatFiles/DatStats.cs
index 90947809..72d045c0 100644
--- a/SabreTools.Library/DatFiles/DatStats.cs
+++ b/SabreTools.Library/DatFiles/DatStats.cs
@@ -1,7 +1,7 @@
 using System;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 
 namespace SabreTools.Library.DatFiles
 {
diff --git a/SabreTools.Library/DatFiles/DosCenter.cs b/SabreTools.Library/DatFiles/DosCenter.cs
index 74ac390d..32ad8221 100644
--- a/SabreTools.Library/DatFiles/DosCenter.cs
+++ b/SabreTools.Library/DatFiles/DosCenter.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/Filter.cs b/SabreTools.Library/DatFiles/Filter.cs
index a5d35b37..2fde23e1 100644
--- a/SabreTools.Library/DatFiles/Filter.cs
+++ b/SabreTools.Library/DatFiles/Filter.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 
 namespace SabreTools.Library.DatFiles
 {
diff --git a/SabreTools.Library/DatFiles/Hashfile.cs b/SabreTools.Library/DatFiles/Hashfile.cs
index 32676907..176bf2b4 100644
--- a/SabreTools.Library/DatFiles/Hashfile.cs
+++ b/SabreTools.Library/DatFiles/Hashfile.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/Listroms.cs b/SabreTools.Library/DatFiles/Listroms.cs
index a16a399d..cc06e855 100644
--- a/SabreTools.Library/DatFiles/Listroms.cs
+++ b/SabreTools.Library/DatFiles/Listroms.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs
index 32a7aa0a..e81cf7c3 100644
--- a/SabreTools.Library/DatFiles/Logiqx.cs
+++ b/SabreTools.Library/DatFiles/Logiqx.cs
@@ -7,7 +7,7 @@ using System.Web;
 using System.Xml;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/Missfile.cs b/SabreTools.Library/DatFiles/Missfile.cs
index 04ab8c6f..e8008aae 100644
--- a/SabreTools.Library/DatFiles/Missfile.cs
+++ b/SabreTools.Library/DatFiles/Missfile.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.Library/DatFiles/OfflineList.cs
index f8895c1d..e0597a32 100644
--- a/SabreTools.Library/DatFiles/OfflineList.cs
+++ b/SabreTools.Library/DatFiles/OfflineList.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Web;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/RomCenter.cs b/SabreTools.Library/DatFiles/RomCenter.cs
index 6c770c2d..1a2c94b4 100644
--- a/SabreTools.Library/DatFiles/RomCenter.cs
+++ b/SabreTools.Library/DatFiles/RomCenter.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Web;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/SabreDat.cs b/SabreTools.Library/DatFiles/SabreDat.cs
index 5f17f109..dd624fbd 100644
--- a/SabreTools.Library/DatFiles/SabreDat.cs
+++ b/SabreTools.Library/DatFiles/SabreDat.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Web;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs
index 6222ba83..9771a50c 100644
--- a/SabreTools.Library/DatFiles/SeparatedValue.cs
+++ b/SabreTools.Library/DatFiles/SeparatedValue.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs
index 7d852e64..e15b0903 100644
--- a/SabreTools.Library/DatFiles/SoftwareList.cs
+++ b/SabreTools.Library/DatFiles/SoftwareList.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Web;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/Items/Archive.cs b/SabreTools.Library/DatItems/Archive.cs
similarity index 97%
rename from SabreTools.Library/Items/Archive.cs
rename to SabreTools.Library/DatItems/Archive.cs
index 7e1d9689..acbf2ac1 100644
--- a/SabreTools.Library/Items/Archive.cs
+++ b/SabreTools.Library/DatItems/Archive.cs
@@ -1,6 +1,6 @@
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Represents generic archive files to be included in a set
diff --git a/SabreTools.Library/Items/BiosSet.cs b/SabreTools.Library/DatItems/BiosSet.cs
similarity index 98%
rename from SabreTools.Library/Items/BiosSet.cs
rename to SabreTools.Library/DatItems/BiosSet.cs
index 100e92aa..bc77bea2 100644
--- a/SabreTools.Library/Items/BiosSet.cs
+++ b/SabreTools.Library/DatItems/BiosSet.cs
@@ -1,6 +1,6 @@
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Represents which BIOS(es) is associated with a set
diff --git a/SabreTools.Library/Items/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs
similarity index 99%
rename from SabreTools.Library/Items/DatItem.cs
rename to SabreTools.Library/DatItems/DatItem.cs
index 0b1fce40..8aa6aef3 100644
--- a/SabreTools.Library/Items/DatItem.cs
+++ b/SabreTools.Library/DatItems/DatItem.cs
@@ -12,7 +12,7 @@ using Alphaleonis.Win32.Filesystem;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Base class for all items included in a set
diff --git a/SabreTools.Library/Items/Disk.cs b/SabreTools.Library/DatItems/Disk.cs
similarity index 99%
rename from SabreTools.Library/Items/Disk.cs
rename to SabreTools.Library/DatItems/Disk.cs
index d59be1dd..6e5c462e 100644
--- a/SabreTools.Library/Items/Disk.cs
+++ b/SabreTools.Library/DatItems/Disk.cs
@@ -3,7 +3,7 @@
 using SabreTools.Library.Data;
 using SabreTools.Library.Tools;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Represents Compressed Hunks of Data (CHD) formatted disks which use internal hashes
diff --git a/SabreTools.Library/Items/Machine.cs b/SabreTools.Library/DatItems/Machine.cs
similarity index 98%
rename from SabreTools.Library/Items/Machine.cs
rename to SabreTools.Library/DatItems/Machine.cs
index dad75d8e..0eb166e8 100644
--- a/SabreTools.Library/Items/Machine.cs
+++ b/SabreTools.Library/DatItems/Machine.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Represents the information specific to a set/game/machine
diff --git a/SabreTools.Library/Items/Release.cs b/SabreTools.Library/DatItems/Release.cs
similarity index 98%
rename from SabreTools.Library/Items/Release.cs
rename to SabreTools.Library/DatItems/Release.cs
index 93b081ae..fd44acd8 100644
--- a/SabreTools.Library/Items/Release.cs
+++ b/SabreTools.Library/DatItems/Release.cs
@@ -1,6 +1,6 @@
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Represents release information about a set
diff --git a/SabreTools.Library/Items/Rom.cs b/SabreTools.Library/DatItems/Rom.cs
similarity index 99%
rename from SabreTools.Library/Items/Rom.cs
rename to SabreTools.Library/DatItems/Rom.cs
index bd3f5aed..8e479191 100644
--- a/SabreTools.Library/Items/Rom.cs
+++ b/SabreTools.Library/DatItems/Rom.cs
@@ -3,7 +3,7 @@
 using SabreTools.Library.Data;
 using SabreTools.Library.Tools;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Represents a generic file within a set
diff --git a/SabreTools.Library/Items/Sample.cs b/SabreTools.Library/DatItems/Sample.cs
similarity index 97%
rename from SabreTools.Library/Items/Sample.cs
rename to SabreTools.Library/DatItems/Sample.cs
index cf5087f9..5e1749a3 100644
--- a/SabreTools.Library/Items/Sample.cs
+++ b/SabreTools.Library/DatItems/Sample.cs
@@ -1,6 +1,6 @@
 using SabreTools.Library.Data;
 
-namespace SabreTools.Library.Items
+namespace SabreTools.Library.DatItems
 {
 	/// <summary>
 	/// Represents a (usually WAV-formatted) sample to be included for use in the set
diff --git a/SabreTools.Library/FileTypes/BaseArchive.cs b/SabreTools.Library/FileTypes/BaseArchive.cs
index 4986dd84..f270a12d 100644
--- a/SabreTools.Library/FileTypes/BaseArchive.cs
+++ b/SabreTools.Library/FileTypes/BaseArchive.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools.Library/FileTypes/Folder.cs b/SabreTools.Library/FileTypes/Folder.cs
index 12c03f94..8fd462f2 100644
--- a/SabreTools.Library/FileTypes/Folder.cs
+++ b/SabreTools.Library/FileTypes/Folder.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/FileTypes/GZipArchive.cs b/SabreTools.Library/FileTypes/GZipArchive.cs
index 33c1d5f3..0f834e24 100644
--- a/SabreTools.Library/FileTypes/GZipArchive.cs
+++ b/SabreTools.Library/FileTypes/GZipArchive.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/FileTypes/LRZipArchive.cs b/SabreTools.Library/FileTypes/LRZipArchive.cs
index 782dbb8e..9cb46e0e 100644
--- a/SabreTools.Library/FileTypes/LRZipArchive.cs
+++ b/SabreTools.Library/FileTypes/LRZipArchive.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools.Library/FileTypes/LZ4Archive.cs b/SabreTools.Library/FileTypes/LZ4Archive.cs
index 83d6baf8..9ef909e3 100644
--- a/SabreTools.Library/FileTypes/LZ4Archive.cs
+++ b/SabreTools.Library/FileTypes/LZ4Archive.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools.Library/FileTypes/RarArchive.cs b/SabreTools.Library/FileTypes/RarArchive.cs
index 7af7b94c..c78e6143 100644
--- a/SabreTools.Library/FileTypes/RarArchive.cs
+++ b/SabreTools.Library/FileTypes/RarArchive.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/FileTypes/SevenZipArchive.cs b/SabreTools.Library/FileTypes/SevenZipArchive.cs
index e9a58d3e..bc52e35e 100644
--- a/SabreTools.Library/FileTypes/SevenZipArchive.cs
+++ b/SabreTools.Library/FileTypes/SevenZipArchive.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/FileTypes/TapeArchive.cs b/SabreTools.Library/FileTypes/TapeArchive.cs
index 154b9265..eac63fa6 100644
--- a/SabreTools.Library/FileTypes/TapeArchive.cs
+++ b/SabreTools.Library/FileTypes/TapeArchive.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/FileTypes/TorrentZipArchive.cs b/SabreTools.Library/FileTypes/TorrentZipArchive.cs
index b9da405a..55dbd891 100644
--- a/SabreTools.Library/FileTypes/TorrentZipArchive.cs
+++ b/SabreTools.Library/FileTypes/TorrentZipArchive.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/FileTypes/XZArchive.cs b/SabreTools.Library/FileTypes/XZArchive.cs
index f99c6afc..d6787682 100644
--- a/SabreTools.Library/FileTypes/XZArchive.cs
+++ b/SabreTools.Library/FileTypes/XZArchive.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
 
 #if MONO
diff --git a/SabreTools.Library/FileTypes/ZPAQArchive.cs b/SabreTools.Library/FileTypes/ZPAQArchive.cs
index 9a19ccc7..487b520a 100644
--- a/SabreTools.Library/FileTypes/ZPAQArchive.cs
+++ b/SabreTools.Library/FileTypes/ZPAQArchive.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools.Library/FileTypes/ZstdArchive.cs b/SabreTools.Library/FileTypes/ZstdArchive.cs
index bcafc860..ddae145a 100644
--- a/SabreTools.Library/FileTypes/ZstdArchive.cs
+++ b/SabreTools.Library/FileTypes/ZstdArchive.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using SabreTools.Library.Data;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools.Library/SabreTools.Library.csproj b/SabreTools.Library/SabreTools.Library.csproj
index a41412da..fd4819a9 100644
--- a/SabreTools.Library/SabreTools.Library.csproj
+++ b/SabreTools.Library/SabreTools.Library.csproj
@@ -162,15 +162,15 @@
     <Compile Include="FileTypes\TorrentZipArchive.cs" />
     <Compile Include="FileTypes\ZPAQArchive.cs" />
     <Compile Include="FileTypes\ZstdArchive.cs" />
-    <Compile Include="Items\Archive.cs" />
-    <Compile Include="Items\BiosSet.cs" />
+    <Compile Include="DatItems\Archive.cs" />
+    <Compile Include="DatItems\BiosSet.cs" />
     <Compile Include="DatFiles\DatFile.cs" />
-    <Compile Include="Items\DatItem.cs" />
-    <Compile Include="Items\Disk.cs" />
-    <Compile Include="Items\Machine.cs" />
-    <Compile Include="Items\Release.cs" />
-    <Compile Include="Items\Sample.cs" />
-    <Compile Include="Items\Rom.cs" />
+    <Compile Include="DatItems\DatItem.cs" />
+    <Compile Include="DatItems\Disk.cs" />
+    <Compile Include="DatItems\Machine.cs" />
+    <Compile Include="DatItems\Release.cs" />
+    <Compile Include="DatItems\Sample.cs" />
+    <Compile Include="DatItems\Rom.cs" />
     <Compile Include="External\SupportedFiles\ZipFileEntry.cs" />
     <Compile Include="External\SupportedFiles\ZipFile.cs" />
     <Compile Include="Help\Feature.cs" />
diff --git a/SabreTools.Library/Tools/FileTools.cs b/SabreTools.Library/Tools/FileTools.cs
index 729aeb2f..13f8e733 100644
--- a/SabreTools.Library/Tools/FileTools.cs
+++ b/SabreTools.Library/Tools/FileTools.cs
@@ -8,7 +8,7 @@ using System.Xml.Schema;
 using SabreTools.Library.Data;
 using SabreTools.Library.External;
 using SabreTools.Library.FileTypes;
-using SabreTools.Library.Items;
+using SabreTools.Library.DatItems;
 using SabreTools.Library.Skippers;
 
 #if MONO