diff --git a/src/main/java/com/flowpowered/networking/AsyncableMessage.java b/src/main/java/com/flowpowered/network/AsyncableMessage.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/AsyncableMessage.java
rename to src/main/java/com/flowpowered/network/AsyncableMessage.java
diff --git a/src/main/java/com/flowpowered/networking/BasicChannelInitializer.java b/src/main/java/com/flowpowered/network/BasicChannelInitializer.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/BasicChannelInitializer.java
rename to src/main/java/com/flowpowered/network/BasicChannelInitializer.java
diff --git a/src/main/java/com/flowpowered/networking/Codec.java b/src/main/java/com/flowpowered/network/Codec.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/Codec.java
rename to src/main/java/com/flowpowered/network/Codec.java
diff --git a/src/main/java/com/flowpowered/networking/ConnectionManager.java b/src/main/java/com/flowpowered/network/ConnectionManager.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/ConnectionManager.java
rename to src/main/java/com/flowpowered/network/ConnectionManager.java
diff --git a/src/main/java/com/flowpowered/networking/Message.java b/src/main/java/com/flowpowered/network/Message.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/Message.java
rename to src/main/java/com/flowpowered/network/Message.java
diff --git a/src/main/java/com/flowpowered/networking/MessageHandler.java b/src/main/java/com/flowpowered/network/MessageHandler.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/MessageHandler.java
rename to src/main/java/com/flowpowered/network/MessageHandler.java
diff --git a/src/main/java/com/flowpowered/networking/NetworkClient.java b/src/main/java/com/flowpowered/network/NetworkClient.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/NetworkClient.java
rename to src/main/java/com/flowpowered/network/NetworkClient.java
diff --git a/src/main/java/com/flowpowered/networking/NetworkServer.java b/src/main/java/com/flowpowered/network/NetworkServer.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/NetworkServer.java
rename to src/main/java/com/flowpowered/network/NetworkServer.java
diff --git a/src/main/java/com/flowpowered/networking/exception/ChannelClosedException.java b/src/main/java/com/flowpowered/network/exception/ChannelClosedException.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/exception/ChannelClosedException.java
rename to src/main/java/com/flowpowered/network/exception/ChannelClosedException.java
diff --git a/src/main/java/com/flowpowered/networking/exception/IllegalOpcodeException.java b/src/main/java/com/flowpowered/network/exception/IllegalOpcodeException.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/exception/IllegalOpcodeException.java
rename to src/main/java/com/flowpowered/network/exception/IllegalOpcodeException.java
diff --git a/src/main/java/com/flowpowered/networking/exception/UnknownPacketException.java b/src/main/java/com/flowpowered/network/exception/UnknownPacketException.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/exception/UnknownPacketException.java
rename to src/main/java/com/flowpowered/network/exception/UnknownPacketException.java
diff --git a/src/main/java/com/flowpowered/networking/pipeline/MessageDecoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageDecoder.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/pipeline/MessageDecoder.java
rename to src/main/java/com/flowpowered/network/pipeline/MessageDecoder.java
diff --git a/src/main/java/com/flowpowered/networking/pipeline/MessageEncoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageEncoder.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/pipeline/MessageEncoder.java
rename to src/main/java/com/flowpowered/network/pipeline/MessageEncoder.java
diff --git a/src/main/java/com/flowpowered/networking/pipeline/MessageHandler.java b/src/main/java/com/flowpowered/network/pipeline/MessageHandler.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/pipeline/MessageHandler.java
rename to src/main/java/com/flowpowered/network/pipeline/MessageHandler.java
diff --git a/src/main/java/com/flowpowered/networking/pipeline/MessageProcessorDecoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageProcessorDecoder.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/pipeline/MessageProcessorDecoder.java
rename to src/main/java/com/flowpowered/network/pipeline/MessageProcessorDecoder.java
diff --git a/src/main/java/com/flowpowered/networking/pipeline/MessageProcessorEncoder.java b/src/main/java/com/flowpowered/network/pipeline/MessageProcessorEncoder.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/pipeline/MessageProcessorEncoder.java
rename to src/main/java/com/flowpowered/network/pipeline/MessageProcessorEncoder.java
diff --git a/src/main/java/com/flowpowered/networking/processor/MessageProcessor.java b/src/main/java/com/flowpowered/network/processor/MessageProcessor.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/processor/MessageProcessor.java
rename to src/main/java/com/flowpowered/network/processor/MessageProcessor.java
diff --git a/src/main/java/com/flowpowered/networking/processor/simple/SimpleMessageProcessor.java b/src/main/java/com/flowpowered/network/processor/simple/SimpleMessageProcessor.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/processor/simple/SimpleMessageProcessor.java
rename to src/main/java/com/flowpowered/network/processor/simple/SimpleMessageProcessor.java
diff --git a/src/main/java/com/flowpowered/networking/protocol/AbstractProtocol.java b/src/main/java/com/flowpowered/network/protocol/AbstractProtocol.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/protocol/AbstractProtocol.java
rename to src/main/java/com/flowpowered/network/protocol/AbstractProtocol.java
diff --git a/src/main/java/com/flowpowered/networking/protocol/Protocol.java b/src/main/java/com/flowpowered/network/protocol/Protocol.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/protocol/Protocol.java
rename to src/main/java/com/flowpowered/network/protocol/Protocol.java
diff --git a/src/main/java/com/flowpowered/networking/protocol/ProtocolRegistry.java b/src/main/java/com/flowpowered/network/protocol/ProtocolRegistry.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/protocol/ProtocolRegistry.java
rename to src/main/java/com/flowpowered/network/protocol/ProtocolRegistry.java
diff --git a/src/main/java/com/flowpowered/networking/protocol/keyed/KeyedProtocol.java b/src/main/java/com/flowpowered/network/protocol/keyed/KeyedProtocol.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/protocol/keyed/KeyedProtocol.java
rename to src/main/java/com/flowpowered/network/protocol/keyed/KeyedProtocol.java
diff --git a/src/main/java/com/flowpowered/networking/protocol/simple/SimpleProtocol.java b/src/main/java/com/flowpowered/network/protocol/simple/SimpleProtocol.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/protocol/simple/SimpleProtocol.java
rename to src/main/java/com/flowpowered/network/protocol/simple/SimpleProtocol.java
diff --git a/src/main/java/com/flowpowered/networking/service/CodecLookupService.java b/src/main/java/com/flowpowered/network/service/CodecLookupService.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/service/CodecLookupService.java
rename to src/main/java/com/flowpowered/network/service/CodecLookupService.java
diff --git a/src/main/java/com/flowpowered/networking/service/HandlerLookupService.java b/src/main/java/com/flowpowered/network/service/HandlerLookupService.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/service/HandlerLookupService.java
rename to src/main/java/com/flowpowered/network/service/HandlerLookupService.java
diff --git a/src/main/java/com/flowpowered/networking/session/BasicSession.java b/src/main/java/com/flowpowered/network/session/BasicSession.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/session/BasicSession.java
rename to src/main/java/com/flowpowered/network/session/BasicSession.java
diff --git a/src/main/java/com/flowpowered/networking/session/PulsingSession.java b/src/main/java/com/flowpowered/network/session/PulsingSession.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/session/PulsingSession.java
rename to src/main/java/com/flowpowered/network/session/PulsingSession.java
diff --git a/src/main/java/com/flowpowered/networking/session/Session.java b/src/main/java/com/flowpowered/network/session/Session.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/session/Session.java
rename to src/main/java/com/flowpowered/network/session/Session.java
diff --git a/src/main/java/com/flowpowered/networking/util/AnnotatedMessageHandler.java b/src/main/java/com/flowpowered/network/util/AnnotatedMessageHandler.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/util/AnnotatedMessageHandler.java
rename to src/main/java/com/flowpowered/network/util/AnnotatedMessageHandler.java
diff --git a/src/main/java/com/flowpowered/networking/util/ByteBufUtils.java b/src/main/java/com/flowpowered/network/util/ByteBufUtils.java
similarity index 100%
rename from src/main/java/com/flowpowered/networking/util/ByteBufUtils.java
rename to src/main/java/com/flowpowered/network/util/ByteBufUtils.java
diff --git a/src/test/java/com/flowpowered/networking/fake/ChannelHandlerContextFaker.java b/src/test/java/com/flowpowered/network/fake/ChannelHandlerContextFaker.java
similarity index 100%
rename from src/test/java/com/flowpowered/networking/fake/ChannelHandlerContextFaker.java
rename to src/test/java/com/flowpowered/network/fake/ChannelHandlerContextFaker.java
diff --git a/src/test/java/com/flowpowered/networking/fake/FakeChannelHandlerContext.java b/src/test/java/com/flowpowered/network/fake/FakeChannelHandlerContext.java
similarity index 100%
rename from src/test/java/com/flowpowered/networking/fake/FakeChannelHandlerContext.java
rename to src/test/java/com/flowpowered/network/fake/FakeChannelHandlerContext.java
diff --git a/src/test/java/com/flowpowered/networking/pipeline/MessageProcessorDecoderTest.java b/src/test/java/com/flowpowered/network/pipeline/MessageProcessorDecoderTest.java
similarity index 100%
rename from src/test/java/com/flowpowered/networking/pipeline/MessageProcessorDecoderTest.java
rename to src/test/java/com/flowpowered/network/pipeline/MessageProcessorDecoderTest.java
diff --git a/src/test/java/com/flowpowered/networking/util/ByteBufUtilsTest.java b/src/test/java/com/flowpowered/network/util/ByteBufUtilsTest.java
similarity index 100%
rename from src/test/java/com/flowpowered/networking/util/ByteBufUtilsTest.java
rename to src/test/java/com/flowpowered/network/util/ByteBufUtilsTest.java