diff --git a/RombaSharp/Partials/RombaSharp.Help.cs b/RombaSharp/Partials/RombaSharp.Help.cs
index ebe34418..e3c62d02 100644
--- a/RombaSharp/Partials/RombaSharp.Help.cs
+++ b/RombaSharp/Partials/RombaSharp.Help.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Help;
+using SabreTools.Library.Data;
+using SabreTools.Library.Help;
 
 namespace RombaSharp
 {
diff --git a/RombaSharp/Partials/RombaSharp.Helpers.cs b/RombaSharp/Partials/RombaSharp.Helpers.cs
index d37b0373..be09c22f 100644
--- a/RombaSharp/Partials/RombaSharp.Helpers.cs
+++ b/RombaSharp/Partials/RombaSharp.Helpers.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Xml;
 using Mono.Data.Sqlite;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Dats;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Dats;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
diff --git a/RombaSharp/Partials/RombaSharp.Inits.cs b/RombaSharp/Partials/RombaSharp.Inits.cs
index d49760f9..6e6e631f 100644
--- a/RombaSharp/Partials/RombaSharp.Inits.cs
+++ b/RombaSharp/Partials/RombaSharp.Inits.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using Mono.Data.Sqlite;
 
-using SabreTools.Helper;
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Dats;
-using SabreTools.Helper.Tools;
+using SabreTools.Library;
+using SabreTools.Library.Data;
+using SabreTools.Library.Dats;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
diff --git a/RombaSharp/RombaSharp.cs b/RombaSharp/RombaSharp.cs
index 913dc398..50a0854b 100644
--- a/RombaSharp/RombaSharp.cs
+++ b/RombaSharp/RombaSharp.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 
-using SabreTools.Helper;
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Help;
-using SabreTools.Helper.Tools;
+using SabreTools.Library;
+using SabreTools.Library.Data;
+using SabreTools.Library.Help;
+using SabreTools.Library.Tools;
 
 namespace RombaSharp
 {
diff --git a/SabreTools.Library/Data/Build.cs b/SabreTools.Library/Data/Build.cs
index fc5f663a..484bbaa7 100644
--- a/SabreTools.Library/Data/Build.cs
+++ b/SabreTools.Library/Data/Build.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Helper.Data
+namespace SabreTools.Library.Data
 {
 	public static class Build
 	{
diff --git a/SabreTools.Library/Data/Constants.cs b/SabreTools.Library/Data/Constants.cs
index bad9b588..f2b550ab 100644
--- a/SabreTools.Library/Data/Constants.cs
+++ b/SabreTools.Library/Data/Constants.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Reflection;
 
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Tools;
 
-namespace SabreTools.Helper.Data
+namespace SabreTools.Library.Data
 {
 	public static class Constants
 	{
diff --git a/SabreTools.Library/Data/Enums.cs b/SabreTools.Library/Data/Enums.cs
index 6bc1efc6..f037237d 100644
--- a/SabreTools.Library/Data/Enums.cs
+++ b/SabreTools.Library/Data/Enums.cs
@@ -1,4 +1,4 @@
-namespace SabreTools.Helper.Data
+namespace SabreTools.Library.Data
 {
 	#region Archival
 
diff --git a/SabreTools.Library/Data/Flags.cs b/SabreTools.Library/Data/Flags.cs
index 78eaaa8f..086fb639 100644
--- a/SabreTools.Library/Data/Flags.cs
+++ b/SabreTools.Library/Data/Flags.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SabreTools.Helper.Data
+namespace SabreTools.Library.Data
 {
 	#region Archival
 
diff --git a/SabreTools.Library/Data/Globals.cs b/SabreTools.Library/Data/Globals.cs
index b0a8f1b7..86176857 100644
--- a/SabreTools.Library/Data/Globals.cs
+++ b/SabreTools.Library/Data/Globals.cs
@@ -8,7 +8,7 @@ using System.IO;
 using Alphaleonis.Win32.Filesystem;
 #endif
 
-namespace SabreTools.Helper.Data
+namespace SabreTools.Library.Data
 {
 	public class Globals
 	{
diff --git a/SabreTools.Library/Dats/Archive.cs b/SabreTools.Library/Dats/Archive.cs
index 82961a05..81f43288 100644
--- a/SabreTools.Library/Dats/Archive.cs
+++ b/SabreTools.Library/Dats/Archive.cs
@@ -1,7 +1,7 @@
 using System;
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class Archive : DatItem, ICloneable
 	{
diff --git a/SabreTools.Library/Dats/BiosSet.cs b/SabreTools.Library/Dats/BiosSet.cs
index 26f5c6bd..508f39c6 100644
--- a/SabreTools.Library/Dats/BiosSet.cs
+++ b/SabreTools.Library/Dats/BiosSet.cs
@@ -1,7 +1,7 @@
 using System;
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class BiosSet : DatItem, ICloneable
 	{
diff --git a/SabreTools.Library/Dats/DatFile.cs b/SabreTools.Library/Dats/DatFile.cs
index 53644524..aec0ae68 100644
--- a/SabreTools.Library/Dats/DatFile.cs
+++ b/SabreTools.Library/Dats/DatFile.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/DatItem.cs b/SabreTools.Library/Dats/DatItem.cs
index 3efee502..422ad19c 100644
--- a/SabreTools.Library/Dats/DatItem.cs
+++ b/SabreTools.Library/Dats/DatItem.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -12,7 +12,7 @@ using Alphaleonis.Win32.Filesystem;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public abstract class DatItem : IEquatable<DatItem>, IComparable<DatItem>
 	{
diff --git a/SabreTools.Library/Dats/Disk.cs b/SabreTools.Library/Dats/Disk.cs
index e02eb317..f10afefa 100644
--- a/SabreTools.Library/Dats/Disk.cs
+++ b/SabreTools.Library/Dats/Disk.cs
@@ -1,8 +1,8 @@
 using System;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class Disk : DatItem, ICloneable
 	{
diff --git a/SabreTools.Library/Dats/Filter.cs b/SabreTools.Library/Dats/Filter.cs
index 38072d89..61322e45 100644
--- a/SabreTools.Library/Dats/Filter.cs
+++ b/SabreTools.Library/Dats/Filter.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class Filter
 	{
diff --git a/SabreTools.Library/Dats/Machine.cs b/SabreTools.Library/Dats/Machine.cs
index 6958470f..e54f3177 100644
--- a/SabreTools.Library/Dats/Machine.cs
+++ b/SabreTools.Library/Dats/Machine.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class Machine : ICloneable
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs
index 2095d69c..76ae1491 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -15,7 +15,7 @@ using SearchOption = System.IO.SearchOption;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.DFD.cs b/SabreTools.Library/Dats/Partials/DatFile.DFD.cs
index a6c26230..65f71b56 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.DFD.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.DFD.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -16,7 +16,7 @@ using SearchOption = System.IO.SearchOption;
 #endif
 using SharpCompress.Common;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs b/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
index 4283e942..117db338 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
 #if MONO
 using System.IO;
@@ -12,7 +12,7 @@ using System.IO;
 using Alphaleonis.Win32.Filesystem;
 #endif
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs b/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
index 791ced33..e0572c79 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
@@ -6,8 +6,8 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -17,7 +17,7 @@ using Alphaleonis.Win32.Filesystem;
 using StreamReader = System.IO.StreamReader;
 #endif
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
index 2791dcd8..90220b45 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Skippers;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Skippers;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -18,7 +18,7 @@ using SearchOption = System.IO.SearchOption;
 using Stream = System.IO.Stream;
 #endif
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Splitters.cs b/SabreTools.Library/Dats/Partials/DatFile.Splitters.cs
index 53ff9067..0431271d 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Splitters.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Splitters.cs
@@ -4,8 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -14,7 +14,7 @@ using Alphaleonis.Win32.Filesystem;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs b/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs
index d4d13bfd..34231ca7 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Statistics.cs
@@ -4,8 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -16,7 +16,7 @@ using SearchOption = System.IO.SearchOption;
 using StreamWriter = System.IO.StreamWriter;
 #endif
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	/*
 	 * TODO: Make output standard width (HTML, without making the entire thing a table)
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Writers.cs b/SabreTools.Library/Dats/Partials/DatFile.Writers.cs
index 8d8f5b21..3c8b5274 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Writers.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Writers.cs
@@ -5,8 +5,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -19,7 +19,7 @@ using StreamWriter = System.IO.StreamWriter;
 #endif
 using NaturalSort;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public partial class DatFile
 	{
diff --git a/SabreTools.Library/Dats/Release.cs b/SabreTools.Library/Dats/Release.cs
index c3c6d560..3d4b9c21 100644
--- a/SabreTools.Library/Dats/Release.cs
+++ b/SabreTools.Library/Dats/Release.cs
@@ -1,8 +1,8 @@
 using System;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class Release : DatItem, ICloneable
 	{
diff --git a/SabreTools.Library/Dats/Rom.cs b/SabreTools.Library/Dats/Rom.cs
index d495be16..8d1f9da1 100644
--- a/SabreTools.Library/Dats/Rom.cs
+++ b/SabreTools.Library/Dats/Rom.cs
@@ -1,8 +1,8 @@
 using System;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class Rom : Disk, ICloneable
 	{
diff --git a/SabreTools.Library/Dats/Sample.cs b/SabreTools.Library/Dats/Sample.cs
index c69f12ca..fd73fc6b 100644
--- a/SabreTools.Library/Dats/Sample.cs
+++ b/SabreTools.Library/Dats/Sample.cs
@@ -1,8 +1,8 @@
 using System;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Dats
+namespace SabreTools.Library.Dats
 {
 	public class Sample : DatItem, ICloneable
 	{
diff --git a/SabreTools.Library/External/CoreRarArchive.cs b/SabreTools.Library/External/CoreRarArchive.cs
index 287dc204..301f1321 100644
--- a/SabreTools.Library/External/CoreRarArchive.cs
+++ b/SabreTools.Library/External/CoreRarArchive.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
 /// <summary>
 /// http://www.rarlab.com/technote.htm#srvheaders
 /// </summary>
-namespace SabreTools.Helper.Tools
+namespace SabreTools.Library.Tools
 {
 	public class CoreRarArchive
 	{
diff --git a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs
index c735f393..d944686f 100644
--- a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs
+++ b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Tools;
 
 namespace NaturalSort
 {
diff --git a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs
index 705acf93..1f9e4d8b 100644
--- a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs
+++ b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Tools;
 
 namespace NaturalSort
 {
diff --git a/SabreTools.Library/External/SupportedFiles/ZipFile.cs b/SabreTools.Library/External/SupportedFiles/ZipFile.cs
index f0a4b7bf..3e36e3ea 100644
--- a/SabreTools.Library/External/SupportedFiles/ZipFile.cs
+++ b/SabreTools.Library/External/SupportedFiles/ZipFile.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Text;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools.Library/External/SupportedFiles/ZipFileEntry.cs b/SabreTools.Library/External/SupportedFiles/ZipFileEntry.cs
index 1d1863b4..73cf5656 100644
--- a/SabreTools.Library/External/SupportedFiles/ZipFileEntry.cs
+++ b/SabreTools.Library/External/SupportedFiles/ZipFileEntry.cs
@@ -4,8 +4,8 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 using Ionic.Zlib;
 using OCRC;
diff --git a/SabreTools.Library/External/Traverse.cs b/SabreTools.Library/External/Traverse.cs
index 90dcc394..4d9f8332 100644
--- a/SabreTools.Library/External/Traverse.cs
+++ b/SabreTools.Library/External/Traverse.cs
@@ -10,9 +10,9 @@ using Alphaleonis.Win32.Filesystem;
 using IOException = System.IO.IOException;
 using SearchOption = System.IO.SearchOption;
 #endif
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.External
+namespace SabreTools.Library.External
 {
 	public class Traverse
 	{
diff --git a/SabreTools.Library/External/xxHash/xxHash.cs b/SabreTools.Library/External/xxHash/xxHash.cs
index 80ca7e8f..1ce12122 100644
--- a/SabreTools.Library/External/xxHash/xxHash.cs
+++ b/SabreTools.Library/External/xxHash/xxHash.cs
@@ -34,7 +34,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SabreTools.Helper.External
+namespace SabreTools.Library.External
 {
 	class xxHash
 	{
diff --git a/SabreTools.Library/Help/Feature.cs b/SabreTools.Library/Help/Feature.cs
index 27b38550..0f488463 100644
--- a/SabreTools.Library/Help/Feature.cs
+++ b/SabreTools.Library/Help/Feature.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
-namespace SabreTools.Helper.Help
+namespace SabreTools.Library.Help
 {
 	public class Feature
 	{
diff --git a/SabreTools.Library/Help/Help.cs b/SabreTools.Library/Help/Help.cs
index add14f63..c523b356 100644
--- a/SabreTools.Library/Help/Help.cs
+++ b/SabreTools.Library/Help/Help.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SabreTools.Helper.Help
+namespace SabreTools.Library.Help
 {
 	public class Help
 	{
diff --git a/SabreTools.Library/Logger.cs b/SabreTools.Library/Logger.cs
index 2cb9b230..7a0142c0 100644
--- a/SabreTools.Library/Logger.cs
+++ b/SabreTools.Library/Logger.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Text;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -13,7 +13,7 @@ using FileStream = System.IO.FileStream;
 using StreamWriter = System.IO.StreamWriter;
 #endif
 
-namespace SabreTools.Helper
+namespace SabreTools.Library
 {
 	/// <summary>
 	/// Log either to file or to the console
diff --git a/SabreTools.Library/Skippers/Skipper.cs b/SabreTools.Library/Skippers/Skipper.cs
index 0dcd294d..c77edf07 100644
--- a/SabreTools.Library/Skippers/Skipper.cs
+++ b/SabreTools.Library/Skippers/Skipper.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Xml;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -17,7 +17,7 @@ using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
 #endif
 
-namespace SabreTools.Helper.Skippers
+namespace SabreTools.Library.Skippers
 {
 	public class Skipper
 	{
diff --git a/SabreTools.Library/Skippers/SkipperRule.cs b/SabreTools.Library/Skippers/SkipperRule.cs
index e5eabebd..6b1b3fbe 100644
--- a/SabreTools.Library/Skippers/SkipperRule.cs
+++ b/SabreTools.Library/Skippers/SkipperRule.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
@@ -15,7 +15,7 @@ using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
 #endif
 
-namespace SabreTools.Helper.Skippers
+namespace SabreTools.Library.Skippers
 {
 	public class SkipperRule
 	{
diff --git a/SabreTools.Library/Tools/ArchiveTools.cs b/SabreTools.Library/Tools/ArchiveTools.cs
index d35f659c..dfd12d56 100644
--- a/SabreTools.Library/Tools/ArchiveTools.cs
+++ b/SabreTools.Library/Tools/ArchiveTools.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Dats;
+using SabreTools.Library.Data;
+using SabreTools.Library.Dats;
 
 #if MONO
 using System.IO;
@@ -30,7 +30,7 @@ using SharpCompress.Common;
 using SharpCompress.Readers;
 using SharpCompress.Writers;
 
-namespace SabreTools.Helper.Tools
+namespace SabreTools.Library.Tools
 {
 	/*
 	 * TODO: Full archive support for: RAR, LRZip, ZPAQ?, Zstd?, LZ4?
@@ -161,7 +161,7 @@ namespace SabreTools.Helper.Tools
 					for (int i = 0; i < zf.EntriesCount && zr == ZipReturn.ZipGood; i++)
 					{
 						// Open the read stream
-						zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out SabreTools.Helper.Data.CompressionMethod cm, out uint lastMod);
+						zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out SabreTools.Library.Data.CompressionMethod cm, out uint lastMod);
 
 						// Create the rest of the path, if needed
 						if (!String.IsNullOrEmpty(Path.GetDirectoryName(zf.Entries[i].FileName)))
@@ -372,7 +372,7 @@ namespace SabreTools.Helper.Tools
 							{
 								// Open the read stream
 								realEntry = zf.Entries[i].FileName;
-								zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out SabreTools.Helper.Data.CompressionMethod cm, out uint lastMod);
+								zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out SabreTools.Library.Data.CompressionMethod cm, out uint lastMod);
 
 								// If the stream is smaller than the buffer, just run one loop through to avoid issues
 								if (streamsize < _bufferSize)
@@ -804,7 +804,7 @@ namespace SabreTools.Helper.Tools
 						for (int i = 0; i < zf.EntriesCount && zr == ZipReturn.ZipGood; i++)
 						{
 							// Open the read stream
-							zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out SabreTools.Helper.Data.CompressionMethod cm, out uint lastMod);
+							zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out SabreTools.Library.Data.CompressionMethod cm, out uint lastMod);
 
 							// If the entry ends with a directory separator, continue to the next item, if any
 							if (zf.Entries[i].FileName.EndsWith(Path.DirectorySeparatorChar.ToString())
@@ -2887,11 +2887,11 @@ namespace SabreTools.Helper.Tools
 					{
 						uint msDosDateTime = Style.ConvertDateTimeToMsDosTimeFormat(dt);
 						zipFile.OpenWriteStream(false, false, rom.Name.Replace('\\', '/'), istreamSize,
-							SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
+							SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
 					}
 					else
 					{
-						zipFile.OpenWriteStream(false, true, rom.Name.Replace('\\', '/'), istreamSize, SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream);
+						zipFile.OpenWriteStream(false, true, rom.Name.Replace('\\', '/'), istreamSize, SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream);
 					}
 
 					// Copy the input stream to the output
@@ -2958,11 +2958,11 @@ namespace SabreTools.Helper.Tools
 							{
 								uint msDosDateTime = Style.ConvertDateTimeToMsDosTimeFormat(dt);
 								zipFile.OpenWriteStream(false, false, rom.Name.Replace('\\', '/'), istreamSize,
-									SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
+									SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
 							}
 							else
 							{
-								zipFile.OpenWriteStream(false, true, rom.Name.Replace('\\', '/'), istreamSize, SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream);
+								zipFile.OpenWriteStream(false, true, rom.Name.Replace('\\', '/'), istreamSize, SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream);
 							}
 
 							// Copy the input stream to the output
@@ -2981,9 +2981,9 @@ namespace SabreTools.Helper.Tools
 						else
 						{
 							// Instantiate the streams
-							oldZipFile.OpenReadStream(index, false, out Stream zreadStream, out ulong istreamSize, out SabreTools.Helper.Data.CompressionMethod icompressionMethod, out uint lastMod);
+							oldZipFile.OpenReadStream(index, false, out Stream zreadStream, out ulong istreamSize, out SabreTools.Library.Data.CompressionMethod icompressionMethod, out uint lastMod);
 							zipFile.OpenWriteStream(false, lastMod == Constants.TorrentZipFileDateTime, oldZipFile.Filename(index),
-								istreamSize, SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream, lastMod: lastMod);
+								istreamSize, SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream, lastMod: lastMod);
 
 							// Copy the input stream to the output
 							byte[] ibuffer = new byte[_bufferSize];
@@ -3107,11 +3107,11 @@ namespace SabreTools.Helper.Tools
 						{
 							uint msDosDateTime = Style.ConvertDateTimeToMsDosTimeFormat(dt);
 							zipFile.OpenWriteStream(false, false, roms[index].Name.Replace('\\', '/'), istreamSize,
-								SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
+								SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
 						}
 						else
 						{
-							zipFile.OpenWriteStream(false, true, roms[index].Name.Replace('\\', '/'), istreamSize, SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream);
+							zipFile.OpenWriteStream(false, true, roms[index].Name.Replace('\\', '/'), istreamSize, SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream);
 						}
 
 						// Copy the input stream to the output
@@ -3184,11 +3184,11 @@ namespace SabreTools.Helper.Tools
 							{
 								uint msDosDateTime = Style.ConvertDateTimeToMsDosTimeFormat(dt);
 								zipFile.OpenWriteStream(false, false, roms[-index - 1].Name.Replace('\\', '/'), istreamSize,
-									SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
+									SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream, lastMod: msDosDateTime);
 							}
 							else
 							{
-								zipFile.OpenWriteStream(false, true, roms[-index - 1].Name.Replace('\\', '/'), istreamSize, SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream);
+								zipFile.OpenWriteStream(false, true, roms[-index - 1].Name.Replace('\\', '/'), istreamSize, SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream);
 							}
 
 							// Copy the input stream to the output
@@ -3207,9 +3207,9 @@ namespace SabreTools.Helper.Tools
 						else
 						{
 							// Instantiate the streams
-							oldZipFile.OpenReadStream(index, false, out Stream zreadStream, out ulong istreamSize, out SabreTools.Helper.Data.CompressionMethod icompressionMethod, out uint lastMod);
+							oldZipFile.OpenReadStream(index, false, out Stream zreadStream, out ulong istreamSize, out SabreTools.Library.Data.CompressionMethod icompressionMethod, out uint lastMod);
 							zipFile.OpenWriteStream(false, lastMod == Constants.TorrentZipFileDateTime, oldZipFile.Filename(index),
-								istreamSize, SabreTools.Helper.Data.CompressionMethod.Deflated, out writeStream, lastMod: lastMod);
+								istreamSize, SabreTools.Library.Data.CompressionMethod.Deflated, out writeStream, lastMod: lastMod);
 
 							// Copy the input stream to the output
 							byte[] ibuffer = new byte[_bufferSize];
diff --git a/SabreTools.Library/Tools/DatabaseTools.cs b/SabreTools.Library/Tools/DatabaseTools.cs
index 75b8b5bc..f75cc327 100644
--- a/SabreTools.Library/Tools/DatabaseTools.cs
+++ b/SabreTools.Library/Tools/DatabaseTools.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-using SabreTools.Helper.Data;
+using SabreTools.Library.Data;
 
 #if MONO
 using System.IO;
@@ -10,7 +10,7 @@ using System.IO;
 using Alphaleonis.Win32.Filesystem;
 #endif
 
-namespace SabreTools.Helper.Tools
+namespace SabreTools.Library.Tools
 {
 	/// <summary>
 	/// All general database operations
diff --git a/SabreTools.Library/Tools/FileTools.cs b/SabreTools.Library/Tools/FileTools.cs
index 8f927240..cc396506 100644
--- a/SabreTools.Library/Tools/FileTools.cs
+++ b/SabreTools.Library/Tools/FileTools.cs
@@ -5,10 +5,10 @@ using System.Security.Cryptography;
 using System.Xml;
 using System.Xml.Schema;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Dats;
-using SabreTools.Helper.External;
-using SabreTools.Helper.Skippers;
+using SabreTools.Library.Data;
+using SabreTools.Library.Dats;
+using SabreTools.Library.External;
+using SabreTools.Library.Skippers;
 
 #if MONO
 using System.IO;
@@ -32,7 +32,7 @@ using StreamReader = System.IO.StreamReader;
 using NaturalSort;
 using OCRC;
 
-namespace SabreTools.Helper.Tools
+namespace SabreTools.Library.Tools
 {
 	public static class FileTools
 	{
diff --git a/SabreTools.Library/Tools/Style.cs b/SabreTools.Library/Tools/Style.cs
index bbb833c2..e61850a4 100644
--- a/SabreTools.Library/Tools/Style.cs
+++ b/SabreTools.Library/Tools/Style.cs
@@ -6,8 +6,8 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Dats;
+using SabreTools.Library.Data;
+using SabreTools.Library.Dats;
 
 #if MONO
 using System.IO;
@@ -17,7 +17,7 @@ using Alphaleonis.Win32.Filesystem;
 using FileStream = System.IO.FileStream;
 #endif
 
-namespace SabreTools.Helper.Tools
+namespace SabreTools.Library.Tools
 {
 	/// <summary>
 	/// Include character normalization and replacement mappings
diff --git a/SabreTools/Partials/SabreTools.Help.cs b/SabreTools/Partials/SabreTools.Help.cs
index c2707988..aeb89fc0 100644
--- a/SabreTools/Partials/SabreTools.Help.cs
+++ b/SabreTools/Partials/SabreTools.Help.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Help;
+using SabreTools.Library.Data;
+using SabreTools.Library.Help;
 
 namespace SabreTools
 {
diff --git a/SabreTools/Partials/SabreTools.Inits.cs b/SabreTools/Partials/SabreTools.Inits.cs
index bf380e0f..b8a61047 100644
--- a/SabreTools/Partials/SabreTools.Inits.cs
+++ b/SabreTools/Partials/SabreTools.Inits.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Dats;
-using SabreTools.Helper.Tools;
+using SabreTools.Library.Data;
+using SabreTools.Library.Dats;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index be466791..b53e5a15 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using SabreTools.Helper;
-using SabreTools.Helper.Data;
-using SabreTools.Helper.Dats;
-using SabreTools.Helper.Help;
-using SabreTools.Helper.Tools;
+using SabreTools.Library;
+using SabreTools.Library.Data;
+using SabreTools.Library.Dats;
+using SabreTools.Library.Help;
+using SabreTools.Library.Tools;
 
 #if MONO
 using System.IO;