diff --git a/Promul.sln b/Promul.sln
index 65c828c..415e3c5 100644
--- a/Promul.sln
+++ b/Promul.sln
@@ -1,18 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Server", "Server~\Promul.Server.csproj", "{EDB23D95-CCE1-4B0A-A5E0-B25383D6F647}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Server", "src\Promul.Server~\Promul.Server.csproj", "{EDB23D95-CCE1-4B0A-A5E0-B25383D6F647}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Common", "Common\Promul.Common.csproj", "{009A3A68-30A0-44EB-9B42-8FCB6BD89195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Common", "src\Promul.Common\Promul.Common.csproj", "{009A3A68-30A0-44EB-9B42-8FCB6BD89195}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Runtime", "Runtime\Promul.Runtime.csproj", "{29457397-4CEF-4E36-92C7-F3E1101CDBA7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Runtime.Unity", "src\Promul.Runtime.Unity\Promul.Runtime.Unity.csproj", "{29457397-4CEF-4E36-92C7-F3E1101CDBA7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Demo", "Demo~\Promul.Demo.csproj", "{2632B8FD-FA5A-4CE1-9A27-09C6D6A3BF34}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Demo", "test~\Promul.Demo\Promul.Demo.csproj", "{2632B8FD-FA5A-4CE1-9A27-09C6D6A3BF34}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3CDF6417-B41A-4C8A-8697-51002424935B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5CFD38E1-CF86-4A60-BCF1-CAEAC3CE9CB6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Tests", "Tests~\Promul.Tests.csproj", "{EEFB6A7C-9228-4ED6-9EFF-139BBFE666C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Promul.Tests", "test~\Promul.Tests\Promul.Tests.csproj", "{EEFB6A7C-9228-4ED6-9EFF-139BBFE666C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src.meta b/src.meta
new file mode 100644
index 0000000..4c0c22a
--- /dev/null
+++ b/src.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a62045fed2dd91b40b9988723e61fd2c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Common/Networking.meta b/src/Promul.Common/Networking.meta
similarity index 100%
rename from Common/Networking.meta
rename to src/Promul.Common/Networking.meta
diff --git a/Common/Networking/Channels.meta b/src/Promul.Common/Networking/Channels.meta
similarity index 100%
rename from Common/Networking/Channels.meta
rename to src/Promul.Common/Networking/Channels.meta
diff --git a/Common/Networking/Channels/ChannelBase.cs b/src/Promul.Common/Networking/Channels/ChannelBase.cs
similarity index 100%
rename from Common/Networking/Channels/ChannelBase.cs
rename to src/Promul.Common/Networking/Channels/ChannelBase.cs
diff --git a/Common/Networking/Channels/ChannelBase.cs.meta b/src/Promul.Common/Networking/Channels/ChannelBase.cs.meta
similarity index 100%
rename from Common/Networking/Channels/ChannelBase.cs.meta
rename to src/Promul.Common/Networking/Channels/ChannelBase.cs.meta
diff --git a/Common/Networking/Channels/ReliableChannel.cs b/src/Promul.Common/Networking/Channels/ReliableChannel.cs
similarity index 100%
rename from Common/Networking/Channels/ReliableChannel.cs
rename to src/Promul.Common/Networking/Channels/ReliableChannel.cs
diff --git a/Common/Networking/Channels/ReliableChannel.cs.meta b/src/Promul.Common/Networking/Channels/ReliableChannel.cs.meta
similarity index 100%
rename from Common/Networking/Channels/ReliableChannel.cs.meta
rename to src/Promul.Common/Networking/Channels/ReliableChannel.cs.meta
diff --git a/Common/Networking/Channels/SequencedChannel.cs b/src/Promul.Common/Networking/Channels/SequencedChannel.cs
similarity index 100%
rename from Common/Networking/Channels/SequencedChannel.cs
rename to src/Promul.Common/Networking/Channels/SequencedChannel.cs
diff --git a/Common/Networking/Channels/SequencedChannel.cs.meta b/src/Promul.Common/Networking/Channels/SequencedChannel.cs.meta
similarity index 100%
rename from Common/Networking/Channels/SequencedChannel.cs.meta
rename to src/Promul.Common/Networking/Channels/SequencedChannel.cs.meta
diff --git a/Common/Networking/ConnectionRequest.cs b/src/Promul.Common/Networking/ConnectionRequest.cs
similarity index 100%
rename from Common/Networking/ConnectionRequest.cs
rename to src/Promul.Common/Networking/ConnectionRequest.cs
diff --git a/Common/Networking/ConnectionRequest.cs.meta b/src/Promul.Common/Networking/ConnectionRequest.cs.meta
similarity index 100%
rename from Common/Networking/ConnectionRequest.cs.meta
rename to src/Promul.Common/Networking/ConnectionRequest.cs.meta
diff --git a/Common/Networking/Core.meta b/src/Promul.Common/Networking/Core.meta
similarity index 100%
rename from Common/Networking/Core.meta
rename to src/Promul.Common/Networking/Core.meta
diff --git a/Common/Networking/Core/ConnectRequestResult.cs b/src/Promul.Common/Networking/Core/ConnectRequestResult.cs
similarity index 100%
rename from Common/Networking/Core/ConnectRequestResult.cs
rename to src/Promul.Common/Networking/Core/ConnectRequestResult.cs
diff --git a/Common/Networking/Core/ConnectRequestResult.cs.meta b/src/Promul.Common/Networking/Core/ConnectRequestResult.cs.meta
similarity index 100%
rename from Common/Networking/Core/ConnectRequestResult.cs.meta
rename to src/Promul.Common/Networking/Core/ConnectRequestResult.cs.meta
diff --git a/Common/Networking/Core/ConnectionState.cs b/src/Promul.Common/Networking/Core/ConnectionState.cs
similarity index 100%
rename from Common/Networking/Core/ConnectionState.cs
rename to src/Promul.Common/Networking/Core/ConnectionState.cs
diff --git a/Common/Networking/Core/ConnectionState.cs.meta b/src/Promul.Common/Networking/Core/ConnectionState.cs.meta
similarity index 100%
rename from Common/Networking/Core/ConnectionState.cs.meta
rename to src/Promul.Common/Networking/Core/ConnectionState.cs.meta
diff --git a/Common/Networking/Core/DisconnectResult.cs b/src/Promul.Common/Networking/Core/DisconnectResult.cs
similarity index 100%
rename from Common/Networking/Core/DisconnectResult.cs
rename to src/Promul.Common/Networking/Core/DisconnectResult.cs
diff --git a/Common/Networking/Core/DisconnectResult.cs.meta b/src/Promul.Common/Networking/Core/DisconnectResult.cs.meta
similarity index 100%
rename from Common/Networking/Core/DisconnectResult.cs.meta
rename to src/Promul.Common/Networking/Core/DisconnectResult.cs.meta
diff --git a/Common/Networking/Core/PromulManager.Events.cs b/src/Promul.Common/Networking/Core/PromulManager.Events.cs
similarity index 100%
rename from Common/Networking/Core/PromulManager.Events.cs
rename to src/Promul.Common/Networking/Core/PromulManager.Events.cs
diff --git a/Common/Networking/Core/PromulManager.Events.cs.meta b/src/Promul.Common/Networking/Core/PromulManager.Events.cs.meta
similarity index 100%
rename from Common/Networking/Core/PromulManager.Events.cs.meta
rename to src/Promul.Common/Networking/Core/PromulManager.Events.cs.meta
diff --git a/Common/Networking/Core/PromulManager.Socket.cs b/src/Promul.Common/Networking/Core/PromulManager.Socket.cs
similarity index 100%
rename from Common/Networking/Core/PromulManager.Socket.cs
rename to src/Promul.Common/Networking/Core/PromulManager.Socket.cs
diff --git a/Common/Networking/Core/PromulManager.Socket.cs.meta b/src/Promul.Common/Networking/Core/PromulManager.Socket.cs.meta
similarity index 100%
rename from Common/Networking/Core/PromulManager.Socket.cs.meta
rename to src/Promul.Common/Networking/Core/PromulManager.Socket.cs.meta
diff --git a/Common/Networking/Core/PromulManager.Timeouts.cs b/src/Promul.Common/Networking/Core/PromulManager.Timeouts.cs
similarity index 100%
rename from Common/Networking/Core/PromulManager.Timeouts.cs
rename to src/Promul.Common/Networking/Core/PromulManager.Timeouts.cs
diff --git a/Common/Networking/Core/PromulManager.Timeouts.cs.meta b/src/Promul.Common/Networking/Core/PromulManager.Timeouts.cs.meta
similarity index 100%
rename from Common/Networking/Core/PromulManager.Timeouts.cs.meta
rename to src/Promul.Common/Networking/Core/PromulManager.Timeouts.cs.meta
diff --git a/Common/Networking/Core/PromulManager.cs b/src/Promul.Common/Networking/Core/PromulManager.cs
similarity index 100%
rename from Common/Networking/Core/PromulManager.cs
rename to src/Promul.Common/Networking/Core/PromulManager.cs
diff --git a/Common/Networking/Core/PromulManager.cs.meta b/src/Promul.Common/Networking/Core/PromulManager.cs.meta
similarity index 100%
rename from Common/Networking/Core/PromulManager.cs.meta
rename to src/Promul.Common/Networking/Core/PromulManager.cs.meta
diff --git a/Common/Networking/Core/ShutdownResult.cs b/src/Promul.Common/Networking/Core/ShutdownResult.cs
similarity index 100%
rename from Common/Networking/Core/ShutdownResult.cs
rename to src/Promul.Common/Networking/Core/ShutdownResult.cs
diff --git a/Common/Networking/Core/ShutdownResult.cs.meta b/src/Promul.Common/Networking/Core/ShutdownResult.cs.meta
similarity index 100%
rename from Common/Networking/Core/ShutdownResult.cs.meta
rename to src/Promul.Common/Networking/Core/ShutdownResult.cs.meta
diff --git a/Common/Networking/Data.meta b/src/Promul.Common/Networking/Data.meta
similarity index 100%
rename from Common/Networking/Data.meta
rename to src/Promul.Common/Networking/Data.meta
diff --git a/Common/Networking/Data/CompositeReader.cs b/src/Promul.Common/Networking/Data/CompositeReader.cs
similarity index 100%
rename from Common/Networking/Data/CompositeReader.cs
rename to src/Promul.Common/Networking/Data/CompositeReader.cs
diff --git a/Common/Networking/Data/CompositeReader.cs.meta b/src/Promul.Common/Networking/Data/CompositeReader.cs.meta
similarity index 100%
rename from Common/Networking/Data/CompositeReader.cs.meta
rename to src/Promul.Common/Networking/Data/CompositeReader.cs.meta
diff --git a/Common/Networking/Data/CompositeWriter.cs b/src/Promul.Common/Networking/Data/CompositeWriter.cs
similarity index 100%
rename from Common/Networking/Data/CompositeWriter.cs
rename to src/Promul.Common/Networking/Data/CompositeWriter.cs
diff --git a/Common/Networking/Data/CompositeWriter.cs.meta b/src/Promul.Common/Networking/Data/CompositeWriter.cs.meta
similarity index 100%
rename from Common/Networking/Data/CompositeWriter.cs.meta
rename to src/Promul.Common/Networking/Data/CompositeWriter.cs.meta
diff --git a/Common/Networking/Data/DisconnectInfo.cs b/src/Promul.Common/Networking/Data/DisconnectInfo.cs
similarity index 100%
rename from Common/Networking/Data/DisconnectInfo.cs
rename to src/Promul.Common/Networking/Data/DisconnectInfo.cs
diff --git a/Common/Networking/Data/DisconnectInfo.cs.meta b/src/Promul.Common/Networking/Data/DisconnectInfo.cs.meta
similarity index 100%
rename from Common/Networking/Data/DisconnectInfo.cs.meta
rename to src/Promul.Common/Networking/Data/DisconnectInfo.cs.meta
diff --git a/Common/Networking/Data/DisconnectReason.cs b/src/Promul.Common/Networking/Data/DisconnectReason.cs
similarity index 100%
rename from Common/Networking/Data/DisconnectReason.cs
rename to src/Promul.Common/Networking/Data/DisconnectReason.cs
diff --git a/Common/Networking/Data/DisconnectReason.cs.meta b/src/Promul.Common/Networking/Data/DisconnectReason.cs.meta
similarity index 100%
rename from Common/Networking/Data/DisconnectReason.cs.meta
rename to src/Promul.Common/Networking/Data/DisconnectReason.cs.meta
diff --git a/Common/Networking/Data/UnconnectedMessageType.cs b/src/Promul.Common/Networking/Data/UnconnectedMessageType.cs
similarity index 100%
rename from Common/Networking/Data/UnconnectedMessageType.cs
rename to src/Promul.Common/Networking/Data/UnconnectedMessageType.cs
diff --git a/Common/Networking/Data/UnconnectedMessageType.cs.meta b/src/Promul.Common/Networking/Data/UnconnectedMessageType.cs.meta
similarity index 100%
rename from Common/Networking/Data/UnconnectedMessageType.cs.meta
rename to src/Promul.Common/Networking/Data/UnconnectedMessageType.cs.meta
diff --git a/Common/Networking/IPEndPointComparer.cs b/src/Promul.Common/Networking/IPEndPointComparer.cs
similarity index 100%
rename from Common/Networking/IPEndPointComparer.cs
rename to src/Promul.Common/Networking/IPEndPointComparer.cs
diff --git a/Common/Networking/IPEndPointComparer.cs.meta b/src/Promul.Common/Networking/IPEndPointComparer.cs.meta
similarity index 100%
rename from Common/Networking/IPEndPointComparer.cs.meta
rename to src/Promul.Common/Networking/IPEndPointComparer.cs.meta
diff --git a/Common/Networking/Layers.meta b/src/Promul.Common/Networking/Layers.meta
similarity index 100%
rename from Common/Networking/Layers.meta
rename to src/Promul.Common/Networking/Layers.meta
diff --git a/Common/Networking/Layers/Crc32cLayer.cs b/src/Promul.Common/Networking/Layers/Crc32cLayer.cs
similarity index 100%
rename from Common/Networking/Layers/Crc32cLayer.cs
rename to src/Promul.Common/Networking/Layers/Crc32cLayer.cs
diff --git a/Common/Networking/Layers/Crc32cLayer.cs.meta b/src/Promul.Common/Networking/Layers/Crc32cLayer.cs.meta
similarity index 100%
rename from Common/Networking/Layers/Crc32cLayer.cs.meta
rename to src/Promul.Common/Networking/Layers/Crc32cLayer.cs.meta
diff --git a/Common/Networking/Layers/PacketLayerBase.cs b/src/Promul.Common/Networking/Layers/PacketLayerBase.cs
similarity index 100%
rename from Common/Networking/Layers/PacketLayerBase.cs
rename to src/Promul.Common/Networking/Layers/PacketLayerBase.cs
diff --git a/Common/Networking/Layers/PacketLayerBase.cs.meta b/src/Promul.Common/Networking/Layers/PacketLayerBase.cs.meta
similarity index 100%
rename from Common/Networking/Layers/PacketLayerBase.cs.meta
rename to src/Promul.Common/Networking/Layers/PacketLayerBase.cs.meta
diff --git a/Common/Networking/Layers/XorEncryptLayer.cs b/src/Promul.Common/Networking/Layers/XorEncryptLayer.cs
similarity index 100%
rename from Common/Networking/Layers/XorEncryptLayer.cs
rename to src/Promul.Common/Networking/Layers/XorEncryptLayer.cs
diff --git a/Common/Networking/Layers/XorEncryptLayer.cs.meta b/src/Promul.Common/Networking/Layers/XorEncryptLayer.cs.meta
similarity index 100%
rename from Common/Networking/Layers/XorEncryptLayer.cs.meta
rename to src/Promul.Common/Networking/Layers/XorEncryptLayer.cs.meta
diff --git a/Common/Networking/NetDebug.cs b/src/Promul.Common/Networking/NetDebug.cs
similarity index 100%
rename from Common/Networking/NetDebug.cs
rename to src/Promul.Common/Networking/NetDebug.cs
diff --git a/Common/Networking/NetDebug.cs.meta b/src/Promul.Common/Networking/NetDebug.cs.meta
similarity index 100%
rename from Common/Networking/NetDebug.cs.meta
rename to src/Promul.Common/Networking/NetDebug.cs.meta
diff --git a/Common/Networking/NetStatistics.cs b/src/Promul.Common/Networking/NetStatistics.cs
similarity index 100%
rename from Common/Networking/NetStatistics.cs
rename to src/Promul.Common/Networking/NetStatistics.cs
diff --git a/Common/Networking/NetStatistics.cs.meta b/src/Promul.Common/Networking/NetStatistics.cs.meta
similarity index 100%
rename from Common/Networking/NetStatistics.cs.meta
rename to src/Promul.Common/Networking/NetStatistics.cs.meta
diff --git a/Common/Networking/Packets.meta b/src/Promul.Common/Networking/Packets.meta
similarity index 100%
rename from Common/Networking/Packets.meta
rename to src/Promul.Common/Networking/Packets.meta
diff --git a/Common/Networking/Packets/Internal.meta b/src/Promul.Common/Networking/Packets/Internal.meta
similarity index 100%
rename from Common/Networking/Packets/Internal.meta
rename to src/Promul.Common/Networking/Packets/Internal.meta
diff --git a/Common/Networking/Packets/Internal/ConnectPacketBase.cs b/src/Promul.Common/Networking/Packets/Internal/ConnectPacketBase.cs
similarity index 100%
rename from Common/Networking/Packets/Internal/ConnectPacketBase.cs
rename to src/Promul.Common/Networking/Packets/Internal/ConnectPacketBase.cs
diff --git a/Common/Networking/Packets/Internal/ConnectPacketBase.cs.meta b/src/Promul.Common/Networking/Packets/Internal/ConnectPacketBase.cs.meta
similarity index 100%
rename from Common/Networking/Packets/Internal/ConnectPacketBase.cs.meta
rename to src/Promul.Common/Networking/Packets/Internal/ConnectPacketBase.cs.meta
diff --git a/Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs b/src/Promul.Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs
similarity index 100%
rename from Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs
rename to src/Promul.Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs
diff --git a/Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs.meta b/src/Promul.Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs.meta
similarity index 100%
rename from Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs.meta
rename to src/Promul.Common/Networking/Packets/Internal/NetConnectAcceptPacket.cs.meta
diff --git a/Common/Networking/Packets/Internal/NetConnectRequestPacket.cs b/src/Promul.Common/Networking/Packets/Internal/NetConnectRequestPacket.cs
similarity index 100%
rename from Common/Networking/Packets/Internal/NetConnectRequestPacket.cs
rename to src/Promul.Common/Networking/Packets/Internal/NetConnectRequestPacket.cs
diff --git a/Common/Networking/Packets/Internal/NetConnectRequestPacket.cs.meta b/src/Promul.Common/Networking/Packets/Internal/NetConnectRequestPacket.cs.meta
similarity index 100%
rename from Common/Networking/Packets/Internal/NetConnectRequestPacket.cs.meta
rename to src/Promul.Common/Networking/Packets/Internal/NetConnectRequestPacket.cs.meta
diff --git a/Common/Networking/Packets/NetworkPacket.cs b/src/Promul.Common/Networking/Packets/NetworkPacket.cs
similarity index 100%
rename from Common/Networking/Packets/NetworkPacket.cs
rename to src/Promul.Common/Networking/Packets/NetworkPacket.cs
diff --git a/Common/Networking/Packets/NetworkPacket.cs.meta b/src/Promul.Common/Networking/Packets/NetworkPacket.cs.meta
similarity index 100%
rename from Common/Networking/Packets/NetworkPacket.cs.meta
rename to src/Promul.Common/Networking/Packets/NetworkPacket.cs.meta
diff --git a/Common/Networking/PausedSocketFix.cs b/src/Promul.Common/Networking/PausedSocketFix.cs
similarity index 100%
rename from Common/Networking/PausedSocketFix.cs
rename to src/Promul.Common/Networking/PausedSocketFix.cs
diff --git a/Common/Networking/PausedSocketFix.cs.meta b/src/Promul.Common/Networking/PausedSocketFix.cs.meta
similarity index 100%
rename from Common/Networking/PausedSocketFix.cs.meta
rename to src/Promul.Common/Networking/PausedSocketFix.cs.meta
diff --git a/Common/Networking/Peers.meta b/src/Promul.Common/Networking/Peers.meta
similarity index 100%
rename from Common/Networking/Peers.meta
rename to src/Promul.Common/Networking/Peers.meta
diff --git a/Common/Networking/Peers/IncomingPeer.cs b/src/Promul.Common/Networking/Peers/IncomingPeer.cs
similarity index 100%
rename from Common/Networking/Peers/IncomingPeer.cs
rename to src/Promul.Common/Networking/Peers/IncomingPeer.cs
diff --git a/Common/Networking/Peers/IncomingPeer.cs.meta b/src/Promul.Common/Networking/Peers/IncomingPeer.cs.meta
similarity index 100%
rename from Common/Networking/Peers/IncomingPeer.cs.meta
rename to src/Promul.Common/Networking/Peers/IncomingPeer.cs.meta
diff --git a/Common/Networking/Peers/OutgoingPeer.cs b/src/Promul.Common/Networking/Peers/OutgoingPeer.cs
similarity index 100%
rename from Common/Networking/Peers/OutgoingPeer.cs
rename to src/Promul.Common/Networking/Peers/OutgoingPeer.cs
diff --git a/Common/Networking/Peers/OutgoingPeer.cs.meta b/src/Promul.Common/Networking/Peers/OutgoingPeer.cs.meta
similarity index 100%
rename from Common/Networking/Peers/OutgoingPeer.cs.meta
rename to src/Promul.Common/Networking/Peers/OutgoingPeer.cs.meta
diff --git a/Common/Networking/Peers/PeerBase.Mtu.cs b/src/Promul.Common/Networking/Peers/PeerBase.Mtu.cs
similarity index 100%
rename from Common/Networking/Peers/PeerBase.Mtu.cs
rename to src/Promul.Common/Networking/Peers/PeerBase.Mtu.cs
diff --git a/Common/Networking/Peers/PeerBase.Mtu.cs.meta b/src/Promul.Common/Networking/Peers/PeerBase.Mtu.cs.meta
similarity index 100%
rename from Common/Networking/Peers/PeerBase.Mtu.cs.meta
rename to src/Promul.Common/Networking/Peers/PeerBase.Mtu.cs.meta
diff --git a/Common/Networking/Peers/PeerBase.cs b/src/Promul.Common/Networking/Peers/PeerBase.cs
similarity index 100%
rename from Common/Networking/Peers/PeerBase.cs
rename to src/Promul.Common/Networking/Peers/PeerBase.cs
diff --git a/Common/Networking/Peers/PeerBase.cs.meta b/src/Promul.Common/Networking/Peers/PeerBase.cs.meta
similarity index 100%
rename from Common/Networking/Peers/PeerBase.cs.meta
rename to src/Promul.Common/Networking/Peers/PeerBase.cs.meta
diff --git a/Common/Networking/Peers/PromulPeer.ConnectionRequest.cs b/src/Promul.Common/Networking/Peers/PromulPeer.ConnectionRequest.cs
similarity index 100%
rename from Common/Networking/Peers/PromulPeer.ConnectionRequest.cs
rename to src/Promul.Common/Networking/Peers/PromulPeer.ConnectionRequest.cs
diff --git a/Common/Networking/Peers/PromulPeer.ConnectionRequest.cs.meta b/src/Promul.Common/Networking/Peers/PromulPeer.ConnectionRequest.cs.meta
similarity index 100%
rename from Common/Networking/Peers/PromulPeer.ConnectionRequest.cs.meta
rename to src/Promul.Common/Networking/Peers/PromulPeer.ConnectionRequest.cs.meta
diff --git a/Common/Networking/Trimming.cs b/src/Promul.Common/Networking/Trimming.cs
similarity index 100%
rename from Common/Networking/Trimming.cs
rename to src/Promul.Common/Networking/Trimming.cs
diff --git a/Common/Networking/Trimming.cs.meta b/src/Promul.Common/Networking/Trimming.cs.meta
similarity index 100%
rename from Common/Networking/Trimming.cs.meta
rename to src/Promul.Common/Networking/Trimming.cs.meta
diff --git a/Common/Networking/Utils.meta b/src/Promul.Common/Networking/Utils.meta
similarity index 100%
rename from Common/Networking/Utils.meta
rename to src/Promul.Common/Networking/Utils.meta
diff --git a/Common/Networking/Utils/CRC32C.cs b/src/Promul.Common/Networking/Utils/CRC32C.cs
similarity index 100%
rename from Common/Networking/Utils/CRC32C.cs
rename to src/Promul.Common/Networking/Utils/CRC32C.cs
diff --git a/Common/Networking/Utils/CRC32C.cs.meta b/src/Promul.Common/Networking/Utils/CRC32C.cs.meta
similarity index 100%
rename from Common/Networking/Utils/CRC32C.cs.meta
rename to src/Promul.Common/Networking/Utils/CRC32C.cs.meta
diff --git a/Common/Networking/Utils/FastBitConverter.cs b/src/Promul.Common/Networking/Utils/FastBitConverter.cs
similarity index 100%
rename from Common/Networking/Utils/FastBitConverter.cs
rename to src/Promul.Common/Networking/Utils/FastBitConverter.cs
diff --git a/Common/Networking/Utils/FastBitConverter.cs.meta b/src/Promul.Common/Networking/Utils/FastBitConverter.cs.meta
similarity index 100%
rename from Common/Networking/Utils/FastBitConverter.cs.meta
rename to src/Promul.Common/Networking/Utils/FastBitConverter.cs.meta
diff --git a/Common/Networking/Utils/NetConstants.cs b/src/Promul.Common/Networking/Utils/NetConstants.cs
similarity index 100%
rename from Common/Networking/Utils/NetConstants.cs
rename to src/Promul.Common/Networking/Utils/NetConstants.cs
diff --git a/Common/Networking/Utils/NetConstants.cs.meta b/src/Promul.Common/Networking/Utils/NetConstants.cs.meta
similarity index 100%
rename from Common/Networking/Utils/NetConstants.cs.meta
rename to src/Promul.Common/Networking/Utils/NetConstants.cs.meta
diff --git a/Common/Networking/Utils/NetUtils.cs b/src/Promul.Common/Networking/Utils/NetUtils.cs
similarity index 100%
rename from Common/Networking/Utils/NetUtils.cs
rename to src/Promul.Common/Networking/Utils/NetUtils.cs
diff --git a/Common/Networking/Utils/NetUtils.cs.meta b/src/Promul.Common/Networking/Utils/NetUtils.cs.meta
similarity index 100%
rename from Common/Networking/Utils/NetUtils.cs.meta
rename to src/Promul.Common/Networking/Utils/NetUtils.cs.meta
diff --git a/Common/Networking/Utils/NtpPacket.cs b/src/Promul.Common/Networking/Utils/NtpPacket.cs
similarity index 100%
rename from Common/Networking/Utils/NtpPacket.cs
rename to src/Promul.Common/Networking/Utils/NtpPacket.cs
diff --git a/Common/Networking/Utils/NtpPacket.cs.meta b/src/Promul.Common/Networking/Utils/NtpPacket.cs.meta
similarity index 100%
rename from Common/Networking/Utils/NtpPacket.cs.meta
rename to src/Promul.Common/Networking/Utils/NtpPacket.cs.meta
diff --git a/Common/Networking/Utils/NtpRequest.cs b/src/Promul.Common/Networking/Utils/NtpRequest.cs
similarity index 100%
rename from Common/Networking/Utils/NtpRequest.cs
rename to src/Promul.Common/Networking/Utils/NtpRequest.cs
diff --git a/Common/Networking/Utils/NtpRequest.cs.meta b/src/Promul.Common/Networking/Utils/NtpRequest.cs.meta
similarity index 100%
rename from Common/Networking/Utils/NtpRequest.cs.meta
rename to src/Promul.Common/Networking/Utils/NtpRequest.cs.meta
diff --git a/Common/Networking/Utils/Preserve.cs b/src/Promul.Common/Networking/Utils/Preserve.cs
similarity index 100%
rename from Common/Networking/Utils/Preserve.cs
rename to src/Promul.Common/Networking/Utils/Preserve.cs
diff --git a/Common/Networking/Utils/Preserve.cs.meta b/src/Promul.Common/Networking/Utils/Preserve.cs.meta
similarity index 100%
rename from Common/Networking/Utils/Preserve.cs.meta
rename to src/Promul.Common/Networking/Utils/Preserve.cs.meta
diff --git a/Common/Promul.Common.asmdef b/src/Promul.Common/Promul.Common.asmdef
similarity index 100%
rename from Common/Promul.Common.asmdef
rename to src/Promul.Common/Promul.Common.asmdef
diff --git a/Common/Promul.Common.asmdef.meta b/src/Promul.Common/Promul.Common.asmdef.meta
similarity index 100%
rename from Common/Promul.Common.asmdef.meta
rename to src/Promul.Common/Promul.Common.asmdef.meta
diff --git a/Common/Promul.Common.csproj b/src/Promul.Common/Promul.Common.csproj
similarity index 100%
rename from Common/Promul.Common.csproj
rename to src/Promul.Common/Promul.Common.csproj
diff --git a/Common/Promul.Common.csproj.meta b/src/Promul.Common/Promul.Common.csproj.meta
similarity index 100%
rename from Common/Promul.Common.csproj.meta
rename to src/Promul.Common/Promul.Common.csproj.meta
diff --git a/Common/Structs.meta b/src/Promul.Common/Structs.meta
similarity index 100%
rename from Common/Structs.meta
rename to src/Promul.Common/Structs.meta
diff --git a/Common/Structs/NetDataExtensions.cs b/src/Promul.Common/Structs/NetDataExtensions.cs
similarity index 100%
rename from Common/Structs/NetDataExtensions.cs
rename to src/Promul.Common/Structs/NetDataExtensions.cs
diff --git a/Common/Structs/NetDataExtensions.cs.meta b/src/Promul.Common/Structs/NetDataExtensions.cs.meta
similarity index 100%
rename from Common/Structs/NetDataExtensions.cs.meta
rename to src/Promul.Common/Structs/NetDataExtensions.cs.meta
diff --git a/Common/Structs/RelayControlMessage.cs b/src/Promul.Common/Structs/RelayControlMessage.cs
similarity index 100%
rename from Common/Structs/RelayControlMessage.cs
rename to src/Promul.Common/Structs/RelayControlMessage.cs
diff --git a/Common/Structs/RelayControlMessage.cs.meta b/src/Promul.Common/Structs/RelayControlMessage.cs.meta
similarity index 100%
rename from Common/Structs/RelayControlMessage.cs.meta
rename to src/Promul.Common/Structs/RelayControlMessage.cs.meta
diff --git a/Common/Structs/RelayControlMessageType.cs b/src/Promul.Common/Structs/RelayControlMessageType.cs
similarity index 100%
rename from Common/Structs/RelayControlMessageType.cs
rename to src/Promul.Common/Structs/RelayControlMessageType.cs
diff --git a/Common/Structs/RelayControlMessageType.cs.meta b/src/Promul.Common/Structs/RelayControlMessageType.cs.meta
similarity index 100%
rename from Common/Structs/RelayControlMessageType.cs.meta
rename to src/Promul.Common/Structs/RelayControlMessageType.cs.meta
diff --git a/Runtime/Promul.Runtime.csproj b/src/Promul.Runtime.Unity/Promul.Runtime.Unity.csproj
similarity index 87%
rename from Runtime/Promul.Runtime.csproj
rename to src/Promul.Runtime.Unity/Promul.Runtime.Unity.csproj
index cff4300..0f3b2e1 100644
--- a/Runtime/Promul.Runtime.csproj
+++ b/src/Promul.Runtime.Unity/Promul.Runtime.Unity.csproj
@@ -1,8 +1,6 @@
- Promul.Runtime
- Promul.Runtimenetstandard2.15128
@@ -10,6 +8,7 @@
bin~obj~DEBUG
+ Promul.Runtime.Unity
@@ -21,7 +20,7 @@
-
+ {009a3a68-30a0-44eb-9b42-8fcb6bd89195}Promul.Common
diff --git a/Runtime/Promul.Runtime.csproj.meta b/src/Promul.Runtime.Unity/Promul.Runtime.Unity.csproj.meta
similarity index 100%
rename from Runtime/Promul.Runtime.csproj.meta
rename to src/Promul.Runtime.Unity/Promul.Runtime.Unity.csproj.meta
diff --git a/Runtime/PromulTransport.cs b/src/Promul.Runtime.Unity/PromulTransport.cs
similarity index 100%
rename from Runtime/PromulTransport.cs
rename to src/Promul.Runtime.Unity/PromulTransport.cs
diff --git a/Runtime/PromulTransport.cs.meta b/src/Promul.Runtime.Unity/PromulTransport.cs.meta
similarity index 100%
rename from Runtime/PromulTransport.cs.meta
rename to src/Promul.Runtime.Unity/PromulTransport.cs.meta
diff --git a/Runtime/Properties.meta b/src/Promul.Runtime.Unity/Properties.meta
similarity index 100%
rename from Runtime/Properties.meta
rename to src/Promul.Runtime.Unity/Properties.meta
diff --git a/Runtime/com.fireworkeyes.netcode.transport.promul.asmdef b/src/Promul.Runtime.Unity/com.fireworkeyes.netcode.transport.promul.asmdef
similarity index 100%
rename from Runtime/com.fireworkeyes.netcode.transport.promul.asmdef
rename to src/Promul.Runtime.Unity/com.fireworkeyes.netcode.transport.promul.asmdef
diff --git a/Runtime/com.fireworkeyes.netcode.transport.promul.asmdef.meta b/src/Promul.Runtime.Unity/com.fireworkeyes.netcode.transport.promul.asmdef.meta
similarity index 100%
rename from Runtime/com.fireworkeyes.netcode.transport.promul.asmdef.meta
rename to src/Promul.Runtime.Unity/com.fireworkeyes.netcode.transport.promul.asmdef.meta
diff --git a/Runtime/csc.rsp b/src/Promul.Runtime.Unity/csc.rsp
similarity index 100%
rename from Runtime/csc.rsp
rename to src/Promul.Runtime.Unity/csc.rsp
diff --git a/Runtime/csc.rsp.meta b/src/Promul.Runtime.Unity/csc.rsp.meta
similarity index 100%
rename from Runtime/csc.rsp.meta
rename to src/Promul.Runtime.Unity/csc.rsp.meta
diff --git a/Server~/Bruno API Collection/Sessions/Create Session.bru b/src/Promul.Server~/Bruno API Collection/Sessions/Create Session.bru
similarity index 100%
rename from Server~/Bruno API Collection/Sessions/Create Session.bru
rename to src/Promul.Server~/Bruno API Collection/Sessions/Create Session.bru
diff --git a/Server~/Bruno API Collection/Sessions/Join Session.bru b/src/Promul.Server~/Bruno API Collection/Sessions/Join Session.bru
similarity index 100%
rename from Server~/Bruno API Collection/Sessions/Join Session.bru
rename to src/Promul.Server~/Bruno API Collection/Sessions/Join Session.bru
diff --git a/Server~/Bruno API Collection/bruno.json b/src/Promul.Server~/Bruno API Collection/bruno.json
similarity index 100%
rename from Server~/Bruno API Collection/bruno.json
rename to src/Promul.Server~/Bruno API Collection/bruno.json
diff --git a/Server~/Bruno API Collection/environments/Promul Localhost.bru b/src/Promul.Server~/Bruno API Collection/environments/Promul Localhost.bru
similarity index 100%
rename from Server~/Bruno API Collection/environments/Promul Localhost.bru
rename to src/Promul.Server~/Bruno API Collection/environments/Promul Localhost.bru
diff --git a/Server~/Controllers/SessionController.cs b/src/Promul.Server~/Controllers/SessionController.cs
similarity index 100%
rename from Server~/Controllers/SessionController.cs
rename to src/Promul.Server~/Controllers/SessionController.cs
diff --git a/Server~/Dockerfile b/src/Promul.Server~/Dockerfile
similarity index 100%
rename from Server~/Dockerfile
rename to src/Promul.Server~/Dockerfile
diff --git a/Server~/Models/Sessions/SessionInfo.cs b/src/Promul.Server~/Models/Sessions/SessionInfo.cs
similarity index 100%
rename from Server~/Models/Sessions/SessionInfo.cs
rename to src/Promul.Server~/Models/Sessions/SessionInfo.cs
diff --git a/Server~/Pages/Index.cshtml b/src/Promul.Server~/Pages/Index.cshtml
similarity index 100%
rename from Server~/Pages/Index.cshtml
rename to src/Promul.Server~/Pages/Index.cshtml
diff --git a/Server~/Pages/Index.cshtml.cs b/src/Promul.Server~/Pages/Index.cshtml.cs
similarity index 100%
rename from Server~/Pages/Index.cshtml.cs
rename to src/Promul.Server~/Pages/Index.cshtml.cs
diff --git a/Server~/Pages/Layout.cshtml b/src/Promul.Server~/Pages/Layout.cshtml
similarity index 100%
rename from Server~/Pages/Layout.cshtml
rename to src/Promul.Server~/Pages/Layout.cshtml
diff --git a/Server~/Program.cs b/src/Promul.Server~/Program.cs
similarity index 100%
rename from Server~/Program.cs
rename to src/Promul.Server~/Program.cs
diff --git a/Server~/Promul.Server.csproj b/src/Promul.Server~/Promul.Server.csproj
similarity index 87%
rename from Server~/Promul.Server.csproj
rename to src/Promul.Server~/Promul.Server.csproj
index cdfa0b9..b5bb940 100644
--- a/Server~/Promul.Server.csproj
+++ b/src/Promul.Server~/Promul.Server.csproj
@@ -18,13 +18,13 @@
.dockerignore
-
+
README.md
-
+
diff --git a/Server~/Properties/launchSettings.json b/src/Promul.Server~/Properties/launchSettings.json
similarity index 100%
rename from Server~/Properties/launchSettings.json
rename to src/Promul.Server~/Properties/launchSettings.json
diff --git a/Server~/Relay/RelayServer.cs b/src/Promul.Server~/Relay/RelayServer.cs
similarity index 100%
rename from Server~/Relay/RelayServer.cs
rename to src/Promul.Server~/Relay/RelayServer.cs
diff --git a/Server~/Relay/RelayServerHostedService.cs b/src/Promul.Server~/Relay/RelayServerHostedService.cs
similarity index 100%
rename from Server~/Relay/RelayServerHostedService.cs
rename to src/Promul.Server~/Relay/RelayServerHostedService.cs
diff --git a/Server~/Relay/Sessions/RelaySession.cs b/src/Promul.Server~/Relay/Sessions/RelaySession.cs
similarity index 100%
rename from Server~/Relay/Sessions/RelaySession.cs
rename to src/Promul.Server~/Relay/Sessions/RelaySession.cs
diff --git a/Demo~/appsettings.Development.json b/src/Promul.Server~/appsettings.Development.json
similarity index 100%
rename from Demo~/appsettings.Development.json
rename to src/Promul.Server~/appsettings.Development.json
diff --git a/Demo~/appsettings.json b/src/Promul.Server~/appsettings.json
similarity index 100%
rename from Demo~/appsettings.json
rename to src/Promul.Server~/appsettings.json
diff --git a/test.meta b/test.meta
new file mode 100644
index 0000000..7cd2b09
--- /dev/null
+++ b/test.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28b3292e2e00aa04b8e91c89110e593c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Demo~/Program.cs b/test~/Promul.Demo/Program.cs
similarity index 100%
rename from Demo~/Program.cs
rename to test~/Promul.Demo/Program.cs
diff --git a/Demo~/Promul.Demo.csproj b/test~/Promul.Demo/Promul.Demo.csproj
similarity index 86%
rename from Demo~/Promul.Demo.csproj
rename to test~/Promul.Demo/Promul.Demo.csproj
index 0d9f8f5..c0645ef 100644
--- a/Demo~/Promul.Demo.csproj
+++ b/test~/Promul.Demo/Promul.Demo.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/Server~/appsettings.Development.json b/test~/Promul.Demo/appsettings.Development.json
similarity index 100%
rename from Server~/appsettings.Development.json
rename to test~/Promul.Demo/appsettings.Development.json
diff --git a/Server~/appsettings.json b/test~/Promul.Demo/appsettings.json
similarity index 100%
rename from Server~/appsettings.json
rename to test~/Promul.Demo/appsettings.json
diff --git a/Tests~/Contexts/ManagerGroup.cs b/test~/Promul.Tests/Contexts/ManagerGroup.cs
similarity index 100%
rename from Tests~/Contexts/ManagerGroup.cs
rename to test~/Promul.Tests/Contexts/ManagerGroup.cs
diff --git a/Tests~/Contexts/ManagerTestable.cs b/test~/Promul.Tests/Contexts/ManagerTestable.cs
similarity index 100%
rename from Tests~/Contexts/ManagerTestable.cs
rename to test~/Promul.Tests/Contexts/ManagerTestable.cs
diff --git a/Tests~/Contexts/TestConstants.cs b/test~/Promul.Tests/Contexts/TestConstants.cs
similarity index 100%
rename from Tests~/Contexts/TestConstants.cs
rename to test~/Promul.Tests/Contexts/TestConstants.cs
diff --git a/Tests~/GlobalUsings.cs b/test~/Promul.Tests/GlobalUsings.cs
similarity index 100%
rename from Tests~/GlobalUsings.cs
rename to test~/Promul.Tests/GlobalUsings.cs
diff --git a/Tests~/NetworkCoreTests/ConcurrentLoadTests.cs b/test~/Promul.Tests/NetworkCoreTests/ConcurrentLoadTests.cs
similarity index 100%
rename from Tests~/NetworkCoreTests/ConcurrentLoadTests.cs
rename to test~/Promul.Tests/NetworkCoreTests/ConcurrentLoadTests.cs
diff --git a/Tests~/NetworkCoreTests/KeyAndSmallDataTests.cs b/test~/Promul.Tests/NetworkCoreTests/KeyAndSmallDataTests.cs
similarity index 100%
rename from Tests~/NetworkCoreTests/KeyAndSmallDataTests.cs
rename to test~/Promul.Tests/NetworkCoreTests/KeyAndSmallDataTests.cs
diff --git a/Tests~/NetworkCoreTests/LargeDataTests.cs b/test~/Promul.Tests/NetworkCoreTests/LargeDataTests.cs
similarity index 100%
rename from Tests~/NetworkCoreTests/LargeDataTests.cs
rename to test~/Promul.Tests/NetworkCoreTests/LargeDataTests.cs
diff --git a/Tests~/NetworkCoreTests/MtuTests.cs b/test~/Promul.Tests/NetworkCoreTests/MtuTests.cs
similarity index 100%
rename from Tests~/NetworkCoreTests/MtuTests.cs
rename to test~/Promul.Tests/NetworkCoreTests/MtuTests.cs
diff --git a/Tests~/NetworkCoreTests/OrderTests.cs b/test~/Promul.Tests/NetworkCoreTests/OrderTests.cs
similarity index 100%
rename from Tests~/NetworkCoreTests/OrderTests.cs
rename to test~/Promul.Tests/NetworkCoreTests/OrderTests.cs
diff --git a/Tests~/NetworkCoreTests/ShutdownTests.cs b/test~/Promul.Tests/NetworkCoreTests/ShutdownTests.cs
similarity index 100%
rename from Tests~/NetworkCoreTests/ShutdownTests.cs
rename to test~/Promul.Tests/NetworkCoreTests/ShutdownTests.cs
diff --git a/Tests~/Promul.Tests.csproj b/test~/Promul.Tests/Promul.Tests.csproj
similarity index 83%
rename from Tests~/Promul.Tests.csproj
rename to test~/Promul.Tests/Promul.Tests.csproj
index f850137..10f9b65 100644
--- a/Tests~/Promul.Tests.csproj
+++ b/test~/Promul.Tests/Promul.Tests.csproj
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/Tests~/RelayManagerTests/IntegrationTests.cs b/test~/Promul.Tests/RelayManagerTests/IntegrationTests.cs
similarity index 100%
rename from Tests~/RelayManagerTests/IntegrationTests.cs
rename to test~/Promul.Tests/RelayManagerTests/IntegrationTests.cs
diff --git a/Tests~/RelayTests/RelayTests.cs b/test~/Promul.Tests/RelayTests/RelayTests.cs
similarity index 100%
rename from Tests~/RelayTests/RelayTests.cs
rename to test~/Promul.Tests/RelayTests/RelayTests.cs