diff --git a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheMessageHeader.java b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheMessageHeader.java
index 8646ef58ac..f5c720e8d9 100644
--- a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheMessageHeader.java
+++ b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheMessageHeader.java
@@ -40,7 +40,7 @@ public interface BinaryMemcacheMessageHeader {
      * Sets the magic byte.
      *
      * @param magic the magic byte to use.
-     * @see io.netty.handler.codec.memcache.binary.util.BinaryMemcacheOpcodes for typesafe opcodes.
+     * @see BinaryMemcacheOpcodes for typesafe opcodes.
      */
     BinaryMemcacheMessageHeader setMagic(byte magic);
 
diff --git a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/BinaryMemcacheOpcodes.java b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheOpcodes.java
similarity index 93%
rename from codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/BinaryMemcacheOpcodes.java
rename to codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheOpcodes.java
index dcbaa0b9ce..755c740bdc 100644
--- a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/BinaryMemcacheOpcodes.java
+++ b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheOpcodes.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.memcache.binary.util;
+package io.netty.handler.codec.memcache.binary;
 
 /**
- * Represents all Opcodes that can occur in a {@link io.netty.handler.codec.memcache.binary.BinaryMemcacheMessage}.
+ * Represents all Opcodes that can occur in a {@link BinaryMemcacheMessage}.
  * <p/>
  * This class can be extended if a custom application needs to implement a superset of the normally supported
  * operations by a vanilla memcached protocol.
@@ -62,5 +62,4 @@ public final class BinaryMemcacheOpcodes {
     public static final byte SASL_LIST_MECHS = 0x20;
     public static final byte SASL_AUTH = 0x21;
     public static final byte SASL_STEP = 0x22;
-
 }
diff --git a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseHeader.java b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseHeader.java
index 43e55b329a..bea0218f95 100644
--- a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseHeader.java
+++ b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseHeader.java
@@ -19,7 +19,7 @@ package io.netty.handler.codec.memcache.binary;
  * Extends the common {@link BinaryMemcacheMessageHeader} header fields with hose who can only show up in
  * {@link BinaryMemcacheResponse} messages.
  *
- * @see io.netty.handler.codec.memcache.binary.util.BinaryMemcacheResponseStatus
+ * @see BinaryMemcacheResponseStatus
  */
 public interface BinaryMemcacheResponseHeader extends BinaryMemcacheMessageHeader {
 
diff --git a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/BinaryMemcacheResponseStatus.java b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseStatus.java
similarity index 90%
rename from codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/BinaryMemcacheResponseStatus.java
rename to codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseStatus.java
index 84c4b18728..d96737ac14 100644
--- a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/BinaryMemcacheResponseStatus.java
+++ b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheResponseStatus.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.memcache.binary.util;
+package io.netty.handler.codec.memcache.binary;
 
 /**
  * Contains all possible status values a
- * {@link io.netty.handler.codec.memcache.binary.BinaryMemcacheResponseHeader} can return.
+ * {@link BinaryMemcacheResponseHeader} can return.
  */
 public final class BinaryMemcacheResponseStatus {
 
@@ -36,5 +36,4 @@ public final class BinaryMemcacheResponseStatus {
     public static final short AUTH_CONTINUE = 0x21;
     public static final short UNKNOWN_COMMAND = 0x81;
     public static final short ENOMEM = 0x82;
-
 }
diff --git a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/package-info.java b/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/package-info.java
deleted file mode 100644
index 5f4366b629..0000000000
--- a/codec-memcache/src/main/java/io/netty/handler/codec/memcache/binary/util/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2013 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Utility helpers for the binary protocol.
- */
-package io.netty.handler.codec.memcache.binary.util;
diff --git a/codec-memcache/src/test/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheEncoderTest.java b/codec-memcache/src/test/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheEncoderTest.java
index 5c5588f392..37a2708e1d 100644
--- a/codec-memcache/src/test/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheEncoderTest.java
+++ b/codec-memcache/src/test/java/io/netty/handler/codec/memcache/binary/BinaryMemcacheEncoderTest.java
@@ -21,21 +21,20 @@ import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.EncoderException;
 import io.netty.handler.codec.memcache.DefaultLastMemcacheContent;
 import io.netty.handler.codec.memcache.DefaultMemcacheContent;
-import io.netty.handler.codec.memcache.binary.util.BinaryMemcacheOpcodes;
 import io.netty.util.CharsetUtil;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 /**
  * Verifies the correct functionality of the {@link BinaryMemcacheEncoder}.
  */
 public class BinaryMemcacheEncoderTest {
 
-    public static int DEFAULT_HEADER_SIZE = 24;
+    public static final int DEFAULT_HEADER_SIZE = 24;
 
     private EmbeddedChannel channel;