diff --git a/mROA/Abstract/ISerialisationModule.cs b/mROA/Abstract/ISerialisationModule.cs
index 546d248..14ea0ef 100644
--- a/mROA/Abstract/ISerialisationModule.cs
+++ b/mROA/Abstract/ISerialisationModule.cs
@@ -1,4 +1,5 @@
 using mROA.Implementation;
+using mROA.Implementation.CommandExecution;
 
 namespace mROA.Abstract;
 
diff --git a/mROA/Abstract/ISerializationToolkit.cs b/mROA/Abstract/ISerializationToolkit.cs
index 4536d49..d11359a 100644
--- a/mROA/Abstract/ISerializationToolkit.cs
+++ b/mROA/Abstract/ISerializationToolkit.cs
@@ -1,6 +1,4 @@
-using mROA.Abstract;
-
-namespace mROA.Implementation;
+namespace mROA.Abstract;
 
 public interface ISerializationToolkit : IInjectableModule
 {
diff --git a/mROA/Implementation/Backend/BasicExecutionModule.cs b/mROA/Implementation/Backend/BasicExecutionModule.cs
index 31097c8..eb5b96b 100644
--- a/mROA/Implementation/Backend/BasicExecutionModule.cs
+++ b/mROA/Implementation/Backend/BasicExecutionModule.cs
@@ -1,5 +1,6 @@
 using System.Reflection;
 using mROA.Abstract;
+using mROA.Implementation.CommandExecution;
 
 namespace mROA.Implementation.Backend;
 
diff --git a/mROA/Implementation/CommandExecution/ExceptionCommandExecution.cs b/mROA/Implementation/CommandExecution/ExceptionCommandExecution.cs
index d5fc222..772fa05 100644
--- a/mROA/Implementation/CommandExecution/ExceptionCommandExecution.cs
+++ b/mROA/Implementation/CommandExecution/ExceptionCommandExecution.cs
@@ -1,7 +1,7 @@
 using mROA.Abstract;
 using mROA.Implementation.Frontend;
 
-namespace mROA.Implementation;
+namespace mROA.Implementation.CommandExecution;
 
 public class ExceptionCommandExecution : ICommandExecution
 {
diff --git a/mROA/Implementation/CommandExecution/FinalCommandExecution.cs b/mROA/Implementation/CommandExecution/FinalCommandExecution.cs
index e0b21f4..5069911 100644
--- a/mROA/Implementation/CommandExecution/FinalCommandExecution.cs
+++ b/mROA/Implementation/CommandExecution/FinalCommandExecution.cs
@@ -3,7 +3,7 @@ using mROA.Abstract;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
-namespace mROA.Implementation;
+namespace mROA.Implementation.CommandExecution;
 
 public class FinalCommandExecution : ICommandExecution
 {
diff --git a/mROA/Implementation/CommandExecution/TypedFinalCommandExecution.cs b/mROA/Implementation/CommandExecution/TypedFinalCommandExecution.cs
index 2736585..e408c94 100644
--- a/mROA/Implementation/CommandExecution/TypedFinalCommandExecution.cs
+++ b/mROA/Implementation/CommandExecution/TypedFinalCommandExecution.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace mROA.Implementation;
+namespace mROA.Implementation.CommandExecution;
 
 public class TypedFinalCommandExecution : FinalCommandExecution<object>
 {
diff --git a/mROA/Implementation/Frontend/RequestExtractor.cs b/mROA/Implementation/Frontend/RequestExtractor.cs
index a4fad2d..486a61b 100644
--- a/mROA/Implementation/Frontend/RequestExtractor.cs
+++ b/mROA/Implementation/Frontend/RequestExtractor.cs
@@ -1,5 +1,7 @@
 using mROA.Abstract;
 using mROA.Implementation.Backend;
+using mROA.Implementation.CommandExecution;
+
 // ReSharper disable MethodHasAsyncOverload
 
 namespace mROA.Implementation.Frontend;
diff --git a/mROA/Implementation/JsonSerializationToolkit.cs b/mROA/Implementation/JsonSerializationToolkit.cs
index 366e970..82299f3 100644
--- a/mROA/Implementation/JsonSerializationToolkit.cs
+++ b/mROA/Implementation/JsonSerializationToolkit.cs
@@ -1,4 +1,5 @@
 using System.Text.Json;
+using mROA.Abstract;
 
 namespace mROA.Implementation;
 
diff --git a/mROA/Implementation/NetworkMessage.cs b/mROA/Implementation/NetworkMessage.cs
index 9ff4c83..9b524f8 100644
--- a/mROA/Implementation/NetworkMessage.cs
+++ b/mROA/Implementation/NetworkMessage.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+// ReSharper disable UnusedMember.Global
 
 namespace mROA.Implementation;
 
diff --git a/mROA/Implementation/RemoteObjectBase.cs b/mROA/Implementation/RemoteObjectBase.cs
index 7ffab21..6a813f2 100644
--- a/mROA/Implementation/RemoteObjectBase.cs
+++ b/mROA/Implementation/RemoteObjectBase.cs
@@ -1,4 +1,5 @@
 using mROA.Abstract;
+using mROA.Implementation.CommandExecution;
 
 // ReSharper disable UnusedMember.Global