diff --git a/core/src/com/google/zxing/qrcode/encoder/ByteArray.java b/core/src/com/google/zxing/common/ByteArray.java
similarity index 98%
rename from core/src/com/google/zxing/qrcode/encoder/ByteArray.java
rename to core/src/com/google/zxing/common/ByteArray.java
index 1b8fc5141..ffcc472fd 100644
--- a/core/src/com/google/zxing/qrcode/encoder/ByteArray.java
+++ b/core/src/com/google/zxing/common/ByteArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing.qrcode.encoder;
+package com.google.zxing.common;
 
 /**
  * This class implements an array of unsigned bytes.
diff --git a/core/src/com/google/zxing/qrcode/QRCodeWriter.java b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
index 4c5c6e21d..d72581327 100644
--- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
@@ -20,7 +20,7 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Writer;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.ByteMatrix;
-import com.google.zxing.qrcode.encoder.ByteArray;
+import com.google.zxing.common.ByteArray;
 import com.google.zxing.qrcode.encoder.Encoder;
 import com.google.zxing.qrcode.encoder.QRCode;
 
diff --git a/core/src/com/google/zxing/qrcode/encoder/Encoder.java b/core/src/com/google/zxing/qrcode/encoder/Encoder.java
index 8b4fce425..de2b3420d 100644
--- a/core/src/com/google/zxing/qrcode/encoder/Encoder.java
+++ b/core/src/com/google/zxing/qrcode/encoder/Encoder.java
@@ -17,6 +17,7 @@
 package com.google.zxing.qrcode.encoder;
 
 import com.google.zxing.common.ByteMatrix;
+import com.google.zxing.common.ByteArray;
 import com.google.zxing.common.reedsolomon.GF256;
 import com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
 
diff --git a/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java b/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java
index 5a1107b3a..81157fc2d 100644
--- a/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java
+++ b/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java
@@ -17,6 +17,7 @@
 package com.google.zxing.qrcode.encoder;
 
 import junit.framework.TestCase;
+import com.google.zxing.common.ByteArray;
 
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator