diff --git a/Meraki.Api.Test/Appliance/Vpn/ThirdPartyVpnPeers/Tests.cs b/Meraki.Api.Test/Appliance/Vpn/ThirdPartyVpnPeers/Tests.cs
index 84ecb1bd..b89dc165 100644
--- a/Meraki.Api.Test/Appliance/Vpn/ThirdPartyVpnPeers/Tests.cs
+++ b/Meraki.Api.Test/Appliance/Vpn/ThirdPartyVpnPeers/Tests.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Test.Organizations.Appliance.Vpn.ThirdPartyVpnPeers;
+namespace Meraki.Api.Test.Appliance.Vpn.ThirdPartyVpnPeers;
 
 public class Tests(ITestOutputHelper iTestOutputHelper) : MerakiClientTest(iTestOutputHelper)
 {
diff --git a/Meraki.Api/Interfaces/General/Devices/IDevices.cs b/Meraki.Api/Interfaces/General/Devices/IDevices.cs
index 32b87ccd..ecfbf459 100644
--- a/Meraki.Api/Interfaces/General/Devices/IDevices.cs
+++ b/Meraki.Api/Interfaces/General/Devices/IDevices.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces;
+namespace Meraki.Api.Interfaces.General.Devices;
 
 /// <summary>
 /// Represents a collection of functions to interact with the API endpoints
diff --git a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsApiRequests.cs b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsApiRequests.cs
index 4c20d2a9..5ef3d5bf 100644
--- a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsApiRequests.cs
+++ b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsApiRequests.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces;
+namespace Meraki.Api.Interfaces.General.Organizations;
 
 /// <summary>
 /// Represents a collection of functions to interact with the API endpoints
diff --git a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsConfigurationChanges.cs b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsConfigurationChanges.cs
index e8931c78..f50f8859 100644
--- a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsConfigurationChanges.cs
+++ b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsConfigurationChanges.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces;
+namespace Meraki.Api.Interfaces.General.Organizations;
 
 /// <summary>
 /// Represents a collection of functions to interact with the API endpoints
diff --git a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksAlertTypes.cs b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksAlertTypes.cs
index 36360877..f07411ea 100644
--- a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksAlertTypes.cs
+++ b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksAlertTypes.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces;
+namespace Meraki.Api.Interfaces.General.Organizations;
 
 /// <summary>
 /// Represents a collection of functions to interact with the API endpoints
diff --git a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksCallbacks.cs b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksCallbacks.cs
index 6fa2fd84..ea629aff 100644
--- a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksCallbacks.cs
+++ b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksCallbacks.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces.General.Networks;
+namespace Meraki.Api.Interfaces.General.Organizations;
 
 public interface IOrganizationsWebhooksCallbacks
 
diff --git a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksHttpServers.cs b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksHttpServers.cs
index 4e7d6aad..2616979f 100644
--- a/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksHttpServers.cs
+++ b/Meraki.Api/Interfaces/General/Organizations/IOrganizationsWebhooksHttpServers.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces.General.Networks;
+namespace Meraki.Api.Interfaces.General.Organizations;
 
 public interface IOrganizationsWebhooksHttpServers
 
diff --git a/Meraki.Api/Interfaces/Products/Appliance/IAppliancePrefixesDelegatedStatics.cs b/Meraki.Api/Interfaces/Products/Appliance/IAppliancePrefixesDelegatedStatics.cs
index 11ca127c..146fa733 100644
--- a/Meraki.Api/Interfaces/Products/Appliance/IAppliancePrefixesDelegatedStatics.cs
+++ b/Meraki.Api/Interfaces/Products/Appliance/IAppliancePrefixesDelegatedStatics.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces.Products.Appliances;
+namespace Meraki.Api.Interfaces.Products.Appliance;
 
 public interface IAppliancePrefixesDelegatedStatics
 
diff --git a/Meraki.Api/Interfaces/Products/Camera/ICamera.cs b/Meraki.Api/Interfaces/Products/Camera/ICamera.cs
index f563150c..682256ae 100644
--- a/Meraki.Api/Interfaces/Products/Camera/ICamera.cs
+++ b/Meraki.Api/Interfaces/Products/Camera/ICamera.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces;
+namespace Meraki.Api.Interfaces.Products.Camera;
 
 /// <summary>
 /// Represents a collection of functions to interact with the API endpoints
diff --git a/Meraki.Api/Interfaces/Products/Camera/ICameraQualityAndRetentionProfiles.cs b/Meraki.Api/Interfaces/Products/Camera/ICameraQualityAndRetentionProfiles.cs
index e2c5d04b..42e11923 100644
--- a/Meraki.Api/Interfaces/Products/Camera/ICameraQualityAndRetentionProfiles.cs
+++ b/Meraki.Api/Interfaces/Products/Camera/ICameraQualityAndRetentionProfiles.cs
@@ -1,4 +1,4 @@
-namespace Meraki.Api.Interfaces;
+namespace Meraki.Api.Interfaces.Products.Camera;
 
 /// <summary>
 /// Represents a collection of functions to interact with the API endpoints
diff --git a/Meraki.Api/Sections/Products/Appliance/AppliancePrefixesDelegatedSection.cs b/Meraki.Api/Sections/Products/Appliance/AppliancePrefixesDelegatedSection.cs
index aba6035c..e5482a09 100644
--- a/Meraki.Api/Sections/Products/Appliance/AppliancePrefixesDelegatedSection.cs
+++ b/Meraki.Api/Sections/Products/Appliance/AppliancePrefixesDelegatedSection.cs
@@ -1,6 +1,4 @@
-using Meraki.Api.Interfaces.Products.Appliances;
-
-namespace Meraki.Api.Sections.Products.Appliance;
+namespace Meraki.Api.Sections.Products.Appliance;
 
 public class AppliancePrefixesDelegatedSection
 {