diff --git a/SupportedCountries.tt b/SupportedCountries.tt
index 06b7334..68c593d 100644
--- a/SupportedCountries.tt
+++ b/SupportedCountries.tt
@@ -9,6 +9,7 @@
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Text" #>
 <#@ import namespace="IbanNet" #>
+<#@ import namespace="IbanNet.CodeGen" #>
 <#@ import namespace="IbanNet.CodeGen.Swift" #>
 <#@ import namespace="IbanNet.Registry.Patterns" #>
 <#@ import namespace="IbanNet.Registry" #>
diff --git a/src/IbanNet/Registry/IbanCountryCodeComparer.cs b/src/IbanNet.CodeGen/IbanCountryCodeComparer.cs
similarity index 67%
rename from src/IbanNet/Registry/IbanCountryCodeComparer.cs
rename to src/IbanNet.CodeGen/IbanCountryCodeComparer.cs
index 5300dd3..3075426 100644
--- a/src/IbanNet/Registry/IbanCountryCodeComparer.cs
+++ b/src/IbanNet.CodeGen/IbanCountryCodeComparer.cs
@@ -1,13 +1,11 @@
-#if DEBUG && NETSTANDARD2_0 // Only used atm. by PS script, so exclude from all build configs except debug.
-using System.Diagnostics;
+using IbanNet.Registry;
 
-namespace IbanNet.Registry;
+namespace IbanNet.CodeGen;
 
 /// <summary>
-/// Compares <see cref="IbanCountry"/> by country code only.
+/// Compares <see cref="IbanCountry" /> by country code only.
 /// </summary>
-[DebuggerNonUserCode]
-public class IbanCountryCodeComparer : IEqualityComparer<IbanCountry>
+public sealed class IbanCountryCodeComparer : IEqualityComparer<IbanCountry>
 {
     /// <inheritdoc />
     public bool Equals(IbanCountry? x, IbanCountry? y)
@@ -41,4 +39,3 @@ public int GetHashCode(IbanCountry obj)
         return obj?.TwoLetterISORegionName.GetHashCode() ?? 0;
     }
 }
-#endif
diff --git a/test/IbanNet.Tests/PublicApi/.NET_Standard_2.0_via_.NET_Framework_4.8.verified.txt b/test/IbanNet.Tests/PublicApi/.NET_Standard_2.0_via_.NET_Framework_4.8.verified.txt
index 88871b1..e25d260 100644
--- a/test/IbanNet.Tests/PublicApi/.NET_Standard_2.0_via_.NET_Framework_4.8.verified.txt
+++ b/test/IbanNet.Tests/PublicApi/.NET_Standard_2.0_via_.NET_Framework_4.8.verified.txt
@@ -229,12 +229,6 @@ namespace IbanNet.Registry
         public IbanNet.Registry.SepaInfo? Sepa { get; init; }
         public override string ToString() { }
     }
-    public class IbanCountryCodeComparer : System.Collections.Generic.IEqualityComparer<IbanNet.Registry.IbanCountry>
-    {
-        public IbanCountryCodeComparer() { }
-        public bool Equals(IbanNet.Registry.IbanCountry? x, IbanNet.Registry.IbanCountry? y) { }
-        public int GetHashCode(IbanNet.Registry.IbanCountry obj) { }
-    }
     public class IbanGenerator : IbanNet.Registry.IIbanGenerator
     {
         public IbanGenerator() { }