diff --git a/src/Api/Jobs/UpdatePhishingDomainsJob.cs b/src/Api/Jobs/UpdatePhishingDomainsJob.cs
index 355f2af69bd5..311c1b30ed13 100644
--- a/src/Api/Jobs/UpdatePhishingDomainsJob.cs
+++ b/src/Api/Jobs/UpdatePhishingDomainsJob.cs
@@ -1,6 +1,6 @@
 using Bit.Core;
 using Bit.Core.Jobs;
-using Bit.Core.PhishingDomainFeatures.Interfaces;
+using Bit.Core.Dirt.PhishingDomainFeatures.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
diff --git a/src/Api/Utilities/ServiceCollectionExtensions.cs b/src/Api/Utilities/ServiceCollectionExtensions.cs
index 6af688f548e4..bf22806563c6 100644
--- a/src/Api/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Api/Utilities/ServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
 using Bit.Api.AdminConsole.Authorization;
 using Bit.Api.Tools.Authorization;
 using Bit.Core.Auth.IdentityServer;
-using Bit.Core.PhishingDomainFeatures;
-using Bit.Core.PhishingDomainFeatures.Interfaces;
+using Bit.Core.Dirt.PhishingDomainFeatures;
+using Bit.Core.Dirt.PhishingDomainFeatures.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Repositories.Implementations;
 using Bit.Core.Settings;
diff --git a/src/Core/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs b/src/Core/Dirt/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs
similarity index 98%
rename from src/Core/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs
rename to src/Core/Dirt/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs
index 6b76bc35f068..91a42748ccc7 100644
--- a/src/Core/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs
+++ b/src/Core/Dirt/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs
@@ -7,7 +7,7 @@
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.PhishingDomainFeatures;
+namespace Bit.Core.Dirt.PhishingDomainFeatures;
 
 public class AzurePhishingDomainStorageService
 {
diff --git a/src/Core/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs b/src/Core/Dirt/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs
similarity index 96%
rename from src/Core/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs
rename to src/Core/Dirt/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs
index 420948e3108c..100a6a815ed7 100644
--- a/src/Core/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs
+++ b/src/Core/Dirt/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs
@@ -1,8 +1,8 @@
-using Bit.Core.PhishingDomainFeatures.Interfaces;
+using Bit.Core.Dirt.PhishingDomainFeatures.Interfaces;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.PhishingDomainFeatures;
+namespace Bit.Core.Dirt.PhishingDomainFeatures;
 
 /// <summary>
 /// Implementation of ICloudPhishingDomainQuery for cloud environments
diff --git a/src/Core/PhishingDomainFeatures/CloudPhishingDomainRelayQuery.cs b/src/Core/Dirt/PhishingDomainFeatures/CloudPhishingDomainRelayQuery.cs
similarity index 95%
rename from src/Core/PhishingDomainFeatures/CloudPhishingDomainRelayQuery.cs
rename to src/Core/Dirt/PhishingDomainFeatures/CloudPhishingDomainRelayQuery.cs
index 6b0027062c88..dcf9a839a90a 100644
--- a/src/Core/PhishingDomainFeatures/CloudPhishingDomainRelayQuery.cs
+++ b/src/Core/Dirt/PhishingDomainFeatures/CloudPhishingDomainRelayQuery.cs
@@ -1,12 +1,12 @@
 // FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
-using Bit.Core.PhishingDomainFeatures.Interfaces;
+using Bit.Core.Dirt.PhishingDomainFeatures.Interfaces;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.PhishingDomainFeatures;
+namespace Bit.Core.Dirt.PhishingDomainFeatures;
 
 /// <summary>
 /// Implementation of ICloudPhishingDomainQuery for self-hosted environments
diff --git a/src/Core/PhishingDomainFeatures/Interfaces/ICloudPhishingDomainQuery.cs b/src/Core/Dirt/PhishingDomainFeatures/Interfaces/ICloudPhishingDomainQuery.cs
similarity index 69%
rename from src/Core/PhishingDomainFeatures/Interfaces/ICloudPhishingDomainQuery.cs
rename to src/Core/Dirt/PhishingDomainFeatures/Interfaces/ICloudPhishingDomainQuery.cs
index dac91747f7dc..028e6a3229c5 100644
--- a/src/Core/PhishingDomainFeatures/Interfaces/ICloudPhishingDomainQuery.cs
+++ b/src/Core/Dirt/PhishingDomainFeatures/Interfaces/ICloudPhishingDomainQuery.cs
@@ -1,4 +1,4 @@
-namespace Bit.Core.PhishingDomainFeatures.Interfaces;
+namespace Bit.Core.Dirt.PhishingDomainFeatures.Interfaces;
 
 public interface ICloudPhishingDomainQuery
 {
diff --git a/src/Core/Settings/IPhishingDomainSettings.cs b/src/Core/Dirt/Settings/IPhishingDomainSettings.cs
similarity index 100%
rename from src/Core/Settings/IPhishingDomainSettings.cs
rename to src/Core/Dirt/Settings/IPhishingDomainSettings.cs
diff --git a/src/Core/Repositories/Implementations/AzurePhishingDomainRepository.cs b/src/Core/Repositories/Implementations/AzurePhishingDomainRepository.cs
index 2d4ea15b7e1c..a1b28d36b779 100644
--- a/src/Core/Repositories/Implementations/AzurePhishingDomainRepository.cs
+++ b/src/Core/Repositories/Implementations/AzurePhishingDomainRepository.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Bit.Core.PhishingDomainFeatures;
+using Bit.Core.Dirt.PhishingDomainFeatures;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;