diff --git a/RedumpTool/Features/BaseFeature.cs b/RedumpTool/Features/BaseFeature.cs
index 6f6a8d2..7f8dc3c 100644
--- a/RedumpTool/Features/BaseFeature.cs
+++ b/RedumpTool/Features/BaseFeature.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using SabreTools.CommandLine;
 using SabreTools.CommandLine.Inputs;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace RedumpTool.Features
 {
diff --git a/RedumpTool/Features/BuildUrlFeature.cs b/RedumpTool/Features/BuildUrlFeature.cs
index 9ce6d87..8bb7cd3 100644
--- a/RedumpTool/Features/BuildUrlFeature.cs
+++ b/RedumpTool/Features/BuildUrlFeature.cs
@@ -1,7 +1,7 @@
 using System;
 using SabreTools.CommandLine.Inputs;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace RedumpTool.Features
 {
diff --git a/RedumpTool/Features/PacksFeature.cs b/RedumpTool/Features/PacksFeature.cs
index ae8d70d..42c65f7 100644
--- a/RedumpTool/Features/PacksFeature.cs
+++ b/RedumpTool/Features/PacksFeature.cs
@@ -1,6 +1,6 @@
 using System;
 using SabreTools.CommandLine.Inputs;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace RedumpTool.Features
 {
diff --git a/RedumpTool/Features/QueryFeature.cs b/RedumpTool/Features/QueryFeature.cs
index 40b7025..3b83f7e 100644
--- a/RedumpTool/Features/QueryFeature.cs
+++ b/RedumpTool/Features/QueryFeature.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.CommandLine.Inputs;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace RedumpTool.Features
 {
diff --git a/RedumpTool/Features/SiteFeature.cs b/RedumpTool/Features/SiteFeature.cs
index 8230e85..d8ad3e4 100644
--- a/RedumpTool/Features/SiteFeature.cs
+++ b/RedumpTool/Features/SiteFeature.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.CommandLine.Inputs;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace RedumpTool.Features
 {
diff --git a/RedumpTool/Features/UserFeature.cs b/RedumpTool/Features/UserFeature.cs
index 4b64816..dce2ebf 100644
--- a/RedumpTool/Features/UserFeature.cs
+++ b/RedumpTool/Features/UserFeature.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.CommandLine.Inputs;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace RedumpTool.Features
 {
diff --git a/RedumpTool/Features/WIPFeature.cs b/RedumpTool/Features/WIPFeature.cs
index fd31b3b..aa36ae0 100644
--- a/RedumpTool/Features/WIPFeature.cs
+++ b/RedumpTool/Features/WIPFeature.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.CommandLine.Inputs;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace RedumpTool.Features
 {
diff --git a/SabreTools.RedumpLib.Test/Web/UrlBuilderTests.cs b/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
similarity index 98%
rename from SabreTools.RedumpLib.Test/Web/UrlBuilderTests.cs
rename to SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
index 34d9e9b..0d1c84c 100644
--- a/SabreTools.RedumpLib.Test/Web/UrlBuilderTests.cs
+++ b/SabreTools.RedumpLib.Test/RedumpOrg/UrlBuilderTests.cs
@@ -1,9 +1,9 @@
 using System;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 using Xunit;
 
-namespace SabreTools.RedumpLib.Test.Web
+namespace SabreTools.RedumpLib.Test.RedumpOrg
 {
     public class UrlBuilderTests
     {
diff --git a/SabreTools.RedumpLib/Builder.cs b/SabreTools.RedumpLib/Builder.cs
index 04bc525..29cd075 100644
--- a/SabreTools.RedumpLib/Builder.cs
+++ b/SabreTools.RedumpLib/Builder.cs
@@ -11,7 +11,7 @@ using System.Xml;
 using Newtonsoft.Json;
 using SabreTools.RedumpLib.Data;
 using SabreTools.RedumpLib.Data.Sections;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace SabreTools.RedumpLib
 {
diff --git a/SabreTools.RedumpLib/Web/Discs.cs b/SabreTools.RedumpLib/RedumpOrg/Discs.cs
similarity index 99%
rename from SabreTools.RedumpLib/Web/Discs.cs
rename to SabreTools.RedumpLib/RedumpOrg/Discs.cs
index 9cd0deb..ea75564 100644
--- a/SabreTools.RedumpLib/Web/Discs.cs
+++ b/SabreTools.RedumpLib/RedumpOrg/Discs.cs
@@ -2,8 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Web;
 
-namespace SabreTools.RedumpLib.Web
+namespace SabreTools.RedumpLib.RedumpOrg
 {
     /// <summary>
     /// Contains logic for dealing with disc pages
diff --git a/SabreTools.RedumpLib/Web/Packs.cs b/SabreTools.RedumpLib/RedumpOrg/Packs.cs
similarity index 98%
rename from SabreTools.RedumpLib/Web/Packs.cs
rename to SabreTools.RedumpLib/RedumpOrg/Packs.cs
index 0d9f5b9..8925388 100644
--- a/SabreTools.RedumpLib/Web/Packs.cs
+++ b/SabreTools.RedumpLib/RedumpOrg/Packs.cs
@@ -2,7 +2,7 @@ using System;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
 
-namespace SabreTools.RedumpLib.Web
+namespace SabreTools.RedumpLib.RedumpOrg
 {
     /// <summary>
     /// Contains logic for dealing with packs
diff --git a/SabreTools.RedumpLib/Web/RedumpClient.cs b/SabreTools.RedumpLib/RedumpOrg/RedumpClient.cs
similarity index 99%
rename from SabreTools.RedumpLib/Web/RedumpClient.cs
rename to SabreTools.RedumpLib/RedumpOrg/RedumpClient.cs
index 39553e7..2e743c3 100644
--- a/SabreTools.RedumpLib/Web/RedumpClient.cs
+++ b/SabreTools.RedumpLib/RedumpOrg/RedumpClient.cs
@@ -10,8 +10,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Web;
 
-namespace SabreTools.RedumpLib.Web
+namespace SabreTools.RedumpLib.RedumpOrg
 {
     public class RedumpClient
     {
diff --git a/SabreTools.RedumpLib/Web/UrlBuilder.cs b/SabreTools.RedumpLib/RedumpOrg/UrlBuilder.cs
similarity index 98%
rename from SabreTools.RedumpLib/Web/UrlBuilder.cs
rename to SabreTools.RedumpLib/RedumpOrg/UrlBuilder.cs
index c8c68a9..795ebf1 100644
--- a/SabreTools.RedumpLib/Web/UrlBuilder.cs
+++ b/SabreTools.RedumpLib/RedumpOrg/UrlBuilder.cs
@@ -4,7 +4,7 @@ using SabreTools.RedumpLib.Data;
 
 // TODO: Errors should validate number or number range (# or #-#)
 
-namespace SabreTools.RedumpLib.Web
+namespace SabreTools.RedumpLib.RedumpOrg
 {
     /// <summary>
     /// URL builder helper
@@ -128,7 +128,11 @@ namespace SabreTools.RedumpLib.Web
                     sb.Append($"{subpath.ShortName()}/");
                     break;
 
-                default: break;
+                // WIP and null are invalid for a disc page
+                case DiscSubpath.WIP:
+                case null:
+                default:
+                    break;
             }
 
             return sb.ToString();
diff --git a/SabreTools.RedumpLib/Web/WIP.cs b/SabreTools.RedumpLib/RedumpOrg/WIP.cs
similarity index 97%
rename from SabreTools.RedumpLib/Web/WIP.cs
rename to SabreTools.RedumpLib/RedumpOrg/WIP.cs
index 6406520..f684441 100644
--- a/SabreTools.RedumpLib/Web/WIP.cs
+++ b/SabreTools.RedumpLib/RedumpOrg/WIP.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using SabreTools.RedumpLib.Web;
 
-namespace SabreTools.RedumpLib.Web
+namespace SabreTools.RedumpLib.RedumpOrg
 {
     /// <summary>
     /// Contains logic for dealing with WIP queue
diff --git a/SabreTools.RedumpLib/Validator.cs b/SabreTools.RedumpLib/Validator.cs
index 0e9470f..d6012a3 100644
--- a/SabreTools.RedumpLib/Validator.cs
+++ b/SabreTools.RedumpLib/Validator.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using SabreTools.RedumpLib.RedumpOrg;
 
 namespace SabreTools.RedumpLib
 {