diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs
index 551ffd2..ecd3e25 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ChromiumDevTools.cs
@@ -11,7 +11,7 @@ using System.Net.Http;
 using System.Security;
 using System.Threading.Tasks;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     public class ChromiumDevTools : IApiEndpoint
     {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs
index f8cc1e0..291db13 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Completion.cs
@@ -16,7 +16,7 @@ using System.Net.Http;
 using System.Collections.Concurrent;
 using log4net;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     public class Completion : IApiEndpoint
     {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs
index 257617a..4035c49 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/DnsQuery.cs
@@ -13,7 +13,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     public class DnsQuery : IApiEndpoint
     {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs
index f5d6433..a75ef85 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/ImageColorPicker.cs
@@ -14,7 +14,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     /// <summary>
     /// POST image-color-picker/ with a unified JSON body:
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs
index c97cd1d..bc338dd 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/IpQuery.cs
@@ -25,7 +25,7 @@ using System.Threading.Tasks;
 using System.Web;
 using System.Xml.Linq;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     public class IpQuery : IApiEndpoint
     {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs
index 3c969d4..73409cc 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Settings.cs
@@ -15,7 +15,7 @@ using System.Resources;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     public class Settings : IApiEndpoint
     {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs
index 1888242..555ccdb 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/TwoFactorAuth.cs
@@ -14,7 +14,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     public class TwoFactorAuth : IApiEndpoint
     {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs
index a94cfa9..06c1259 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ApiEndpoints/Whois.cs
@@ -10,7 +10,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WelsonJS.Launcher.ResourceTools
+namespace WelsonJS.Launcher.ApiEndpoints
 {
     public class Whois : IApiEndpoint
     {
diff --git a/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs b/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
index ea66baa..2a83aef 100644
--- a/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
+++ b/WelsonJS.Augmented/WelsonJS.Launcher/ResourceServer.cs
@@ -67,14 +67,14 @@ namespace WelsonJS.Launcher
             }, TaskScheduler.Default);
 
             // Add API endpoints
-            _apis.Add(new ResourceTools.Completion(this, _httpClient, _logger));
-            _apis.Add(new ResourceTools.Settings(this, _httpClient, _logger));
-            _apis.Add(new ResourceTools.ChromiumDevTools(this, _httpClient, _logger));
-            _apis.Add(new ResourceTools.DnsQuery(this, _httpClient, _logger));
-            _apis.Add(new ResourceTools.IpQuery(this, _httpClient, _logger));
-            _apis.Add(new ResourceTools.TwoFactorAuth(this, _httpClient, _logger));
-            _apis.Add(new ResourceTools.Whois(this, _httpClient, _logger));
-            _apis.Add(new ResourceTools.ImageColorPicker(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.Completion(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.Settings(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.ChromiumDevTools(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.DnsQuery(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.IpQuery(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.TwoFactorAuth(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.Whois(this, _httpClient, _logger));
+            _apis.Add(new ApiEndpoints.ImageColorPicker(this, _httpClient, _logger));
 
             // Register the prefix
             _listener.Prefixes.Add(prefix);