diff --git a/src/Proto.Actor/Configuration/ActorSystemConfig.cs b/src/Proto.Actor/ActorSystemConfig.cs
similarity index 99%
rename from src/Proto.Actor/Configuration/ActorSystemConfig.cs
rename to src/Proto.Actor/ActorSystemConfig.cs
index 933f9ecbfb..368453ef92 100644
--- a/src/Proto.Actor/Configuration/ActorSystemConfig.cs
+++ b/src/Proto.Actor/ActorSystemConfig.cs
@@ -14,7 +14,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-// ReSharper disable once CheckNamespace
 namespace Proto;
 
 [PublicAPI]
diff --git a/src/Proto.Actor/Stashing/CapturedContext.cs b/src/Proto.Actor/Context/CapturedContext.cs
similarity index 96%
rename from src/Proto.Actor/Stashing/CapturedContext.cs
rename to src/Proto.Actor/Context/CapturedContext.cs
index f2759ca553..5f66ee4444 100644
--- a/src/Proto.Actor/Stashing/CapturedContext.cs
+++ b/src/Proto.Actor/Context/CapturedContext.cs
@@ -6,6 +6,7 @@
 
 using System.Threading.Tasks;
 
+// ReSharper disable once CheckNamespace
 namespace Proto;
 
 /// <summary>