diff --git a/Rai.PacketMediator.sln.sln b/Rai.PacketMediator.sln.sln
new file mode 100644
index 0000000..eb1de01
--- /dev/null
+++ b/Rai.PacketMediator.sln.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rai.PacketMediator", "Rai.PacketMediator\Rai.PacketMediator.csproj", "{13243A92-DC1E-4DBF-8E2C-13CE9ABFEAD3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{13243A92-DC1E-4DBF-8E2C-13CE9ABFEAD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13243A92-DC1E-4DBF-8E2C-13CE9ABFEAD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13243A92-DC1E-4DBF-8E2C-13CE9ABFEAD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13243A92-DC1E-4DBF-8E2C-13CE9ABFEAD3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/IBidirectionalPacket.cs b/Rai.PacketMediator/IBidirectionalPacket.cs
similarity index 100%
rename from IBidirectionalPacket.cs
rename to Rai.PacketMediator/IBidirectionalPacket.cs
diff --git a/IIncomingPacket.cs b/Rai.PacketMediator/IIncomingPacket.cs
similarity index 100%
rename from IIncomingPacket.cs
rename to Rai.PacketMediator/IIncomingPacket.cs
diff --git a/IOutgoingPacket.cs b/Rai.PacketMediator/IOutgoingPacket.cs
similarity index 100%
rename from IOutgoingPacket.cs
rename to Rai.PacketMediator/IOutgoingPacket.cs
diff --git a/IPacket.cs b/Rai.PacketMediator/IPacket.cs
similarity index 100%
rename from IPacket.cs
rename to Rai.PacketMediator/IPacket.cs
diff --git a/IPacketHandler.cs b/Rai.PacketMediator/IPacketHandler.cs
similarity index 100%
rename from IPacketHandler.cs
rename to Rai.PacketMediator/IPacketHandler.cs
diff --git a/PacketDistributor.cs b/Rai.PacketMediator/PacketDistributor.cs
similarity index 100%
rename from PacketDistributor.cs
rename to Rai.PacketMediator/PacketDistributor.cs
diff --git a/PacketDistributorService.cs b/Rai.PacketMediator/PacketDistributorService.cs
similarity index 100%
rename from PacketDistributorService.cs
rename to Rai.PacketMediator/PacketDistributorService.cs
diff --git a/PacketIdAttribute.cs b/Rai.PacketMediator/PacketIdAttribute.cs
similarity index 100%
rename from PacketIdAttribute.cs
rename to Rai.PacketMediator/PacketIdAttribute.cs
diff --git a/Rai.PacketMediator.csproj b/Rai.PacketMediator/Rai.PacketMediator.csproj
similarity index 95%
rename from Rai.PacketMediator.csproj
rename to Rai.PacketMediator/Rai.PacketMediator.csproj
index a4940f6..1ce9381 100644
--- a/Rai.PacketMediator.csproj
+++ b/Rai.PacketMediator/Rai.PacketMediator.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNext" Version="5.0.2" />
-    <PackageReference Include="DotNext.Metaprogramming" Version="5.0.2" />
+    <PackageReference Include="DotNext" Version="5.0.2"/>
+    <PackageReference Include="DotNext.Metaprogramming" Version="5.0.2"/>
     <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.145">
       <PrivateAssets>all</PrivateAssets>