diff --git a/src/CommonLib/LdapUtils.cs b/src/CommonLib/LdapUtils.cs
index 3fc548a4..457a8aa9 100644
--- a/src/CommonLib/LdapUtils.cs
+++ b/src/CommonLib/LdapUtils.cs
@@ -982,6 +982,7 @@ await GetDomainSidFromDomainName(forestName) is (true, var forestDomainSid)) {
 
             foreach (var f in grouped) {
                 if (!forestSidToName.TryGetValue(f.Key, out var forestName)) {
+                    _log.LogWarning("Could not get a mapped value for well known principal {Key}", f.Key);
                     continue;
                 }
 
diff --git a/src/CommonLib/Ntlm/HttpNtlmAuthenticationService.cs b/src/CommonLib/Ntlm/HttpNtlmAuthenticationService.cs
index f7719367..734b53e3 100644
--- a/src/CommonLib/Ntlm/HttpNtlmAuthenticationService.cs
+++ b/src/CommonLib/Ntlm/HttpNtlmAuthenticationService.cs
@@ -35,10 +35,10 @@ public async Task EnsureRequiresAuth(Uri url, bool? useBadChannelBindings) {
 
         foreach (var authScheme in supportedAuthSchemes) {
             if (useBadChannelBindings == null) {
-                await AuthWithBadChannelBindings(url, authScheme);
+                await AuthWithBadChannelBindingsAsync(url, authScheme);
             } else {
                 if ((bool)useBadChannelBindings) {
-                    await AuthWithBadChannelBindings(url, authScheme);
+                    await AuthWithBadChannelBindingsAsync(url, authScheme);
                 } else {
                     await AuthWithChannelBindingAsync(url, authScheme);
                 }
@@ -88,7 +88,7 @@ private string[] ExtractAuthSchemes(HttpResponseMessage response) {
         return schemes;
     }
 
-    private async Task AuthWithBadChannelBindings(Uri url, string authScheme) {
+    private async Task AuthWithBadChannelBindingsAsync(Uri url, string authScheme) {
         var httpClient = _httpClientFactory.CreateUnauthenticatedClient();
         var transport = new HttpTransport(httpClient, url, authScheme, _logger);
         var ntlmAuthHandler = new NtlmAuthenticationHandler($"HTTP/{url.Host}");
diff --git a/src/CommonLib/OutputTypes/APIResult/APIResult.cs b/src/CommonLib/OutputTypes/APIResult.cs
similarity index 92%
rename from src/CommonLib/OutputTypes/APIResult/APIResult.cs
rename to src/CommonLib/OutputTypes/APIResult.cs
index 48ae0502..9de32f24 100644
--- a/src/CommonLib/OutputTypes/APIResult/APIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResult.cs
@@ -1,4 +1,4 @@
-namespace SharpHoundCommonLib.OutputTypes.APIResult {
+namespace SharpHoundCommonLib.OutputTypes {
     public class APIResult {
         public bool Collected { get; set; }
         public string FailureReason { get; set; }
diff --git a/src/CommonLib/OutputTypes/APIResult/AceRegistryAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/AceRegistryAPIResult.cs
similarity index 69%
rename from src/CommonLib/OutputTypes/APIResult/AceRegistryAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/AceRegistryAPIResult.cs
index b0fa5e97..f98bf432 100644
--- a/src/CommonLib/OutputTypes/APIResult/AceRegistryAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/AceRegistryAPIResult.cs
@@ -2,7 +2,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class AceRegistryAPIResult : APIResult.APIResult
+    public class AceRegistryAPIResult : APIResult
     {
         public ACE[] Data { get; set; } = Array.Empty<ACE>();
     }
diff --git a/src/CommonLib/OutputTypes/APIResult/BoolRegistryAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/BoolRegistryAPIResult.cs
similarity index 61%
rename from src/CommonLib/OutputTypes/APIResult/BoolRegistryAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/BoolRegistryAPIResult.cs
index f2e3f92d..46d1a4d8 100644
--- a/src/CommonLib/OutputTypes/APIResult/BoolRegistryAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/BoolRegistryAPIResult.cs
@@ -1,6 +1,6 @@
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class BoolRegistryAPIResult : APIResult.APIResult
+    public class BoolRegistryAPIResult : APIResult
     {
         public bool Value { get; set; }
     }
diff --git a/src/CommonLib/OutputTypes/APIResult/CAEnrollmentAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/CAEnrollmentAPIResult.cs
similarity index 83%
rename from src/CommonLib/OutputTypes/APIResult/CAEnrollmentAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/CAEnrollmentAPIResult.cs
index 32ccb29c..a00573e9 100644
--- a/src/CommonLib/OutputTypes/APIResult/CAEnrollmentAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/CAEnrollmentAPIResult.cs
@@ -1,6 +1,6 @@
 namespace SharpHoundCommonLib.OutputTypes;
 
-public class CAEnrollmentAPIResult : APIResult.APIResult{
+public class CAEnrollmentAPIResult : APIResult{
     public CAEnrollmentEndpoint Result { get; set; }
     
     public static CAEnrollmentAPIResult Fail(string error) {
diff --git a/src/CommonLib/OutputTypes/APIResult/EnrollmentAgentRegistryAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/EnrollmentAgentRegistryAPIResult.cs
similarity index 75%
rename from src/CommonLib/OutputTypes/APIResult/EnrollmentAgentRegistryAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/EnrollmentAgentRegistryAPIResult.cs
index 98e6135b..462c862c 100644
--- a/src/CommonLib/OutputTypes/APIResult/EnrollmentAgentRegistryAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/EnrollmentAgentRegistryAPIResult.cs
@@ -3,7 +3,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class EnrollmentAgentRegistryAPIResult : APIResult.APIResult
+    public class EnrollmentAgentRegistryAPIResult : APIResult
     {
         public EnrollmentAgentRestriction[] Restrictions { get; set; } = Array.Empty<EnrollmentAgentRestriction>();
     }
diff --git a/src/CommonLib/OutputTypes/APIResult/IntRegistryAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/IntRegistryAPIResult.cs
similarity index 61%
rename from src/CommonLib/OutputTypes/APIResult/IntRegistryAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/IntRegistryAPIResult.cs
index e72af475..1dca2b3d 100644
--- a/src/CommonLib/OutputTypes/APIResult/IntRegistryAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/IntRegistryAPIResult.cs
@@ -1,6 +1,6 @@
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class IntRegistryAPIResult : APIResult.APIResult
+    public class IntRegistryAPIResult : APIResult
     {
         public int Value { get; set; }
     }
diff --git a/src/CommonLib/OutputTypes/APIResult/LSAPrivilegeAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/LSAPrivilegeAPIResult.cs
similarity index 72%
rename from src/CommonLib/OutputTypes/APIResult/LSAPrivilegeAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/LSAPrivilegeAPIResult.cs
index 80cb4cd3..cee740b3 100644
--- a/src/CommonLib/OutputTypes/APIResult/LSAPrivilegeAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/LSAPrivilegeAPIResult.cs
@@ -2,7 +2,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class LSAPrivilegeAPIResult : APIResult.APIResult
+    public class LSAPrivilegeAPIResult : APIResult
     {
         public TypedPrincipal[] Results { get; set; } = Array.Empty<TypedPrincipal>();
     }
diff --git a/src/CommonLib/OutputTypes/APIResult/LocalGroupAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/LocalGroupAPIResult.cs
similarity index 93%
rename from src/CommonLib/OutputTypes/APIResult/LocalGroupAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/LocalGroupAPIResult.cs
index 42ede646..e80dea1a 100644
--- a/src/CommonLib/OutputTypes/APIResult/LocalGroupAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/LocalGroupAPIResult.cs
@@ -3,7 +3,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class LocalGroupAPIResult : APIResult.APIResult
+    public class LocalGroupAPIResult : APIResult
     {
         public string ObjectIdentifier { get; set; }
         public string Name { get; set; }
diff --git a/src/CommonLib/OutputTypes/APIResult/SessionAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/SessionAPIResult.cs
similarity index 72%
rename from src/CommonLib/OutputTypes/APIResult/SessionAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/SessionAPIResult.cs
index 4626844a..bec1ba3b 100644
--- a/src/CommonLib/OutputTypes/APIResult/SessionAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/SessionAPIResult.cs
@@ -2,7 +2,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class SessionAPIResult : APIResult.APIResult
+    public class SessionAPIResult : APIResult
     {
         public Session[] Results { get; set; } = Array.Empty<Session>();
     }
diff --git a/src/CommonLib/OutputTypes/APIResult/UserRightsAssignmentAPIResult.cs b/src/CommonLib/OutputTypes/APIResults/UserRightsAssignmentAPIResult.cs
similarity index 91%
rename from src/CommonLib/OutputTypes/APIResult/UserRightsAssignmentAPIResult.cs
rename to src/CommonLib/OutputTypes/APIResults/UserRightsAssignmentAPIResult.cs
index c982b8c7..f558907a 100644
--- a/src/CommonLib/OutputTypes/APIResult/UserRightsAssignmentAPIResult.cs
+++ b/src/CommonLib/OutputTypes/APIResults/UserRightsAssignmentAPIResult.cs
@@ -3,7 +3,7 @@
 
 namespace SharpHoundCommonLib.OutputTypes
 {
-    public class UserRightsAssignmentAPIResult : APIResult.APIResult
+    public class UserRightsAssignmentAPIResult : APIResult
     {
         public string Privilege { get; set; }
         public TypedPrincipal[] Results { get; set; } = Array.Empty<TypedPrincipal>();
diff --git a/src/CommonLib/OutputTypes/CARegistryData.cs b/src/CommonLib/OutputTypes/CARegistryData.cs
index 9da3c7d0..21efd22b 100644
--- a/src/CommonLib/OutputTypes/CARegistryData.cs
+++ b/src/CommonLib/OutputTypes/CARegistryData.cs
@@ -1,5 +1,4 @@
-using SharpHoundCommonLib.OutputTypes.APIResult;
-using SharpHoundCommonLib.Processors;
+using SharpHoundCommonLib.Processors;
 
 namespace SharpHoundCommonLib.OutputTypes
 {
diff --git a/src/CommonLib/OutputTypes/Computer.cs b/src/CommonLib/OutputTypes/Computer.cs
index 55e4d654..1195cb36 100644
--- a/src/CommonLib/OutputTypes/Computer.cs
+++ b/src/CommonLib/OutputTypes/Computer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.OutputTypes {
     /// <summary>
diff --git a/src/CommonLib/OutputTypes/EnterpriseCA.cs b/src/CommonLib/OutputTypes/EnterpriseCA.cs
index 6db48a65..9c3b209d 100644
--- a/src/CommonLib/OutputTypes/EnterpriseCA.cs
+++ b/src/CommonLib/OutputTypes/EnterpriseCA.cs
@@ -1,6 +1,4 @@
-using SharpHoundCommonLib.OutputTypes.APIResult;
-
-namespace SharpHoundCommonLib.OutputTypes
+namespace SharpHoundCommonLib.OutputTypes
 {
     public class EnterpriseCA : OutputBase
     {
diff --git a/src/CommonLib/Processors/CAEnrollmentProcessor.cs b/src/CommonLib/Processors/CAEnrollmentProcessor.cs
index 1b417454..83b3a35c 100644
--- a/src/CommonLib/Processors/CAEnrollmentProcessor.cs
+++ b/src/CommonLib/Processors/CAEnrollmentProcessor.cs
@@ -7,7 +7,6 @@
 using System.Net.Http;
 using System.Net.Sockets;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     /// <summary>
diff --git a/src/CommonLib/Processors/DCLdapProcessor.cs b/src/CommonLib/Processors/DCLdapProcessor.cs
index dde54f16..a3c821d9 100644
--- a/src/CommonLib/Processors/DCLdapProcessor.cs
+++ b/src/CommonLib/Processors/DCLdapProcessor.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors;
 
diff --git a/src/CommonLib/Processors/EventLogProcessor.cs b/src/CommonLib/Processors/EventLogProcessor.cs
index 33debbb0..2562c11d 100644
--- a/src/CommonLib/Processors/EventLogProcessor.cs
+++ b/src/CommonLib/Processors/EventLogProcessor.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using SharpHoundCommonLib.OutputTypes;
 using System.Net;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     [Flags]
diff --git a/src/CommonLib/Processors/RegistryResult.cs b/src/CommonLib/Processors/RegistryResult.cs
index d1c7d12d..18ec9d9d 100644
--- a/src/CommonLib/Processors/RegistryResult.cs
+++ b/src/CommonLib/Processors/RegistryResult.cs
@@ -1,5 +1,4 @@
 using SharpHoundCommonLib.OutputTypes;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     public class RegistryResult : APIResult {
diff --git a/src/CommonLib/Processors/SmbProcessor.cs b/src/CommonLib/Processors/SmbProcessor.cs
index f8f91678..6c927bd7 100644
--- a/src/CommonLib/Processors/SmbProcessor.cs
+++ b/src/CommonLib/Processors/SmbProcessor.cs
@@ -5,7 +5,6 @@
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     /// <summary>
diff --git a/src/CommonLib/Processors/WebClientServiceProcessor.cs b/src/CommonLib/Processors/WebClientServiceProcessor.cs
index 6f7f4684..5a4e0e2c 100644
--- a/src/CommonLib/Processors/WebClientServiceProcessor.cs
+++ b/src/CommonLib/Processors/WebClientServiceProcessor.cs
@@ -8,7 +8,6 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using SharpHoundCommonLib.OutputTypes.APIResult;
 
 namespace SharpHoundCommonLib.Processors {
     /// <summary>