diff --git a/DnsServerCore/Dns/Zones/AuthZoneNode.cs b/DnsServerCore/Dns/Trees/AuthZoneNode.cs
similarity index 98%
rename from DnsServerCore/Dns/Zones/AuthZoneNode.cs
rename to DnsServerCore/Dns/Trees/AuthZoneNode.cs
index d705d11d..dc105b34 100644
--- a/DnsServerCore/Dns/Zones/AuthZoneNode.cs
+++ b/DnsServerCore/Dns/Trees/AuthZoneNode.cs
@@ -17,12 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+using DnsServerCore.Dns.Zones;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
-namespace DnsServerCore.Dns.Zones
+namespace DnsServerCore.Dns.Trees
 {
     class AuthZoneNode : IDisposable
     {
diff --git a/DnsServerCore/Dns/Zones/AuthZoneTree.cs b/DnsServerCore/Dns/Trees/AuthZoneTree.cs
similarity index 99%
rename from DnsServerCore/Dns/Zones/AuthZoneTree.cs
rename to DnsServerCore/Dns/Trees/AuthZoneTree.cs
index a7291f99..666cfd21 100644
--- a/DnsServerCore/Dns/Zones/AuthZoneTree.cs
+++ b/DnsServerCore/Dns/Trees/AuthZoneTree.cs
@@ -17,12 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+using DnsServerCore.Dns.Zones;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
-namespace DnsServerCore.Dns.Zones
+namespace DnsServerCore.Dns.Trees
 {
     class AuthZoneTree : ZoneTree<AuthZoneNode, SubDomainZone, ApexZone>
     {
diff --git a/DnsServerCore/Dns/Zones/CacheZoneTree.cs b/DnsServerCore/Dns/Trees/CacheZoneTree.cs
similarity index 98%
rename from DnsServerCore/Dns/Zones/CacheZoneTree.cs
rename to DnsServerCore/Dns/Trees/CacheZoneTree.cs
index 3517e1e0..0cd5f438 100644
--- a/DnsServerCore/Dns/Zones/CacheZoneTree.cs
+++ b/DnsServerCore/Dns/Trees/CacheZoneTree.cs
@@ -17,9 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+using DnsServerCore.Dns.Zones;
 using System;
 
-namespace DnsServerCore.Dns.Zones
+namespace DnsServerCore.Dns.Trees
 {
     class CacheZoneTree : ZoneTree<CacheZone, CacheZone, CacheZone>
     {
diff --git a/DnsServerCore/Dns/Zones/DomainTree.cs b/DnsServerCore/Dns/Trees/DomainTree.cs
similarity index 99%
rename from DnsServerCore/Dns/Zones/DomainTree.cs
rename to DnsServerCore/Dns/Trees/DomainTree.cs
index e0828ecc..e243e3ce 100644
--- a/DnsServerCore/Dns/Zones/DomainTree.cs
+++ b/DnsServerCore/Dns/Trees/DomainTree.cs
@@ -21,7 +21,7 @@ using System;
 using System.Text;
 using TechnitiumLibrary.ByteTree;
 
-namespace DnsServerCore.Dns.Zones
+namespace DnsServerCore.Dns.Trees
 {
     class DomainTree<T> : ByteTree<string, T> where T : class
     {
diff --git a/DnsServerCore/Dns/Zones/InvalidDomainNameException.cs b/DnsServerCore/Dns/Trees/InvalidDomainNameException.cs
similarity index 93%
rename from DnsServerCore/Dns/Zones/InvalidDomainNameException.cs
rename to DnsServerCore/Dns/Trees/InvalidDomainNameException.cs
index 64f17c10..98f3c94d 100644
--- a/DnsServerCore/Dns/Zones/InvalidDomainNameException.cs
+++ b/DnsServerCore/Dns/Trees/InvalidDomainNameException.cs
@@ -1,6 +1,6 @@
 /*
 Technitium DNS Server
-Copyright (C) 2020  Shreyas Zare (shreyas@technitium.com)
+Copyright (C) 2022  Shreyas Zare (shreyas@technitium.com)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
 
-namespace DnsServerCore.Dns.Zones
+namespace DnsServerCore.Dns.Trees
 {
     public class InvalidDomainNameException : DnsServerException
     {
diff --git a/DnsServerCore/Dns/Zones/ZoneTree.cs b/DnsServerCore/Dns/Trees/ZoneTree.cs
similarity index 99%
rename from DnsServerCore/Dns/Zones/ZoneTree.cs
rename to DnsServerCore/Dns/Trees/ZoneTree.cs
index a52edc33..3098b963 100644
--- a/DnsServerCore/Dns/Zones/ZoneTree.cs
+++ b/DnsServerCore/Dns/Trees/ZoneTree.cs
@@ -17,11 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+using DnsServerCore.Dns.Zones;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace DnsServerCore.Dns.Zones
+namespace DnsServerCore.Dns.Trees
 {
     abstract class ZoneTree<TNode, TSubDomainZone, TApexZone> : DomainTree<TNode> where TNode : class where TSubDomainZone : Zone where TApexZone : Zone
     {