diff --git a/src/PlcInterface.Abstraction/Extensions/IMonitorExtension.cs b/src/PlcInterface.Abstraction/IMonitorExtension.cs
similarity index 96%
rename from src/PlcInterface.Abstraction/Extensions/IMonitorExtension.cs
rename to src/PlcInterface.Abstraction/IMonitorExtension.cs
index 5c4c224..f33fc27 100644
--- a/src/PlcInterface.Abstraction/Extensions/IMonitorExtension.cs
+++ b/src/PlcInterface.Abstraction/IMonitorExtension.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Reactive.Linq;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="IMonitor"/>.
diff --git a/src/PlcInterface.Abstraction/Extensions/IPlcConnectionExtension.cs b/src/PlcInterface.Abstraction/IPlcConnectionExtension.cs
similarity index 95%
rename from src/PlcInterface.Abstraction/Extensions/IPlcConnectionExtension.cs
rename to src/PlcInterface.Abstraction/IPlcConnectionExtension.cs
index d20c5d8..1600882 100644
--- a/src/PlcInterface.Abstraction/Extensions/IPlcConnectionExtension.cs
+++ b/src/PlcInterface.Abstraction/IPlcConnectionExtension.cs
@@ -3,10 +3,7 @@
 using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="IPlcConnection{T}"/>.
diff --git a/src/PlcInterface.Abstraction/Extensions/IReadWriteExtension.cs b/src/PlcInterface.Abstraction/IReadWriteExtension.cs
similarity index 94%
rename from src/PlcInterface.Abstraction/Extensions/IReadWriteExtension.cs
rename to src/PlcInterface.Abstraction/IReadWriteExtension.cs
index 3183c14..02207bc 100644
--- a/src/PlcInterface.Abstraction/Extensions/IReadWriteExtension.cs
+++ b/src/PlcInterface.Abstraction/IReadWriteExtension.cs
@@ -3,10 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="IReadWrite"/>.
diff --git a/src/PlcInterface.Ads/Extensions/DynamicObjectExtensions.cs b/src/PlcInterface.Ads/DynamicObjectExtensions.cs
similarity index 96%
rename from src/PlcInterface.Ads/Extensions/DynamicObjectExtensions.cs
rename to src/PlcInterface.Ads/DynamicObjectExtensions.cs
index 28c5415..8e2a4a6 100644
--- a/src/PlcInterface.Ads/Extensions/DynamicObjectExtensions.cs
+++ b/src/PlcInterface.Ads/DynamicObjectExtensions.cs
@@ -4,10 +4,7 @@
 using TwinCAT.Ads.TypeSystem;
 using TwinCAT.TypeSystem;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.Ads;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="DynamicObject"/>.
diff --git a/src/PlcInterface.Ads/Extensions/IServiceCollectionExtension.cs b/src/PlcInterface.Ads/IServiceCollectionExtension.cs
similarity index 92%
rename from src/PlcInterface.Ads/Extensions/IServiceCollectionExtension.cs
rename to src/PlcInterface.Ads/IServiceCollectionExtension.cs
index 212c424..ab540f7 100644
--- a/src/PlcInterface.Ads/Extensions/IServiceCollectionExtension.cs
+++ b/src/PlcInterface.Ads/IServiceCollectionExtension.cs
@@ -3,10 +3,7 @@
 using Microsoft.Extensions.Logging;
 using PlcInterface.Ads.TwinCATAbstractions;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.Ads;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="IServiceCollection"/>.
diff --git a/src/PlcInterface.Ads/Extensions/ISymbolInfoExtension.cs b/src/PlcInterface.Ads/ISymbolInfoExtension.cs
similarity index 83%
rename from src/PlcInterface.Ads/Extensions/ISymbolInfoExtension.cs
rename to src/PlcInterface.Ads/ISymbolInfoExtension.cs
index 52c351f..ea1932c 100644
--- a/src/PlcInterface.Ads/Extensions/ISymbolInfoExtension.cs
+++ b/src/PlcInterface.Ads/ISymbolInfoExtension.cs
@@ -1,7 +1,4 @@
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.Ads;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="ISymbolInfo"/>.
diff --git a/src/PlcInterface.Ads/Extensions/IValueSymbolExtensions.cs b/src/PlcInterface.Ads/IValueSymbolExtensions.cs
similarity index 83%
rename from src/PlcInterface.Ads/Extensions/IValueSymbolExtensions.cs
rename to src/PlcInterface.Ads/IValueSymbolExtensions.cs
index 3c5b33e..5e62e2b 100644
--- a/src/PlcInterface.Ads/Extensions/IValueSymbolExtensions.cs
+++ b/src/PlcInterface.Ads/IValueSymbolExtensions.cs
@@ -1,9 +1,6 @@
 using TwinCAT.TypeSystem;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.Ads;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="IValueSymbol"/>.
