diff --git a/protocol-new/src/main/java/mc/protocol/NettyAttributes.java b/protocol-new/src/main/java/mc/protocol/NettyAttributes.java
new file mode 100644
index 0000000..ddca953
--- /dev/null
+++ b/protocol-new/src/main/java/mc/protocol/NettyAttributes.java
@@ -0,0 +1,10 @@
+package mc.protocol;
+
+import io.netty.util.AttributeKey;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class NettyAttributes {
+
+	public static final AttributeKey<State> STATE = AttributeKey.newInstance("STATE");
+}
diff --git a/protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java b/protocol-new/src/main/java/mc/protocol/codec/ProtocolEncoder.java
similarity index 82%
rename from protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java
rename to protocol-new/src/main/java/mc/protocol/codec/ProtocolEncoder.java
index 25d0ed4..500a77c 100644
--- a/protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java
+++ b/protocol-new/src/main/java/mc/protocol/codec/ProtocolEncoder.java
@@ -1,11 +1,11 @@
-package mc.protocol.io.codec;
+package mc.protocol.codec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import lombok.extern.slf4j.Slf4j;
-import mc.protocol.NetworkAttributes;
+import mc.protocol.NettyAttributes;
 import mc.protocol.State;
 import mc.protocol.io.NetByteBuf;
 import mc.protocol.packets.ServerSidePacket;
@@ -15,14 +15,16 @@ public class ProtocolEncoder extends MessageToByteEncoder<ServerSidePacket> {
 
 	@Override
 	protected void encode(ChannelHandlerContext ctx, ServerSidePacket packet, ByteBuf out) {
-		State state = ctx.channel().attr(NetworkAttributes.STATE).get();
+		State state = ctx.channel().attr(NettyAttributes.STATE).get();
 		Integer packetId = state.getServerSidePacketId(packet.getClass());
 		if (packetId == null) {
 			log.error("Unknown send packet: State {} ; Class {}", state, packet.getClass());
 			return;
 		}
 
-		log.debug("OUT: {}:{}", state, packet);
+		if (log.isDebugEnabled()) {
+			log.debug("OUT: {}:{}", state, packet);
+		}
 
 		NetByteBuf buffer = new NetByteBuf(Unpooled.buffer());
 		buffer.writeVarInt(packetId);
diff --git a/protocol/src/main/java/mc/protocol/NetworkAttributes.java b/protocol/src/main/java/mc/protocol/NetworkAttributes.java
deleted file mode 100644
index b6a543b..0000000
--- a/protocol/src/main/java/mc/protocol/NetworkAttributes.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package mc.protocol;
-
-import io.netty.util.AttributeKey;
-import lombok.experimental.UtilityClass;
-
-import java.util.Map;
-
-@UtilityClass
-public class NetworkAttributes {
-
-	public static final AttributeKey<State> STATE = AttributeKey.newInstance("STATE");
-
-	/**
-	 * @deprecated костыль
-	 */
-	@Deprecated
-	public static final AttributeKey<Map<String, Object>> CUSTOM_PROPERTIES = AttributeKey.newInstance("CUSTOM_PROPERTIES");
-}