diff --git a/SabreTools.RedumpLib/Downloader.cs b/RedumpTool/Downloader.cs
similarity index 98%
rename from SabreTools.RedumpLib/Downloader.cs
rename to RedumpTool/Downloader.cs
index b4259b7..46b9adc 100644
--- a/SabreTools.RedumpLib/Downloader.cs
+++ b/RedumpTool/Downloader.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Web;
 
-namespace SabreTools.RedumpLib
+namespace RedumpTool
 {
     /// <summary>
     /// Contains logic for dealing with downloads
diff --git a/RedumpTool/Enumerations.cs b/RedumpTool/Enumerations.cs
new file mode 100644
index 0000000..4e5d9ce
--- /dev/null
+++ b/RedumpTool/Enumerations.cs
@@ -0,0 +1,15 @@
+namespace RedumpTool
+{
+    /// <summary>
+    /// Determines what download type to initate
+    /// </summary>
+    public enum Feature
+    {
+        NONE,
+        Site,
+        WIP,
+        Packs,
+        User,
+        Quicksearch,
+    }
+}
diff --git a/RedumpTool/Program.cs b/RedumpTool/Program.cs
index b8c2eeb..3b5da00 100644
--- a/RedumpTool/Program.cs
+++ b/RedumpTool/Program.cs
@@ -1,7 +1,5 @@
 using System;
 using System.IO;
-using SabreTools.RedumpLib;
-using SabreTools.RedumpLib.Data;
 
 namespace RedumpTool
 {
diff --git a/SabreTools.RedumpLib/Data/Enumerations.cs b/SabreTools.RedumpLib/Data/Enumerations.cs
index 5b33d6c..959c3de 100644
--- a/SabreTools.RedumpLib/Data/Enumerations.cs
+++ b/SabreTools.RedumpLib/Data/Enumerations.cs
@@ -122,19 +122,6 @@ namespace SabreTools.RedumpLib.Data
         TwoOrMoreGreen = 5,
     }
 
-    /// <summary>
-    /// Determines what download type to initate
-    /// </summary>
-    public enum Feature
-    {
-        NONE,
-        Site,
-        WIP,
-        Packs,
-        User,
-        Quicksearch,
-    }
-
     /// <summary>
     /// List of all disc langauges
     /// </summary>
diff --git a/SabreTools.RedumpLib/Web/Packs.cs b/SabreTools.RedumpLib/Web/Packs.cs
index 09e1b00..0c111be 100644
--- a/SabreTools.RedumpLib/Web/Packs.cs
+++ b/SabreTools.RedumpLib/Web/Packs.cs
@@ -7,7 +7,7 @@ namespace SabreTools.RedumpLib.Web
     /// <summary>
     /// Contains logic for dealing with packs
     /// </summary>
-    internal static class Packs
+    public static class Packs
     {
         /// <summary>
         /// Download premade packs
diff --git a/SabreTools.RedumpLib/Web/Search.cs b/SabreTools.RedumpLib/Web/Search.cs
index fbafbb8..f633f8f 100644
--- a/SabreTools.RedumpLib/Web/Search.cs
+++ b/SabreTools.RedumpLib/Web/Search.cs
@@ -8,7 +8,7 @@ namespace SabreTools.RedumpLib.Web
     /// <summary>
     /// Contains logic for dealing with searches
     /// </summary>
-    internal static class Search
+    public static class Search
     {
         /// <summary>
         /// List the disc IDs associated with a given quicksearch query