diff --git a/src/PlcInterface.Ads/Extensions/ObjectExtension.cs b/src/PlcInterface.Ads/ObjectExtension.cs
similarity index 92%
rename from src/PlcInterface.Ads/Extensions/ObjectExtension.cs
rename to src/PlcInterface.Ads/ObjectExtension.cs
index 110b29b..0e6b50b 100644
--- a/src/PlcInterface.Ads/Extensions/ObjectExtension.cs
+++ b/src/PlcInterface.Ads/ObjectExtension.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.Ads;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for any object.
diff --git a/src/PlcInterface.Ads/Extensions/TcAdsClientExtension.cs b/src/PlcInterface.Ads/TcAdsClientExtension.cs
similarity index 88%
rename from src/PlcInterface.Ads/Extensions/TcAdsClientExtension.cs
rename to src/PlcInterface.Ads/TcAdsClientExtension.cs
index 69f9f92..debde56 100644
--- a/src/PlcInterface.Ads/Extensions/TcAdsClientExtension.cs
+++ b/src/PlcInterface.Ads/TcAdsClientExtension.cs
@@ -1,10 +1,7 @@
 using System;
 using TwinCAT.Ads;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.Ads;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="AdsClient"/>.
diff --git a/src/PlcInterface.OpcUa/Extensions/ICollectionExtensions.cs b/src/PlcInterface.OpcUa/ICollectionExtensions.cs
similarity index 87%
rename from src/PlcInterface.OpcUa/Extensions/ICollectionExtensions.cs
rename to src/PlcInterface.OpcUa/ICollectionExtensions.cs
index 2de67a6..c420d51 100644
--- a/src/PlcInterface.OpcUa/Extensions/ICollectionExtensions.cs
+++ b/src/PlcInterface.OpcUa/ICollectionExtensions.cs
@@ -2,10 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.OpcUa;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="ICollection{T}"/>.
diff --git a/src/PlcInterface.OpcUa/Extensions/IServiceCollectionExtension.cs b/src/PlcInterface.OpcUa/IServiceCollectionExtension.cs
similarity index 89%
rename from src/PlcInterface.OpcUa/Extensions/IServiceCollectionExtension.cs
rename to src/PlcInterface.OpcUa/IServiceCollectionExtension.cs
index b685e7e..fa6e0d4 100644
--- a/src/PlcInterface.OpcUa/Extensions/IServiceCollectionExtension.cs
+++ b/src/PlcInterface.OpcUa/IServiceCollectionExtension.cs
@@ -1,9 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.OpcUa;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="IServiceCollection"/>.
diff --git a/src/PlcInterface.OpcUa/Extensions/ISymbolInfoExtension.cs b/src/PlcInterface.OpcUa/ISymbolInfoExtension.cs
similarity index 83%
rename from src/PlcInterface.OpcUa/Extensions/ISymbolInfoExtension.cs
rename to src/PlcInterface.OpcUa/ISymbolInfoExtension.cs
index 0666146..a5f5532 100644
--- a/src/PlcInterface.OpcUa/Extensions/ISymbolInfoExtension.cs
+++ b/src/PlcInterface.OpcUa/ISymbolInfoExtension.cs
@@ -1,7 +1,4 @@
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.OpcUa;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="ISymbolInfo"/>.
diff --git a/src/PlcInterface.OpcUa/Extensions/SessionExtensions.cs b/src/PlcInterface.OpcUa/SessionExtensions.cs
similarity index 98%
rename from src/PlcInterface.OpcUa/Extensions/SessionExtensions.cs
rename to src/PlcInterface.OpcUa/SessionExtensions.cs
index 29ebb38..e284ae1 100644
--- a/src/PlcInterface.OpcUa/Extensions/SessionExtensions.cs
+++ b/src/PlcInterface.OpcUa/SessionExtensions.cs
@@ -7,10 +7,7 @@
 using Opc.Ua;
 using Opc.Ua.Client;
 
-#pragma warning disable IDE0130 // Namespace does not match folder structure
-
 namespace PlcInterface.OpcUa;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 /// <summary>
 /// Extension methods for <see cref="ISession"/>.