diff --git a/src/Aqua.Newtonsoft.Json/JsonNetSerializerSettingsExtensions.cs b/src/Aqua.Newtonsoft.Json/JsonNetSerializerSettingsExtensions.cs
index 40c8fed..1f866b3 100644
--- a/src/Aqua.Newtonsoft.Json/JsonNetSerializerSettingsExtensions.cs
+++ b/src/Aqua.Newtonsoft.Json/JsonNetSerializerSettingsExtensions.cs
@@ -1,9 +1,11 @@
 // Copyright (c) Christof Senn. All rights reserved. See license.txt in the project root for license information.
 
-namespace Aqua.Newtonsoft.Json;
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace Newtonsoft.Json;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 
+using Aqua.Newtonsoft.Json;
 using Aqua.Newtonsoft.Json.ContractResolvers;
-using global::Newtonsoft.Json;
 using global::Newtonsoft.Json.Serialization;
 using System.ComponentModel;
 
diff --git a/src/Aqua.Text.Json/JsonSerializerOptionsExtensions.cs b/src/Aqua.Text.Json/JsonSerializerOptionsExtensions.cs
index 65114bd..1861802 100644
--- a/src/Aqua.Text.Json/JsonSerializerOptionsExtensions.cs
+++ b/src/Aqua.Text.Json/JsonSerializerOptionsExtensions.cs
@@ -1,9 +1,12 @@
 // Copyright (c) Christof Senn. All rights reserved. See license.txt in the project root for license information.
 
-namespace Aqua.Text.Json;
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace System.Text.Json;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 using Aqua.Dynamic;
 using Aqua.EnumerableExtensions;
+using Aqua.Text.Json;
 using Aqua.Text.Json.Converters;
 using Aqua.TypeSystem;
 using System;
@@ -12,7 +15,6 @@ namespace Aqua.Text.Json;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
 [EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/test/Aqua.Tests/Serialization/Dynamic/DynamicObject/When_using_dynamic_object_for_object_with_polymorphism.cs b/test/Aqua.Tests/Serialization/Dynamic/DynamicObject/When_using_dynamic_object_for_object_with_polymorphism.cs
index e7e0d6b..9f674a5 100644
--- a/test/Aqua.Tests/Serialization/Dynamic/DynamicObject/When_using_dynamic_object_for_object_with_polymorphism.cs
+++ b/test/Aqua.Tests/Serialization/Dynamic/DynamicObject/When_using_dynamic_object_for_object_with_polymorphism.cs
@@ -3,7 +3,6 @@
 namespace Aqua.Tests.Serialization.Dynamic.DynamicObject;
 
 using Aqua.Dynamic;
-using Aqua.Text.Json;
 using Shouldly;
 using System;
 using System.Text.Json;
diff --git a/test/Aqua.Tests/Serialization/NewtonsoftJsonSerializationHelper.cs b/test/Aqua.Tests/Serialization/NewtonsoftJsonSerializationHelper.cs
index 163790a..d0c4fb0 100644
--- a/test/Aqua.Tests/Serialization/NewtonsoftJsonSerializationHelper.cs
+++ b/test/Aqua.Tests/Serialization/NewtonsoftJsonSerializationHelper.cs
@@ -2,7 +2,6 @@
 
 namespace Aqua.Tests.Serialization;
 
-using Aqua.Newtonsoft.Json;
 using global::Newtonsoft.Json;
 
 public static class NewtonsoftJsonSerializationHelper
diff --git a/test/Aqua.Tests/Serialization/SystemTextJsonSerializationHelper.cs b/test/Aqua.Tests/Serialization/SystemTextJsonSerializationHelper.cs
index ef481fd..61226a9 100644
--- a/test/Aqua.Tests/Serialization/SystemTextJsonSerializationHelper.cs
+++ b/test/Aqua.Tests/Serialization/SystemTextJsonSerializationHelper.cs
@@ -2,7 +2,6 @@
 
 namespace Aqua.Tests.Serialization;
 
-using Aqua.Text.Json;
 using Aqua.Text.Json.Converters;
 using System;
 using System.Numerics;