diff --git a/Void.slnx b/Void.slnx
index 965dec6..1650c5e 100644
--- a/Void.slnx
+++ b/Void.slnx
@@ -4,12 +4,12 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Proxy/API/Crypto/ICryptoService.cs b/src/API/Crypto/ICryptoService.cs
similarity index 100%
rename from src/Proxy/API/Crypto/ICryptoService.cs
rename to src/API/Crypto/ICryptoService.cs
diff --git a/src/Proxy/API/Events/Handshake/SearchChannelBuilderEvent.cs b/src/API/Events/Handshake/SearchChannelBuilderEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Handshake/SearchChannelBuilderEvent.cs
rename to src/API/Events/Handshake/SearchChannelBuilderEvent.cs
diff --git a/src/Proxy/API/Events/IEvent.cs b/src/API/Events/IEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/IEvent.cs
rename to src/API/Events/IEvent.cs
diff --git a/src/Proxy/API/Events/IEventListener.cs b/src/API/Events/IEventListener.cs
similarity index 100%
rename from src/Proxy/API/Events/IEventListener.cs
rename to src/API/Events/IEventListener.cs
diff --git a/src/Proxy/API/Events/Links/CreateLinkEvent.cs b/src/API/Events/Links/CreateLinkEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Links/CreateLinkEvent.cs
rename to src/API/Events/Links/CreateLinkEvent.cs
diff --git a/src/Proxy/API/Events/Links/LinkStartedEvent.cs b/src/API/Events/Links/LinkStartedEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Links/LinkStartedEvent.cs
rename to src/API/Events/Links/LinkStartedEvent.cs
diff --git a/src/Proxy/API/Events/Links/LinkStartingEvent.cs b/src/API/Events/Links/LinkStartingEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Links/LinkStartingEvent.cs
rename to src/API/Events/Links/LinkStartingEvent.cs
diff --git a/src/Proxy/API/Events/Links/LinkStoppedEvent.cs b/src/API/Events/Links/LinkStoppedEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Links/LinkStoppedEvent.cs
rename to src/API/Events/Links/LinkStoppedEvent.cs
diff --git a/src/Proxy/API/Events/Links/LinkStoppingEvent.cs b/src/API/Events/Links/LinkStoppingEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Links/LinkStoppingEvent.cs
rename to src/API/Events/Links/LinkStoppingEvent.cs
diff --git a/src/Proxy/API/Events/Network/MessageReceivedEvent.cs b/src/API/Events/Network/MessageReceivedEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Network/MessageReceivedEvent.cs
rename to src/API/Events/Network/MessageReceivedEvent.cs
diff --git a/src/Proxy/API/Events/Network/MessageSentEvent.cs b/src/API/Events/Network/MessageSentEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Network/MessageSentEvent.cs
rename to src/API/Events/Network/MessageSentEvent.cs
diff --git a/src/Proxy/API/Events/Player/PlayerConnectedEvent.cs b/src/API/Events/Player/PlayerConnectedEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Player/PlayerConnectedEvent.cs
rename to src/API/Events/Player/PlayerConnectedEvent.cs
diff --git a/src/Proxy/API/Events/Player/PlayerDisconnectedEvent.cs b/src/API/Events/Player/PlayerDisconnectedEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Player/PlayerDisconnectedEvent.cs
rename to src/API/Events/Player/PlayerDisconnectedEvent.cs
diff --git a/src/Proxy/API/Events/Player/PlayerSearchServerEvent.cs b/src/API/Events/Player/PlayerSearchServerEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Player/PlayerSearchServerEvent.cs
rename to src/API/Events/Player/PlayerSearchServerEvent.cs
diff --git a/src/Proxy/API/Events/Plugins/PluginLoadEvent.cs b/src/API/Events/Plugins/PluginLoadEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Plugins/PluginLoadEvent.cs
rename to src/API/Events/Plugins/PluginLoadEvent.cs
diff --git a/src/Proxy/API/Events/Plugins/PluginUnloadEvent.cs b/src/API/Events/Plugins/PluginUnloadEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Plugins/PluginUnloadEvent.cs
rename to src/API/Events/Plugins/PluginUnloadEvent.cs
diff --git a/src/Proxy/API/Events/Proxy/ProxyStartedEvent.cs b/src/API/Events/Proxy/ProxyStartedEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Proxy/ProxyStartedEvent.cs
rename to src/API/Events/Proxy/ProxyStartedEvent.cs
diff --git a/src/Proxy/API/Events/Proxy/ProxyStartingEvent.cs b/src/API/Events/Proxy/ProxyStartingEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Proxy/ProxyStartingEvent.cs
rename to src/API/Events/Proxy/ProxyStartingEvent.cs
diff --git a/src/Proxy/API/Events/Proxy/ProxyStoppedEvent.cs b/src/API/Events/Proxy/ProxyStoppedEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Proxy/ProxyStoppedEvent.cs
rename to src/API/Events/Proxy/ProxyStoppedEvent.cs
diff --git a/src/Proxy/API/Events/Proxy/ProxyStoppingEvent.cs b/src/API/Events/Proxy/ProxyStoppingEvent.cs
similarity index 100%
rename from src/Proxy/API/Events/Proxy/ProxyStoppingEvent.cs
rename to src/API/Events/Proxy/ProxyStoppingEvent.cs
diff --git a/src/Proxy/API/Events/Services/IEventService.cs b/src/API/Events/Services/IEventService.cs
similarity index 100%
rename from src/Proxy/API/Events/Services/IEventService.cs
rename to src/API/Events/Services/IEventService.cs
diff --git a/src/Proxy/API/Events/SubscribeAttribute.cs b/src/API/Events/SubscribeAttribute.cs
similarity index 100%
rename from src/Proxy/API/Events/SubscribeAttribute.cs
rename to src/API/Events/SubscribeAttribute.cs
diff --git a/src/Proxy/API/Extensions/HostingJsonOptionsExtensions.cs b/src/API/Extensions/HostingJsonOptionsExtensions.cs
similarity index 100%
rename from src/Proxy/API/Extensions/HostingJsonOptionsExtensions.cs
rename to src/API/Extensions/HostingJsonOptionsExtensions.cs
diff --git a/src/Proxy/API/Extensions/TaskExtensions.cs b/src/API/Extensions/TaskExtensions.cs
similarity index 100%
rename from src/Proxy/API/Extensions/TaskExtensions.cs
rename to src/API/Extensions/TaskExtensions.cs
diff --git a/src/Proxy/API/Forwarding/IForwarding.cs b/src/API/Forwarding/IForwarding.cs
similarity index 100%
rename from src/Proxy/API/Forwarding/IForwarding.cs
rename to src/API/Forwarding/IForwarding.cs
diff --git a/src/Proxy/API/Forwarding/IForwardingService.cs b/src/API/Forwarding/IForwardingService.cs
similarity index 100%
rename from src/Proxy/API/Forwarding/IForwardingService.cs
rename to src/API/Forwarding/IForwardingService.cs
diff --git a/src/Proxy/API/IProxy.cs b/src/API/IProxy.cs
similarity index 100%
rename from src/Proxy/API/IProxy.cs
rename to src/API/IProxy.cs
diff --git a/src/Proxy/API/Links/ILink.cs b/src/API/Links/ILink.cs
similarity index 100%
rename from src/Proxy/API/Links/ILink.cs
rename to src/API/Links/ILink.cs
diff --git a/src/Proxy/API/Links/ILinkService.cs b/src/API/Links/ILinkService.cs
similarity index 100%
rename from src/Proxy/API/Links/ILinkService.cs
rename to src/API/Links/ILinkService.cs
diff --git a/src/Proxy/API/Network/Direction.cs b/src/API/Network/Direction.cs
similarity index 100%
rename from src/Proxy/API/Network/Direction.cs
rename to src/API/Network/Direction.cs
diff --git a/src/Proxy/API/Network/IO/Buffers/MinecraftBackingBuffer.cs b/src/API/Network/IO/Buffers/MinecraftBackingBuffer.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Buffers/MinecraftBackingBuffer.cs
rename to src/API/Network/IO/Buffers/MinecraftBackingBuffer.cs
diff --git a/src/Proxy/API/Network/IO/Buffers/MinecraftBuffer.cs b/src/API/Network/IO/Buffers/MinecraftBuffer.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Buffers/MinecraftBuffer.cs
rename to src/API/Network/IO/Buffers/MinecraftBuffer.cs
diff --git a/src/Proxy/API/Network/IO/Buffers/ReadOnly/ReadOnlySequenceBackingBuffer.cs b/src/API/Network/IO/Buffers/ReadOnly/ReadOnlySequenceBackingBuffer.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Buffers/ReadOnly/ReadOnlySequenceBackingBuffer.cs
rename to src/API/Network/IO/Buffers/ReadOnly/ReadOnlySequenceBackingBuffer.cs
diff --git a/src/Proxy/API/Network/IO/Buffers/ReadOnly/ReadOnlySpanBackingBuffer.cs b/src/API/Network/IO/Buffers/ReadOnly/ReadOnlySpanBackingBuffer.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Buffers/ReadOnly/ReadOnlySpanBackingBuffer.cs
rename to src/API/Network/IO/Buffers/ReadOnly/ReadOnlySpanBackingBuffer.cs
diff --git a/src/Proxy/API/Network/IO/Buffers/ReadWrite/SpanBackingBuffer.cs b/src/API/Network/IO/Buffers/ReadWrite/SpanBackingBuffer.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Buffers/ReadWrite/SpanBackingBuffer.cs
rename to src/API/Network/IO/Buffers/ReadWrite/SpanBackingBuffer.cs
diff --git a/src/Proxy/API/Network/IO/Channels/IMinecraftChannel.cs b/src/API/Network/IO/Channels/IMinecraftChannel.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Channels/IMinecraftChannel.cs
rename to src/API/Network/IO/Channels/IMinecraftChannel.cs
diff --git a/src/Proxy/API/Network/IO/Channels/SimpleMinecraftChannel.cs b/src/API/Network/IO/Channels/SimpleMinecraftChannel.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Channels/SimpleMinecraftChannel.cs
rename to src/API/Network/IO/Channels/SimpleMinecraftChannel.cs
diff --git a/src/Proxy/API/Network/IO/Messages/BinaryPacket.cs b/src/API/Network/IO/Messages/BinaryPacket.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Messages/BinaryPacket.cs
rename to src/API/Network/IO/Messages/BinaryPacket.cs
diff --git a/src/Proxy/API/Network/IO/Messages/BufferedBinaryMessage.cs b/src/API/Network/IO/Messages/BufferedBinaryMessage.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Messages/BufferedBinaryMessage.cs
rename to src/API/Network/IO/Messages/BufferedBinaryMessage.cs
diff --git a/src/Proxy/API/Network/IO/Messages/CompleteBinaryMessage.cs b/src/API/Network/IO/Messages/CompleteBinaryMessage.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Messages/CompleteBinaryMessage.cs
rename to src/API/Network/IO/Messages/CompleteBinaryMessage.cs
diff --git a/src/Proxy/API/Network/IO/Messages/IMinecraftMessage.cs b/src/API/Network/IO/Messages/IMinecraftMessage.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Messages/IMinecraftMessage.cs
rename to src/API/Network/IO/Messages/IMinecraftMessage.cs
diff --git a/src/Proxy/API/Network/IO/Messages/IMinecraftPacket.cs b/src/API/Network/IO/Messages/IMinecraftPacket.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Messages/IMinecraftPacket.cs
rename to src/API/Network/IO/Messages/IMinecraftPacket.cs
diff --git a/src/Proxy/API/Network/IO/Streams/Compression/IZlibCompressionStream.cs b/src/API/Network/IO/Streams/Compression/IZlibCompressionStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/Compression/IZlibCompressionStream.cs
rename to src/API/Network/IO/Streams/Compression/IZlibCompressionStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/Compression/IonicZlibCompressionMessageStream.cs b/src/API/Network/IO/Streams/Compression/IonicZlibCompressionMessageStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/Compression/IonicZlibCompressionMessageStream.cs
rename to src/API/Network/IO/Streams/Compression/IonicZlibCompressionMessageStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/Compression/SharpZipLibCompressionMessageStream.cs b/src/API/Network/IO/Streams/Compression/SharpZipLibCompressionMessageStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/Compression/SharpZipLibCompressionMessageStream.cs
rename to src/API/Network/IO/Streams/Compression/SharpZipLibCompressionMessageStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/Encryption/AesCfb8BufferedStream.cs b/src/API/Network/IO/Streams/Encryption/AesCfb8BufferedStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/Encryption/AesCfb8BufferedStream.cs
rename to src/API/Network/IO/Streams/Encryption/AesCfb8BufferedStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/Extensions/ManualStreamExtensions.cs b/src/API/Network/IO/Streams/Extensions/ManualStreamExtensions.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/Extensions/ManualStreamExtensions.cs
rename to src/API/Network/IO/Streams/Extensions/ManualStreamExtensions.cs
diff --git a/src/Proxy/API/Network/IO/Streams/IMinecraftBufferedMessageStream.cs b/src/API/Network/IO/Streams/IMinecraftBufferedMessageStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/IMinecraftBufferedMessageStream.cs
rename to src/API/Network/IO/Streams/IMinecraftBufferedMessageStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/IMinecraftCompleteMessageStream.cs b/src/API/Network/IO/Streams/IMinecraftCompleteMessageStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/IMinecraftCompleteMessageStream.cs
rename to src/API/Network/IO/Streams/IMinecraftCompleteMessageStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/IMinecraftManualStream.cs b/src/API/Network/IO/Streams/IMinecraftManualStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/IMinecraftManualStream.cs
rename to src/API/Network/IO/Streams/IMinecraftManualStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/IMinecraftNetworkStream.cs b/src/API/Network/IO/Streams/IMinecraftNetworkStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/IMinecraftNetworkStream.cs
rename to src/API/Network/IO/Streams/IMinecraftNetworkStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/IMinecraftPacketMessageStream.cs b/src/API/Network/IO/Streams/IMinecraftPacketMessageStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/IMinecraftPacketMessageStream.cs
rename to src/API/Network/IO/Streams/IMinecraftPacketMessageStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/IMinecraftStream.cs b/src/API/Network/IO/Streams/IMinecraftStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/IMinecraftStream.cs
rename to src/API/Network/IO/Streams/IMinecraftStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/IMinecraftStreamBase.cs b/src/API/Network/IO/Streams/IMinecraftStreamBase.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/IMinecraftStreamBase.cs
rename to src/API/Network/IO/Streams/IMinecraftStreamBase.cs
diff --git a/src/Proxy/API/Network/IO/Streams/MinecraftRecyclableStream.cs b/src/API/Network/IO/Streams/MinecraftRecyclableStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/MinecraftRecyclableStream.cs
rename to src/API/Network/IO/Streams/MinecraftRecyclableStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/Packet/MinecraftPacketMessageStream.cs b/src/API/Network/IO/Streams/Packet/MinecraftPacketMessageStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/Packet/MinecraftPacketMessageStream.cs
rename to src/API/Network/IO/Streams/Packet/MinecraftPacketMessageStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/SimpleNetworkStream.cs b/src/API/Network/IO/Streams/SimpleNetworkStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/SimpleNetworkStream.cs
rename to src/API/Network/IO/Streams/SimpleNetworkStream.cs
diff --git a/src/Proxy/API/Network/IO/Streams/Transparent/MinecraftTransparentMessageStream.cs b/src/API/Network/IO/Streams/Transparent/MinecraftTransparentMessageStream.cs
similarity index 100%
rename from src/Proxy/API/Network/IO/Streams/Transparent/MinecraftTransparentMessageStream.cs
rename to src/API/Network/IO/Streams/Transparent/MinecraftTransparentMessageStream.cs
diff --git a/src/Proxy/API/Network/Operation.cs b/src/API/Network/Operation.cs
similarity index 100%
rename from src/Proxy/API/Network/Operation.cs
rename to src/API/Network/Operation.cs
diff --git a/src/Proxy/API/Network/Protocol/PacketDecoder.cs b/src/API/Network/Protocol/PacketDecoder.cs
similarity index 100%
rename from src/Proxy/API/Network/Protocol/PacketDecoder.cs
rename to src/API/Network/Protocol/PacketDecoder.cs
diff --git a/src/Proxy/API/Network/Protocol/PacketMapping.cs b/src/API/Network/Protocol/PacketMapping.cs
similarity index 100%
rename from src/Proxy/API/Network/Protocol/PacketMapping.cs
rename to src/API/Network/Protocol/PacketMapping.cs
diff --git a/src/Proxy/API/Network/Protocol/ProtocolVersion.cs b/src/API/Network/Protocol/ProtocolVersion.cs
similarity index 100%
rename from src/Proxy/API/Network/Protocol/ProtocolVersion.cs
rename to src/API/Network/Protocol/ProtocolVersion.cs
diff --git a/src/Proxy/API/Network/Protocol/Services/ChannelBuilder.cs b/src/API/Network/Protocol/Services/ChannelBuilder.cs
similarity index 100%
rename from src/Proxy/API/Network/Protocol/Services/ChannelBuilder.cs
rename to src/API/Network/Protocol/Services/ChannelBuilder.cs
diff --git a/src/Proxy/API/Network/Protocol/Services/IChannelBuilderService.cs b/src/API/Network/Protocol/Services/IChannelBuilderService.cs
similarity index 100%
rename from src/Proxy/API/Network/Protocol/Services/IChannelBuilderService.cs
rename to src/API/Network/Protocol/Services/IChannelBuilderService.cs
diff --git a/src/Proxy/API/Network/Side.cs b/src/API/Network/Side.cs
similarity index 100%
rename from src/Proxy/API/Network/Side.cs
rename to src/API/Network/Side.cs
diff --git a/src/Proxy/API/Players/IPlayer.cs b/src/API/Players/IPlayer.cs
similarity index 100%
rename from src/Proxy/API/Players/IPlayer.cs
rename to src/API/Players/IPlayer.cs
diff --git a/src/Proxy/API/Players/IPlayerService.cs b/src/API/Players/IPlayerService.cs
similarity index 100%
rename from src/Proxy/API/Players/IPlayerService.cs
rename to src/API/Players/IPlayerService.cs
diff --git a/src/Proxy/API/Plugins/IPlugin.cs b/src/API/Plugins/IPlugin.cs
similarity index 100%
rename from src/Proxy/API/Plugins/IPlugin.cs
rename to src/API/Plugins/IPlugin.cs
diff --git a/src/Proxy/API/Plugins/IPluginService.cs b/src/API/Plugins/IPluginService.cs
similarity index 100%
rename from src/Proxy/API/Plugins/IPluginService.cs
rename to src/API/Plugins/IPluginService.cs
diff --git a/src/Proxy/API/Registries/Packets/IPacketRegistry.cs b/src/API/Registries/Packets/IPacketRegistry.cs
similarity index 100%
rename from src/Proxy/API/Registries/Packets/IPacketRegistry.cs
rename to src/API/Registries/Packets/IPacketRegistry.cs
diff --git a/src/Proxy/API/Registries/Packets/IPacketRegistryHolder.cs b/src/API/Registries/Packets/IPacketRegistryHolder.cs
similarity index 100%
rename from src/Proxy/API/Registries/Packets/IPacketRegistryHolder.cs
rename to src/API/Registries/Packets/IPacketRegistryHolder.cs
diff --git a/src/Proxy/API/Servers/IServer.cs b/src/API/Servers/IServer.cs
similarity index 100%
rename from src/Proxy/API/Servers/IServer.cs
rename to src/API/Servers/IServer.cs
diff --git a/src/Proxy/API/Servers/IServerService.cs b/src/API/Servers/IServerService.cs
similarity index 100%
rename from src/Proxy/API/Servers/IServerService.cs
rename to src/API/Servers/IServerService.cs
diff --git a/src/Proxy/API/Settings/ISettings.cs b/src/API/Settings/ISettings.cs
similarity index 100%
rename from src/Proxy/API/Settings/ISettings.cs
rename to src/API/Settings/ISettings.cs
diff --git a/src/Proxy/API/Void.Proxy.API.csproj b/src/API/Void.Proxy.API.csproj
similarity index 100%
rename from src/Proxy/API/Void.Proxy.API.csproj
rename to src/API/Void.Proxy.API.csproj
diff --git a/src/Benchmarks/Void.Benchmarks.csproj b/src/Benchmarks/Void.Benchmarks.csproj
index 7b1a4f7..bf41a07 100644
--- a/src/Benchmarks/Void.Benchmarks.csproj
+++ b/src/Benchmarks/Void.Benchmarks.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/Proxy/Platform-Deprecated/Commands/CommandExecutor.cs b/src/Platform-Deprecated/Commands/CommandExecutor.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Commands/CommandExecutor.cs
rename to src/Platform-Deprecated/Commands/CommandExecutor.cs
diff --git a/src/Proxy/Platform-Deprecated/Commands/ServerCommand.cs b/src/Platform-Deprecated/Commands/ServerCommand.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Commands/ServerCommand.cs
rename to src/Platform-Deprecated/Commands/ServerCommand.cs
diff --git a/src/Proxy/Platform-Deprecated/Configuration/Settings.cs b/src/Platform-Deprecated/Configuration/Settings.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Configuration/Settings.cs
rename to src/Platform-Deprecated/Configuration/Settings.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/General/Link.cs b/src/Platform-Deprecated/Models/General/Link.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/General/Link.cs
rename to src/Platform-Deprecated/Models/General/Link.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/General/Player.cs b/src/Platform-Deprecated/Models/General/Player.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/General/Player.cs
rename to src/Platform-Deprecated/Models/General/Player.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/General/Server.cs b/src/Platform-Deprecated/Models/General/Server.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/General/Server.cs
rename to src/Platform-Deprecated/Models/General/Server.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/General/ServerInfo.cs b/src/Platform-Deprecated/Models/General/ServerInfo.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/General/ServerInfo.cs
rename to src/Platform-Deprecated/Models/General/ServerInfo.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/Minecraft/Chat/ChatMessageType.cs b/src/Platform-Deprecated/Models/Minecraft/Chat/ChatMessageType.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/Minecraft/Chat/ChatMessageType.cs
rename to src/Platform-Deprecated/Models/Minecraft/Chat/ChatMessageType.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/Minecraft/Encryption/IdentifiedKey.cs b/src/Platform-Deprecated/Models/Minecraft/Encryption/IdentifiedKey.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/Minecraft/Encryption/IdentifiedKey.cs
rename to src/Platform-Deprecated/Models/Minecraft/Encryption/IdentifiedKey.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/Minecraft/Game/DimensionInfo.cs b/src/Platform-Deprecated/Models/Minecraft/Game/DimensionInfo.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/Minecraft/Game/DimensionInfo.cs
rename to src/Platform-Deprecated/Models/Minecraft/Game/DimensionInfo.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/Minecraft/Profile/GameProfile.cs b/src/Platform-Deprecated/Models/Minecraft/Profile/GameProfile.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/Minecraft/Profile/GameProfile.cs
rename to src/Platform-Deprecated/Models/Minecraft/Profile/GameProfile.cs
diff --git a/src/Proxy/Platform-Deprecated/Models/Minecraft/Profile/Property.cs b/src/Platform-Deprecated/Models/Minecraft/Profile/Property.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Models/Minecraft/Profile/Property.cs
rename to src/Platform-Deprecated/Models/Minecraft/Profile/Property.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Direction.cs b/src/Platform-Deprecated/Network/Direction.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Direction.cs
rename to src/Platform-Deprecated/Network/Direction.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/IO/Common/PacketStream.cs b/src/Platform-Deprecated/Network/IO/Common/PacketStream.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/IO/Common/PacketStream.cs
rename to src/Platform-Deprecated/Network/IO/Common/PacketStream.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/IO/Common/ReadWriteStream.cs b/src/Platform-Deprecated/Network/IO/Common/ReadWriteStream.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/IO/Common/ReadWriteStream.cs
rename to src/Platform-Deprecated/Network/IO/Common/ReadWriteStream.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/IO/Compression/DeprecatedCompressionStream.cs b/src/Platform-Deprecated/Network/IO/Compression/DeprecatedCompressionStream.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/IO/Compression/DeprecatedCompressionStream.cs
rename to src/Platform-Deprecated/Network/IO/Compression/DeprecatedCompressionStream.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/IO/Encryption/AesCfb8Stream.cs b/src/Platform-Deprecated/Network/IO/Encryption/AesCfb8Stream.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/IO/Encryption/AesCfb8Stream.cs
rename to src/Platform-Deprecated/Network/IO/Encryption/AesCfb8Stream.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/IO/MinecraftBuffer.cs b/src/Platform-Deprecated/Network/IO/MinecraftBuffer.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/IO/MinecraftBuffer.cs
rename to src/Platform-Deprecated/Network/IO/MinecraftBuffer.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/IO/MinecraftChannel.cs b/src/Platform-Deprecated/Network/IO/MinecraftChannel.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/IO/MinecraftChannel.cs
rename to src/Platform-Deprecated/Network/IO/MinecraftChannel.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/IO/MinecraftMessage.cs b/src/Platform-Deprecated/Network/IO/MinecraftMessage.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/IO/MinecraftMessage.cs
rename to src/Platform-Deprecated/Network/IO/MinecraftMessage.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/MinecraftNetworkExtensions.cs b/src/Platform-Deprecated/Network/MinecraftNetworkExtensions.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/MinecraftNetworkExtensions.cs
rename to src/Platform-Deprecated/Network/MinecraftNetworkExtensions.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/ClientType.cs b/src/Platform-Deprecated/Network/Protocol/ClientType.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/ClientType.cs
rename to src/Platform-Deprecated/Network/Protocol/ClientType.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forge/ForgeMarker.cs b/src/Platform-Deprecated/Network/Protocol/Forge/ForgeMarker.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forge/ForgeMarker.cs
rename to src/Platform-Deprecated/Network/Protocol/Forge/ForgeMarker.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forge/ForgeVersion.cs b/src/Platform-Deprecated/Network/Protocol/Forge/ForgeVersion.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forge/ForgeVersion.cs
rename to src/Platform-Deprecated/Network/Protocol/Forge/ForgeVersion.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/AutoForwarding.cs b/src/Platform-Deprecated/Network/Protocol/Forwarding/AutoForwarding.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/AutoForwarding.cs
rename to src/Platform-Deprecated/Network/Protocol/Forwarding/AutoForwarding.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/ForwardingMode.cs b/src/Platform-Deprecated/Network/Protocol/Forwarding/ForwardingMode.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/ForwardingMode.cs
rename to src/Platform-Deprecated/Network/Protocol/Forwarding/ForwardingMode.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/IForwarding.cs b/src/Platform-Deprecated/Network/Protocol/Forwarding/IForwarding.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/IForwarding.cs
rename to src/Platform-Deprecated/Network/Protocol/Forwarding/IForwarding.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/LegacyForwarding.cs b/src/Platform-Deprecated/Network/Protocol/Forwarding/LegacyForwarding.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/LegacyForwarding.cs
rename to src/Platform-Deprecated/Network/Protocol/Forwarding/LegacyForwarding.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/ModernForwarding.cs b/src/Platform-Deprecated/Network/Protocol/Forwarding/ModernForwarding.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/ModernForwarding.cs
rename to src/Platform-Deprecated/Network/Protocol/Forwarding/ModernForwarding.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/NoneForwarding.cs b/src/Platform-Deprecated/Network/Protocol/Forwarding/NoneForwarding.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Forwarding/NoneForwarding.cs
rename to src/Platform-Deprecated/Network/Protocol/Forwarding/NoneForwarding.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/DisconnectPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/DisconnectPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/DisconnectPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/DisconnectPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/EncryptionRequestPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/EncryptionRequestPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/EncryptionRequestPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/EncryptionRequestPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/FinishConfiguration.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/FinishConfiguration.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/FinishConfiguration.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/FinishConfiguration.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/JoinGamePacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/JoinGamePacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/JoinGamePacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/JoinGamePacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginPluginRequest.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginPluginRequest.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginPluginRequest.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginPluginRequest.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginSuccessPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginSuccessPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginSuccessPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/LoginSuccessPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/PlayerInfoUpdatePacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/PlayerInfoUpdatePacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/PlayerInfoUpdatePacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/PlayerInfoUpdatePacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/RespawnPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/RespawnPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/RespawnPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/RespawnPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SetCompressionPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SetCompressionPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SetCompressionPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SetCompressionPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/StartConfiguration.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/StartConfiguration.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/StartConfiguration.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/StartConfiguration.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SystemChatMessage.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SystemChatMessage.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SystemChatMessage.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Clientbound/SystemChatMessage.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/IMinecraftPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/IMinecraftPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/IMinecraftPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/IMinecraftPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/AcknowledgeConfiguration.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/AcknowledgeConfiguration.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/AcknowledgeConfiguration.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/AcknowledgeConfiguration.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/EncryptionResponsePacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/EncryptionResponsePacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/EncryptionResponsePacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/EncryptionResponsePacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/HandshakePacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/HandshakePacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/HandshakePacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/HandshakePacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatCommand.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatCommand.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatCommand.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatCommand.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatMessage.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatMessage.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatMessage.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/KeyedChatMessage.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginAcknowledgedPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginAcknowledgedPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginAcknowledgedPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginAcknowledgedPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginPluginResponse.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginPluginResponse.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginPluginResponse.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginPluginResponse.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginStartPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginStartPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginStartPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/LoginStartPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/PlayerSessionPacket.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/PlayerSessionPacket.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/PlayerSessionPacket.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/PlayerSessionPacket.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatCommand.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatCommand.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatCommand.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatCommand.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatMessage.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatMessage.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatMessage.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionChatMessage.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionLastSeenMessages.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionLastSeenMessages.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionLastSeenMessages.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Serverbound/SessionLastSeenMessages.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Shared/ChatMessage.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Shared/ChatMessage.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Shared/ChatMessage.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Shared/ChatMessage.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Shared/PluginMessage.cs b/src/Platform-Deprecated/Network/Protocol/Packets/Shared/PluginMessage.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Packets/Shared/PluginMessage.cs
rename to src/Platform-Deprecated/Network/Protocol/Packets/Shared/PluginMessage.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/ProtocolVersion.cs b/src/Platform-Deprecated/Network/Protocol/ProtocolVersion.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/ProtocolVersion.cs
rename to src/Platform-Deprecated/Network/Protocol/ProtocolVersion.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Registry/PacketMapping.cs b/src/Platform-Deprecated/Network/Protocol/Registry/PacketMapping.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Registry/PacketMapping.cs
rename to src/Platform-Deprecated/Network/Protocol/Registry/PacketMapping.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Registry/PacketRegistry.cs b/src/Platform-Deprecated/Network/Protocol/Registry/PacketRegistry.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Registry/PacketRegistry.cs
rename to src/Platform-Deprecated/Network/Protocol/Registry/PacketRegistry.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Registry/ProtocolRegisty.cs b/src/Platform-Deprecated/Network/Protocol/Registry/ProtocolRegisty.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Registry/ProtocolRegisty.cs
rename to src/Platform-Deprecated/Network/Protocol/Registry/ProtocolRegisty.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Registry/Registries.cs b/src/Platform-Deprecated/Network/Protocol/Registry/Registries.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Registry/Registries.cs
rename to src/Platform-Deprecated/Network/Protocol/Registry/Registries.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/Registry/StateRegistry.cs b/src/Platform-Deprecated/Network/Protocol/Registry/StateRegistry.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/Registry/StateRegistry.cs
rename to src/Platform-Deprecated/Network/Protocol/Registry/StateRegistry.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/ConfigurationState.cs b/src/Platform-Deprecated/Network/Protocol/States/Common/ConfigurationState.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/ConfigurationState.cs
rename to src/Platform-Deprecated/Network/Protocol/States/Common/ConfigurationState.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/HandshakeState.cs b/src/Platform-Deprecated/Network/Protocol/States/Common/HandshakeState.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/HandshakeState.cs
rename to src/Platform-Deprecated/Network/Protocol/States/Common/HandshakeState.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/LoginState.cs b/src/Platform-Deprecated/Network/Protocol/States/Common/LoginState.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/LoginState.cs
rename to src/Platform-Deprecated/Network/Protocol/States/Common/LoginState.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/PlayState.cs b/src/Platform-Deprecated/Network/Protocol/States/Common/PlayState.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/States/Common/PlayState.cs
rename to src/Platform-Deprecated/Network/Protocol/States/Common/PlayState.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/States/Custom/IConfigurePlayState.cs b/src/Platform-Deprecated/Network/Protocol/States/Custom/IConfigurePlayState.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/States/Custom/IConfigurePlayState.cs
rename to src/Platform-Deprecated/Network/Protocol/States/Custom/IConfigurePlayState.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/States/Custom/ILoginConfigurePlayState.cs b/src/Platform-Deprecated/Network/Protocol/States/Custom/ILoginConfigurePlayState.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/States/Custom/ILoginConfigurePlayState.cs
rename to src/Platform-Deprecated/Network/Protocol/States/Custom/ILoginConfigurePlayState.cs
diff --git a/src/Proxy/Platform-Deprecated/Network/Protocol/States/ProtocolState.cs b/src/Platform-Deprecated/Network/Protocol/States/ProtocolState.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Network/Protocol/States/ProtocolState.cs
rename to src/Platform-Deprecated/Network/Protocol/States/ProtocolState.cs
diff --git a/src/Proxy/Platform-Deprecated/Program.cs b/src/Platform-Deprecated/Program.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Program.cs
rename to src/Platform-Deprecated/Program.cs
diff --git a/src/Proxy/Platform-Deprecated/Properties/Resources.Designer.cs b/src/Platform-Deprecated/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Properties/Resources.Designer.cs
rename to src/Platform-Deprecated/Properties/Resources.Designer.cs
diff --git a/src/Proxy/Platform-Deprecated/Properties/Resources.resx b/src/Platform-Deprecated/Properties/Resources.resx
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Properties/Resources.resx
rename to src/Platform-Deprecated/Properties/Resources.resx
diff --git a/src/Proxy/Platform-Deprecated/Proxy.cs b/src/Platform-Deprecated/Proxy.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Proxy.cs
rename to src/Platform-Deprecated/Proxy.cs
diff --git a/src/Proxy/Platform-Deprecated/Resources/settings-defaults.txt b/src/Platform-Deprecated/Resources/settings-defaults.txt
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Resources/settings-defaults.txt
rename to src/Platform-Deprecated/Resources/settings-defaults.txt
diff --git a/src/Proxy/Platform-Deprecated/Utils/GuidHelper.cs b/src/Platform-Deprecated/Utils/GuidHelper.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Utils/GuidHelper.cs
rename to src/Platform-Deprecated/Utils/GuidHelper.cs
diff --git a/src/Proxy/Platform-Deprecated/Utils/JsonIPAddressConverter.cs b/src/Platform-Deprecated/Utils/JsonIPAddressConverter.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Utils/JsonIPAddressConverter.cs
rename to src/Platform-Deprecated/Utils/JsonIPAddressConverter.cs
diff --git a/src/Proxy/Platform-Deprecated/Utils/JsonIPEndPointConverter.cs b/src/Platform-Deprecated/Utils/JsonIPEndPointConverter.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Utils/JsonIPEndPointConverter.cs
rename to src/Platform-Deprecated/Utils/JsonIPEndPointConverter.cs
diff --git a/src/Proxy/Platform-Deprecated/Utils/SettingsDataFormatter.cs b/src/Platform-Deprecated/Utils/SettingsDataFormatter.cs
similarity index 100%
rename from src/Proxy/Platform-Deprecated/Utils/SettingsDataFormatter.cs
rename to src/Platform-Deprecated/Utils/SettingsDataFormatter.cs
diff --git a/src/Proxy/Platform-Deprecated/Void.Proxy-Deprecated.csproj b/src/Platform-Deprecated/Void.Proxy-Deprecated.csproj
similarity index 96%
rename from src/Proxy/Platform-Deprecated/Void.Proxy-Deprecated.csproj
rename to src/Platform-Deprecated/Void.Proxy-Deprecated.csproj
index ea34a3f..12ddb0a 100644
--- a/src/Proxy/Platform-Deprecated/Void.Proxy-Deprecated.csproj
+++ b/src/Platform-Deprecated/Void.Proxy-Deprecated.csproj
@@ -30,7 +30,7 @@
-
+
diff --git a/src/Proxy/Platform/Crypto/RsaCryptoService.cs b/src/Platform/Crypto/RsaCryptoService.cs
similarity index 100%
rename from src/Proxy/Platform/Crypto/RsaCryptoService.cs
rename to src/Platform/Crypto/RsaCryptoService.cs
diff --git a/src/Proxy/Platform/EntryPoint.cs b/src/Platform/EntryPoint.cs
similarity index 98%
rename from src/Proxy/Platform/EntryPoint.cs
rename to src/Platform/EntryPoint.cs
index 56c2590..dc98431 100644
--- a/src/Proxy/Platform/EntryPoint.cs
+++ b/src/Platform/EntryPoint.cs
@@ -25,7 +25,7 @@
using Void.Proxy.Settings;
if (OperatingSystem.IsWindows())
- Console.WindowWidth = 150;
+ Console.WindowWidth = 165;
Log.Logger = new LoggerConfiguration().Enrich.FromLogContext().MinimumLevel.ControlledBy(Platform.LoggingLevelSwitch).MinimumLevel.Override("Microsoft", LogEventLevel.Warning).WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj} {NewLine}{Exception}").CreateLogger();
diff --git a/src/Proxy/Platform/Events/EventService.cs b/src/Platform/Events/EventService.cs
similarity index 100%
rename from src/Proxy/Platform/Events/EventService.cs
rename to src/Platform/Events/EventService.cs
diff --git a/src/Proxy/Platform/Forwarding/ForwardingService.cs b/src/Platform/Forwarding/ForwardingService.cs
similarity index 100%
rename from src/Proxy/Platform/Forwarding/ForwardingService.cs
rename to src/Platform/Forwarding/ForwardingService.cs
diff --git a/src/Proxy/Platform/Forwarding/NoneForwarding.cs b/src/Platform/Forwarding/NoneForwarding.cs
similarity index 100%
rename from src/Proxy/Platform/Forwarding/NoneForwarding.cs
rename to src/Platform/Forwarding/NoneForwarding.cs
diff --git a/src/Proxy/Platform/Links/Link.cs b/src/Platform/Links/Link.cs
similarity index 100%
rename from src/Proxy/Platform/Links/Link.cs
rename to src/Platform/Links/Link.cs
diff --git a/src/Proxy/Platform/Links/LinkService.cs b/src/Platform/Links/LinkService.cs
similarity index 100%
rename from src/Proxy/Platform/Links/LinkService.cs
rename to src/Platform/Links/LinkService.cs
diff --git a/src/Proxy/Platform/Network/Protocol/ChannelBuilderService.cs b/src/Platform/Network/Protocol/ChannelBuilderService.cs
similarity index 100%
rename from src/Proxy/Platform/Network/Protocol/ChannelBuilderService.cs
rename to src/Platform/Network/Protocol/ChannelBuilderService.cs
diff --git a/src/Proxy/Platform/Platform.cs b/src/Platform/Platform.cs
similarity index 100%
rename from src/Proxy/Platform/Platform.cs
rename to src/Platform/Platform.cs
diff --git a/src/Proxy/Platform/Players/Player.cs b/src/Platform/Players/Player.cs
similarity index 100%
rename from src/Proxy/Platform/Players/Player.cs
rename to src/Platform/Players/Player.cs
diff --git a/src/Proxy/Platform/Players/PlayerService.cs b/src/Platform/Players/PlayerService.cs
similarity index 100%
rename from src/Proxy/Platform/Players/PlayerService.cs
rename to src/Platform/Players/PlayerService.cs
diff --git a/src/Proxy/Platform/Plugins/PluginService.cs b/src/Platform/Plugins/PluginService.cs
similarity index 100%
rename from src/Proxy/Platform/Plugins/PluginService.cs
rename to src/Platform/Plugins/PluginService.cs
diff --git a/src/Proxy/Platform/Properties/Resources.Designer.cs b/src/Platform/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Proxy/Platform/Properties/Resources.Designer.cs
rename to src/Platform/Properties/Resources.Designer.cs
diff --git a/src/Proxy/Platform/Properties/Resources.resx b/src/Platform/Properties/Resources.resx
similarity index 100%
rename from src/Proxy/Platform/Properties/Resources.resx
rename to src/Platform/Properties/Resources.resx
diff --git a/src/Proxy/Platform/Reflection/PluginLoadContext.cs b/src/Platform/Reflection/PluginLoadContext.cs
similarity index 100%
rename from src/Proxy/Platform/Reflection/PluginLoadContext.cs
rename to src/Platform/Reflection/PluginLoadContext.cs
diff --git a/src/Proxy/Platform/Reflection/WeakPluginReference.cs b/src/Platform/Reflection/WeakPluginReference.cs
similarity index 100%
rename from src/Proxy/Platform/Reflection/WeakPluginReference.cs
rename to src/Platform/Reflection/WeakPluginReference.cs
diff --git a/src/Proxy/Platform/Registries/Packets/PacketRegistryHolder.cs b/src/Platform/Registries/Packets/PacketRegistryHolder.cs
similarity index 100%
rename from src/Proxy/Platform/Registries/Packets/PacketRegistryHolder.cs
rename to src/Platform/Registries/Packets/PacketRegistryHolder.cs
diff --git a/src/Proxy/Platform/Resources/settings-defaults.txt b/src/Platform/Resources/settings-defaults.txt
similarity index 100%
rename from src/Proxy/Platform/Resources/settings-defaults.txt
rename to src/Platform/Resources/settings-defaults.txt
diff --git a/src/Proxy/Platform/Servers/Server.cs b/src/Platform/Servers/Server.cs
similarity index 100%
rename from src/Proxy/Platform/Servers/Server.cs
rename to src/Platform/Servers/Server.cs
diff --git a/src/Proxy/Platform/Servers/ServerService.cs b/src/Platform/Servers/ServerService.cs
similarity index 100%
rename from src/Proxy/Platform/Servers/ServerService.cs
rename to src/Platform/Servers/ServerService.cs
diff --git a/src/Proxy/Platform/Settings/Settings.cs b/src/Platform/Settings/Settings.cs
similarity index 100%
rename from src/Proxy/Platform/Settings/Settings.cs
rename to src/Platform/Settings/Settings.cs
diff --git a/src/Proxy/Platform/Utils/GuidHelper.cs b/src/Platform/Utils/GuidHelper.cs
similarity index 100%
rename from src/Proxy/Platform/Utils/GuidHelper.cs
rename to src/Platform/Utils/GuidHelper.cs
diff --git a/src/Proxy/Platform/Utils/JsonIPAddressConverter.cs b/src/Platform/Utils/JsonIPAddressConverter.cs
similarity index 100%
rename from src/Proxy/Platform/Utils/JsonIPAddressConverter.cs
rename to src/Platform/Utils/JsonIPAddressConverter.cs
diff --git a/src/Proxy/Platform/Utils/JsonIPEndPointConverter.cs b/src/Platform/Utils/JsonIPEndPointConverter.cs
similarity index 100%
rename from src/Proxy/Platform/Utils/JsonIPEndPointConverter.cs
rename to src/Platform/Utils/JsonIPEndPointConverter.cs
diff --git a/src/Proxy/Platform/Utils/SettingsDataFormatter.cs b/src/Platform/Utils/SettingsDataFormatter.cs
similarity index 100%
rename from src/Proxy/Platform/Utils/SettingsDataFormatter.cs
rename to src/Platform/Utils/SettingsDataFormatter.cs
diff --git a/src/Proxy/Platform/Void.Proxy.csproj b/src/Platform/Void.Proxy.csproj
similarity index 93%
rename from src/Proxy/Platform/Void.Proxy.csproj
rename to src/Platform/Void.Proxy.csproj
index f64daf9..04c8484 100644
--- a/src/Proxy/Platform/Void.Proxy.csproj
+++ b/src/Platform/Void.Proxy.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/src/Proxy/Plugins/ExamplePlugin/ExamplePlugin.cs b/src/Plugins/ExamplePlugin/ExamplePlugin.cs
similarity index 100%
rename from src/Proxy/Plugins/ExamplePlugin/ExamplePlugin.cs
rename to src/Plugins/ExamplePlugin/ExamplePlugin.cs
diff --git a/src/Proxy/Plugins/ExamplePlugin/Void.Proxy.Plugins.ExamplePlugin.csproj b/src/Plugins/ExamplePlugin/Void.Proxy.Plugins.ExamplePlugin.csproj
similarity index 100%
rename from src/Proxy/Plugins/ExamplePlugin/Void.Proxy.Plugins.ExamplePlugin.csproj
rename to src/Plugins/ExamplePlugin/Void.Proxy.Plugins.ExamplePlugin.csproj
diff --git a/src/Proxy/Plugins/ModsSupport/Forge/ForgeMarker.cs b/src/Plugins/ModsSupport/Forge/ForgeMarker.cs
similarity index 100%
rename from src/Proxy/Plugins/ModsSupport/Forge/ForgeMarker.cs
rename to src/Plugins/ModsSupport/Forge/ForgeMarker.cs
diff --git a/src/Proxy/Plugins/ModsSupport/Forge/Void.Proxy.Plugins.ModsSupport.Forge.csproj b/src/Plugins/ModsSupport/Forge/Void.Proxy.Plugins.ModsSupport.Forge.csproj
similarity index 100%
rename from src/Proxy/Plugins/ModsSupport/Forge/Void.Proxy.Plugins.ModsSupport.Forge.csproj
rename to src/Plugins/ModsSupport/Forge/Void.Proxy.Plugins.ModsSupport.Forge.csproj
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Plugin.cs b/src/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Plugin.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Plugin.cs
rename to src/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Plugin.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Void.Proxy.Plugins.ProtocolSupport.Java.v1_13_to_1_20_1.csproj b/src/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Void.Proxy.Plugins.ProtocolSupport.Java.v1_13_to_1_20_1.csproj
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Void.Proxy.Plugins.ProtocolSupport.Java.v1_13_to_1_20_1.csproj
rename to src/Plugins/ProtocolSupport/Java/v1_13_to_1_20_1/Void.Proxy.Plugins.ProtocolSupport.Java.v1_13_to_1_20_1.csproj
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/EncryptionRequestPacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/EncryptionRequestPacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/EncryptionRequestPacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/EncryptionRequestPacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/FinishConfigurationPacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/FinishConfigurationPacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/FinishConfigurationPacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/FinishConfigurationPacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/KeepAliveRequestPacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/KeepAliveRequestPacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/KeepAliveRequestPacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/KeepAliveRequestPacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/SetCompressionPacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/SetCompressionPacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/SetCompressionPacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Clientbound/SetCompressionPacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/EncryptionResponsePacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/EncryptionResponsePacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/EncryptionResponsePacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/EncryptionResponsePacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/HandshakePacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/HandshakePacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/HandshakePacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/HandshakePacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/KeepAliveResponsePacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/KeepAliveResponsePacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/KeepAliveResponsePacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/KeepAliveResponsePacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/LoginAcknowledgedPacket.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/LoginAcknowledgedPacket.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/LoginAcknowledgedPacket.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Packets/Serverbound/LoginAcknowledgedPacket.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Plugin.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Plugin.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Plugin.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Plugin.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/Mappings.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/Mappings.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/Mappings.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/Mappings.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/PacketRegistry.cs b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/PacketRegistry.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/PacketRegistry.cs
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Registries/PacketRegistry.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Void.Proxy.Plugins.ProtocolSupport.Java.v1_20_2_to_latest.csproj b/src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Void.Proxy.Plugins.ProtocolSupport.Java.v1_20_2_to_latest.csproj
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Void.Proxy.Plugins.ProtocolSupport.Java.v1_20_2_to_latest.csproj
rename to src/Plugins/ProtocolSupport/Java/v1_20_2_to_latest/Void.Proxy.Plugins.ProtocolSupport.Java.v1_20_2_to_latest.csproj
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Plugin.cs b/src/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Plugin.cs
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Plugin.cs
rename to src/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Plugin.cs
diff --git a/src/Proxy/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Void.Proxy.Plugins.ProtocolSupport.Java.v1_7_2_to_1_12_2.csproj b/src/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Void.Proxy.Plugins.ProtocolSupport.Java.v1_7_2_to_1_12_2.csproj
similarity index 100%
rename from src/Proxy/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Void.Proxy.Plugins.ProtocolSupport.Java.v1_7_2_to_1_12_2.csproj
rename to src/Plugins/ProtocolSupport/Java/v1_7_2_to_1_12_2/Void.Proxy.Plugins.ProtocolSupport.Java.v1_7_2_to_1_12_2.csproj