diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ConnectionStringRuleProviderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ConnectionStringRuleProviderTests.cs
index dadfa63669..1c9615e950 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ConnectionStringRuleProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ConnectionStringRuleProviderTests.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.CmdPal.Common.Services.Sanitizer;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 using Microsoft.CmdPal.Common.UnitTests.TestUtils;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Services.Sanitizer;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ErrorReportSanitizerTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ErrorReportSanitizerTests.cs
index 1ab57acd2e..9a9fbf1fc5 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ErrorReportSanitizerTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/ErrorReportSanitizerTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer;
+using Microsoft.CmdPal.Common.Services.Sanitizer;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Services.Sanitizer;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/PiiRuleProviderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/PiiRuleProviderTests.cs
index ac490f5a6b..47b698b643 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/PiiRuleProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/PiiRuleProviderTests.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.CmdPal.Common.Services.Sanitizer;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 using Microsoft.CmdPal.Common.UnitTests.TestUtils;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Services.Sanitizer;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/SecretKeyValueRulesProviderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/SecretKeyValueRulesProviderTests.cs
index 7cfb75fff0..33ee54a32b 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/SecretKeyValueRulesProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Services/Sanitizer/SecretKeyValueRulesProviderTests.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.CmdPal.Common.Services.Sanitizer;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 using Microsoft.CmdPal.Common.UnitTests.TestUtils;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Services.Sanitizer;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/TestUtils/SanitizerTestHelper.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/TestUtils/SanitizerTestHelper.cs
index d800874252..00de3fdad8 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/TestUtils/SanitizerTestHelper.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/TestUtils/SanitizerTestHelper.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Core.Common.Services.Sanitizer.Abstraction;
+using Microsoft.CmdPal.Common.Services.Sanitizer.Abstraction;
 
 namespace Microsoft.CmdPal.Common.UnitTests.TestUtils;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherEmojiTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherEmojiTests.cs
index fc85834b2e..0ba18634dc 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherEmojiTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherEmojiTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Text;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherOptionsTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherOptionsTests.cs
index b5798986ff..997c3d2c89 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherOptionsTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherOptionsTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Text;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherSecondaryInputTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherSecondaryInputTests.cs
index 70c86a4598..5403453b4b 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherSecondaryInputTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherSecondaryInputTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Text;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherTests.cs
index bdd3898ac9..9cf3d5d38a 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Text;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherUnicodeTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherUnicodeTests.cs
index 8cdf39bc82..66d2805242 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherUnicodeTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherUnicodeTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Text;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherWithPinyinTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherWithPinyinTests.cs
index 3e811c050a..a6edfe6f6c 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherWithPinyinTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/PrecomputedFuzzyMatcherWithPinyinTests.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Globalization;
-using Microsoft.CmdPal.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Text;
 
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/StringFolderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/StringFolderTests.cs
index 076636f2fb..3ebdfdbc3e 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/StringFolderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Common.UnitTests/Text/StringFolderTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.Common.Text;
+using Microsoft.CmdPal.Common.Text;
 
 namespace Microsoft.CmdPal.Common.UnitTests.Text;