Move resources to match Maven standard directory structure

git-svn-id: https://zxing.googlecode.com/svn/trunk@2915 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Water-bamboo · Nov 21, 2013 · 1bcc298 · 1bcc298
1 parent cc8254b
commit 1bcc298
Show file tree

Hide file tree

Showing 2,707 changed files with 126 additions and 135 deletions.
diff --git a/...integration/android/IntentIntegrator.java → ...integration/android/IntentIntegrator.java b/...integration/android/IntentIntegrator.java → ...integration/android/IntentIntegrator.java
diff --git a/...on/android/IntentIntegratorSupportV4.java → ...on/android/IntentIntegratorSupportV4.java b/...on/android/IntentIntegratorSupportV4.java → ...on/android/IntentIntegratorSupportV4.java
diff --git a/...egration/android/IntentIntegratorV30.java → ...egration/android/IntentIntegratorV30.java b/...egration/android/IntentIntegratorV30.java → ...egration/android/IntentIntegratorV30.java
diff --git a/...ing/integration/android/IntentResult.java → ...ing/integration/android/IntentResult.java b/...ing/integration/android/IntentResult.java → ...ing/integration/android/IntentResult.java
diff --git a/build.xml b/build.xml
@@ -16,7 +16,7 @@
 -->
 <project name="ZXing" default="release">
 
-  <property name="version" value="2.2"/>
+  <property name="version" value="2.3.0"/>
 
   <target name="release">
     <zip file="ZXing-${version}.zip" level="9">
@@ -25,8 +25,7 @@
         <exclude name="**/.svn"/>
         <exclude name="**/*.iml"/>
         <exclude name="**/bin/**"/>        
-        <exclude name="**/build/**"/>
-        <exclude name="**/gen/**"/>        
+        <exclude name="**/gen/**"/>
         <exclude name="**/target/**"/> 
         <exclude name="**/local.properties"/>
         <include name="AUTHORS"/>
@@ -41,7 +40,7 @@
         <include name="androidtest/**"/>      
         <exclude name="androidtest/libs/**"/>
         <include name="core/**"/>
-        <exclude name="core/test/data/**"/> <!-- included separately below -->
+        <exclude name="core/src/test/resources/**"/> <!-- included separately below -->
         <include name="cpp/**"/>
         <include name="csharp/**"/>
         <include name="iphone/**"/>
@@ -51,15 +50,15 @@
         <include name="qt/**"/>
         <include name="zxing.appspot.com/**"/>
         <include name="zxingorg/**"/>
-        <exclude name="zxingorg/resources/private/**"/>
+        <exclude name="**/private/**"/>
       </zipfileset>
     </zip>
     <!-- Separate out test data files now to make download more manageable -->
     <zip file="ZXing-${version}-testdata.zip" level="9">
       <zipfileset dir="." prefix="zxing-${version}" followsymlinks="false">
         <exclude name="**/.*"/>
         <exclude name="**/.svn"/>
-        <include name="core/test/data/**"/>
+        <include name="core/src/test/resources/**"/>
       </zipfileset>
     </zip>
   </target>

diff --git a/core/src/com/google/zxing/BarcodeFormat.java → .../java/com/google/zxing/BarcodeFormat.java b/core/src/com/google/zxing/BarcodeFormat.java → .../java/com/google/zxing/BarcodeFormat.java
diff --git a/core/src/com/google/zxing/Binarizer.java → ...main/java/com/google/zxing/Binarizer.java b/core/src/com/google/zxing/Binarizer.java → ...main/java/com/google/zxing/Binarizer.java
diff --git a/core/src/com/google/zxing/BinaryBitmap.java → ...n/java/com/google/zxing/BinaryBitmap.java b/core/src/com/google/zxing/BinaryBitmap.java → ...n/java/com/google/zxing/BinaryBitmap.java
diff --git a/...c/com/google/zxing/ChecksumException.java → ...a/com/google/zxing/ChecksumException.java b/...c/com/google/zxing/ChecksumException.java → ...a/com/google/zxing/ChecksumException.java
diff --git a/.../src/com/google/zxing/DecodeHintType.java → ...java/com/google/zxing/DecodeHintType.java b/.../src/com/google/zxing/DecodeHintType.java → ...java/com/google/zxing/DecodeHintType.java
diff --git a/core/src/com/google/zxing/Dimension.java → ...main/java/com/google/zxing/Dimension.java b/core/src/com/google/zxing/Dimension.java → ...main/java/com/google/zxing/Dimension.java
diff --git a/.../src/com/google/zxing/EncodeHintType.java → ...java/com/google/zxing/EncodeHintType.java b/.../src/com/google/zxing/EncodeHintType.java → ...java/com/google/zxing/EncodeHintType.java
diff --git a/...src/com/google/zxing/FormatException.java → ...ava/com/google/zxing/FormatException.java b/...src/com/google/zxing/FormatException.java → ...ava/com/google/zxing/FormatException.java
diff --git a/...google/zxing/InvertedLuminanceSource.java → ...google/zxing/InvertedLuminanceSource.java b/...google/zxing/InvertedLuminanceSource.java → ...google/zxing/InvertedLuminanceSource.java
diff --git a/...src/com/google/zxing/LuminanceSource.java → ...ava/com/google/zxing/LuminanceSource.java b/...src/com/google/zxing/LuminanceSource.java → ...ava/com/google/zxing/LuminanceSource.java
diff --git a/...c/com/google/zxing/MultiFormatReader.java → ...a/com/google/zxing/MultiFormatReader.java b/...c/com/google/zxing/MultiFormatReader.java → ...a/com/google/zxing/MultiFormatReader.java
diff --git a/...c/com/google/zxing/MultiFormatWriter.java → ...a/com/google/zxing/MultiFormatWriter.java b/...c/com/google/zxing/MultiFormatWriter.java → ...a/com/google/zxing/MultiFormatWriter.java
diff --git a/...c/com/google/zxing/NotFoundException.java → ...a/com/google/zxing/NotFoundException.java b/...c/com/google/zxing/NotFoundException.java → ...a/com/google/zxing/NotFoundException.java
diff --git a/...oogle/zxing/PlanarYUVLuminanceSource.java → ...oogle/zxing/PlanarYUVLuminanceSource.java b/...oogle/zxing/PlanarYUVLuminanceSource.java → ...oogle/zxing/PlanarYUVLuminanceSource.java
diff --git a/.../com/google/zxing/RGBLuminanceSource.java → .../com/google/zxing/RGBLuminanceSource.java b/.../com/google/zxing/RGBLuminanceSource.java → .../com/google/zxing/RGBLuminanceSource.java
diff --git a/core/src/com/google/zxing/Reader.java → ...rc/main/java/com/google/zxing/Reader.java b/core/src/com/google/zxing/Reader.java → ...rc/main/java/com/google/zxing/Reader.java
diff --git a/...src/com/google/zxing/ReaderException.java → ...ava/com/google/zxing/ReaderException.java b/...src/com/google/zxing/ReaderException.java → ...ava/com/google/zxing/ReaderException.java
diff --git a/core/src/com/google/zxing/Result.java → ...rc/main/java/com/google/zxing/Result.java b/core/src/com/google/zxing/Result.java → ...rc/main/java/com/google/zxing/Result.java
diff --git a/.../com/google/zxing/ResultMetadataType.java → .../com/google/zxing/ResultMetadataType.java b/.../com/google/zxing/ResultMetadataType.java → .../com/google/zxing/ResultMetadataType.java
diff --git a/core/src/com/google/zxing/ResultPoint.java → ...in/java/com/google/zxing/ResultPoint.java b/core/src/com/google/zxing/ResultPoint.java → ...in/java/com/google/zxing/ResultPoint.java
diff --git a/...com/google/zxing/ResultPointCallback.java → ...com/google/zxing/ResultPointCallback.java b/...com/google/zxing/ResultPointCallback.java → ...com/google/zxing/ResultPointCallback.java
diff --git a/core/src/com/google/zxing/Writer.java → ...rc/main/java/com/google/zxing/Writer.java b/core/src/com/google/zxing/Writer.java → ...rc/main/java/com/google/zxing/Writer.java
diff --git a/...src/com/google/zxing/WriterException.java → ...ava/com/google/zxing/WriterException.java b/...src/com/google/zxing/WriterException.java → ...ava/com/google/zxing/WriterException.java
diff --git a/...ogle/zxing/aztec/AztecDetectorResult.java → ...ogle/zxing/aztec/AztecDetectorResult.java b/...ogle/zxing/aztec/AztecDetectorResult.java → ...ogle/zxing/aztec/AztecDetectorResult.java
diff --git a/...c/com/google/zxing/aztec/AztecReader.java → ...a/com/google/zxing/aztec/AztecReader.java b/...c/com/google/zxing/aztec/AztecReader.java → ...a/com/google/zxing/aztec/AztecReader.java
diff --git a/...c/com/google/zxing/aztec/AztecWriter.java → ...a/com/google/zxing/aztec/AztecWriter.java b/...c/com/google/zxing/aztec/AztecWriter.java → ...a/com/google/zxing/aztec/AztecWriter.java
diff --git a/...m/google/zxing/aztec/decoder/Decoder.java → ...m/google/zxing/aztec/decoder/Decoder.java b/...m/google/zxing/aztec/decoder/Decoder.java → ...m/google/zxing/aztec/decoder/Decoder.java
diff --git a/...google/zxing/aztec/detector/Detector.java → ...google/zxing/aztec/detector/Detector.java b/...google/zxing/aztec/detector/Detector.java → ...google/zxing/aztec/detector/Detector.java
diff --git a/...google/zxing/aztec/encoder/AztecCode.java → ...google/zxing/aztec/encoder/AztecCode.java b/...google/zxing/aztec/encoder/AztecCode.java → ...google/zxing/aztec/encoder/AztecCode.java
diff --git a/...zxing/aztec/encoder/BinaryShiftToken.java → ...zxing/aztec/encoder/BinaryShiftToken.java b/...zxing/aztec/encoder/BinaryShiftToken.java → ...zxing/aztec/encoder/BinaryShiftToken.java
diff --git a/...m/google/zxing/aztec/encoder/Encoder.java → ...m/google/zxing/aztec/encoder/Encoder.java b/...m/google/zxing/aztec/encoder/Encoder.java → ...m/google/zxing/aztec/encoder/Encoder.java
diff --git a/...zxing/aztec/encoder/HighLevelEncoder.java → ...zxing/aztec/encoder/HighLevelEncoder.java b/...zxing/aztec/encoder/HighLevelEncoder.java → ...zxing/aztec/encoder/HighLevelEncoder.java
diff --git a/...ogle/zxing/aztec/encoder/SimpleToken.java → ...ogle/zxing/aztec/encoder/SimpleToken.java b/...ogle/zxing/aztec/encoder/SimpleToken.java → ...ogle/zxing/aztec/encoder/SimpleToken.java
diff --git a/...com/google/zxing/aztec/encoder/State.java → ...com/google/zxing/aztec/encoder/State.java b/...com/google/zxing/aztec/encoder/State.java → ...com/google/zxing/aztec/encoder/State.java
diff --git a/...com/google/zxing/aztec/encoder/Token.java → ...com/google/zxing/aztec/encoder/Token.java b/...com/google/zxing/aztec/encoder/Token.java → ...com/google/zxing/aztec/encoder/Token.java
diff --git a/...nt/result/AbstractDoCoMoResultParser.java → ...nt/result/AbstractDoCoMoResultParser.java b/...nt/result/AbstractDoCoMoResultParser.java → ...nt/result/AbstractDoCoMoResultParser.java
diff --git a/...ent/result/AddressBookAUResultParser.java → ...ent/result/AddressBookAUResultParser.java b/...ent/result/AddressBookAUResultParser.java → ...ent/result/AddressBookAUResultParser.java
diff --git a/...result/AddressBookDoCoMoResultParser.java → ...result/AddressBookDoCoMoResultParser.java b/...result/AddressBookDoCoMoResultParser.java → ...result/AddressBookDoCoMoResultParser.java
diff --git a/...lient/result/AddressBookParsedResult.java → ...lient/result/AddressBookParsedResult.java b/...lient/result/AddressBookParsedResult.java → ...lient/result/AddressBookParsedResult.java
diff --git a/...ng/client/result/BizcardResultParser.java → ...ng/client/result/BizcardResultParser.java b/...ng/client/result/BizcardResultParser.java → ...ng/client/result/BizcardResultParser.java
diff --git a/...nt/result/BookmarkDoCoMoResultParser.java → ...nt/result/BookmarkDoCoMoResultParser.java b/...nt/result/BookmarkDoCoMoResultParser.java → ...nt/result/BookmarkDoCoMoResultParser.java
diff --git a/...g/client/result/CalendarParsedResult.java → ...g/client/result/CalendarParsedResult.java b/...g/client/result/CalendarParsedResult.java → ...g/client/result/CalendarParsedResult.java
diff --git a/...ient/result/EmailAddressParsedResult.java → ...ient/result/EmailAddressParsedResult.java b/...ient/result/EmailAddressParsedResult.java → ...ient/result/EmailAddressParsedResult.java
diff --git a/...ient/result/EmailAddressResultParser.java → ...ient/result/EmailAddressResultParser.java b/...ient/result/EmailAddressResultParser.java → ...ient/result/EmailAddressResultParser.java
diff --git a/...lient/result/EmailDoCoMoResultParser.java → ...lient/result/EmailDoCoMoResultParser.java b/...lient/result/EmailDoCoMoResultParser.java → ...lient/result/EmailDoCoMoResultParser.java
diff --git a/...t/result/ExpandedProductParsedResult.java → ...t/result/ExpandedProductParsedResult.java b/...t/result/ExpandedProductParsedResult.java → ...t/result/ExpandedProductParsedResult.java
diff --git a/...t/result/ExpandedProductResultParser.java → ...t/result/ExpandedProductResultParser.java b/...t/result/ExpandedProductResultParser.java → ...t/result/ExpandedProductResultParser.java
diff --git a/.../zxing/client/result/GeoParsedResult.java → .../zxing/client/result/GeoParsedResult.java b/.../zxing/client/result/GeoParsedResult.java → .../zxing/client/result/GeoParsedResult.java
diff --git a/.../zxing/client/result/GeoResultParser.java → .../zxing/client/result/GeoResultParser.java b/.../zxing/client/result/GeoResultParser.java → .../zxing/client/result/GeoResultParser.java
diff --git a/...zxing/client/result/ISBNParsedResult.java → ...zxing/client/result/ISBNParsedResult.java b/...zxing/client/result/ISBNParsedResult.java → ...zxing/client/result/ISBNParsedResult.java
diff --git a/...zxing/client/result/ISBNResultParser.java → ...zxing/client/result/ISBNResultParser.java b/...zxing/client/result/ISBNResultParser.java → ...zxing/client/result/ISBNResultParser.java
diff --git a/...gle/zxing/client/result/ParsedResult.java → ...gle/zxing/client/result/ParsedResult.java b/...gle/zxing/client/result/ParsedResult.java → ...gle/zxing/client/result/ParsedResult.java
diff --git a/...zxing/client/result/ParsedResultType.java → ...zxing/client/result/ParsedResultType.java b/...zxing/client/result/ParsedResultType.java → ...zxing/client/result/ParsedResultType.java
diff --git a/...ng/client/result/ProductParsedResult.java → ...ng/client/result/ProductParsedResult.java b/...ng/client/result/ProductParsedResult.java → ...ng/client/result/ProductParsedResult.java
diff --git a/...ng/client/result/ProductResultParser.java → ...ng/client/result/ProductResultParser.java b/...ng/client/result/ProductResultParser.java → ...ng/client/result/ProductResultParser.java
diff --git a/...gle/zxing/client/result/ResultParser.java → ...gle/zxing/client/result/ResultParser.java b/...gle/zxing/client/result/ResultParser.java → ...gle/zxing/client/result/ResultParser.java
diff --git a/...ing/client/result/SMSMMSResultParser.java → ...ing/client/result/SMSMMSResultParser.java b/...ing/client/result/SMSMMSResultParser.java → ...ing/client/result/SMSMMSResultParser.java
diff --git a/.../zxing/client/result/SMSParsedResult.java → .../zxing/client/result/SMSParsedResult.java b/.../zxing/client/result/SMSParsedResult.java → .../zxing/client/result/SMSParsedResult.java
diff --git a/...client/result/SMSTOMMSTOResultParser.java → ...client/result/SMSTOMMSTOResultParser.java b/...client/result/SMSTOMMSTOResultParser.java → ...client/result/SMSTOMMSTOResultParser.java
diff --git a/...zxing/client/result/SMTPResultParser.java → ...zxing/client/result/SMTPResultParser.java b/...zxing/client/result/SMTPResultParser.java → ...zxing/client/result/SMTPResultParser.java
diff --git a/.../zxing/client/result/TelParsedResult.java → .../zxing/client/result/TelParsedResult.java b/.../zxing/client/result/TelParsedResult.java → .../zxing/client/result/TelParsedResult.java
diff --git a/.../zxing/client/result/TelResultParser.java → .../zxing/client/result/TelResultParser.java b/.../zxing/client/result/TelResultParser.java → .../zxing/client/result/TelResultParser.java
diff --git a/...zxing/client/result/TextParsedResult.java → ...zxing/client/result/TextParsedResult.java b/...zxing/client/result/TextParsedResult.java → ...zxing/client/result/TextParsedResult.java
diff --git a/.../zxing/client/result/URIParsedResult.java → .../zxing/client/result/URIParsedResult.java b/.../zxing/client/result/URIParsedResult.java → .../zxing/client/result/URIParsedResult.java
diff --git a/.../zxing/client/result/URIResultParser.java → .../zxing/client/result/URIResultParser.java b/.../zxing/client/result/URIResultParser.java → .../zxing/client/result/URIResultParser.java
diff --git a/...xing/client/result/URLTOResultParser.java → ...xing/client/result/URLTOResultParser.java b/...xing/client/result/URLTOResultParser.java → ...xing/client/result/URLTOResultParser.java
diff --git a/...xing/client/result/VCardResultParser.java → ...xing/client/result/VCardResultParser.java b/...xing/client/result/VCardResultParser.java → ...xing/client/result/VCardResultParser.java
diff --git a/...ing/client/result/VEventResultParser.java → ...ing/client/result/VEventResultParser.java b/...ing/client/result/VEventResultParser.java → ...ing/client/result/VEventResultParser.java
diff --git a/...zxing/client/result/WifiParsedResult.java → ...zxing/client/result/WifiParsedResult.java b/...zxing/client/result/WifiParsedResult.java → ...zxing/client/result/WifiParsedResult.java
diff --git a/...zxing/client/result/WifiResultParser.java → ...zxing/client/result/WifiResultParser.java b/...zxing/client/result/WifiResultParser.java → ...zxing/client/result/WifiResultParser.java
diff --git a/...src/com/google/zxing/common/BitArray.java → ...ava/com/google/zxing/common/BitArray.java b/...src/com/google/zxing/common/BitArray.java → ...ava/com/google/zxing/common/BitArray.java
diff --git a/...rc/com/google/zxing/common/BitMatrix.java → ...va/com/google/zxing/common/BitMatrix.java b/...rc/com/google/zxing/common/BitMatrix.java → ...va/com/google/zxing/common/BitMatrix.java
diff --git a/...rc/com/google/zxing/common/BitSource.java → ...va/com/google/zxing/common/BitSource.java b/...rc/com/google/zxing/common/BitSource.java → ...va/com/google/zxing/common/BitSource.java
diff --git a/.../google/zxing/common/CharacterSetECI.java → .../google/zxing/common/CharacterSetECI.java b/.../google/zxing/common/CharacterSetECI.java → .../google/zxing/common/CharacterSetECI.java
diff --git a/...om/google/zxing/common/DecoderResult.java → ...om/google/zxing/common/DecoderResult.java b/...om/google/zxing/common/DecoderResult.java → ...om/google/zxing/common/DecoderResult.java
diff --git a/...ogle/zxing/common/DefaultGridSampler.java → ...ogle/zxing/common/DefaultGridSampler.java b/...ogle/zxing/common/DefaultGridSampler.java → ...ogle/zxing/common/DefaultGridSampler.java
diff --git a/...m/google/zxing/common/DetectorResult.java → ...m/google/zxing/common/DetectorResult.java b/...m/google/zxing/common/DetectorResult.java → ...m/google/zxing/common/DetectorResult.java
diff --git a/...xing/common/GlobalHistogramBinarizer.java → ...xing/common/GlobalHistogramBinarizer.java b/...xing/common/GlobalHistogramBinarizer.java → ...xing/common/GlobalHistogramBinarizer.java
diff --git a/.../com/google/zxing/common/GridSampler.java → .../com/google/zxing/common/GridSampler.java b/.../com/google/zxing/common/GridSampler.java → .../com/google/zxing/common/GridSampler.java
diff --git a/.../google/zxing/common/HybridBinarizer.java → .../google/zxing/common/HybridBinarizer.java b/.../google/zxing/common/HybridBinarizer.java → .../google/zxing/common/HybridBinarizer.java
diff --git a/...le/zxing/common/PerspectiveTransform.java → ...le/zxing/common/PerspectiveTransform.java b/...le/zxing/common/PerspectiveTransform.java → ...le/zxing/common/PerspectiveTransform.java
diff --git a/.../com/google/zxing/common/StringUtils.java → .../com/google/zxing/common/StringUtils.java b/.../com/google/zxing/common/StringUtils.java → .../com/google/zxing/common/StringUtils.java
diff --git a/...ogle/zxing/common/detector/MathUtils.java → ...ogle/zxing/common/detector/MathUtils.java b/...ogle/zxing/common/detector/MathUtils.java → ...ogle/zxing/common/detector/MathUtils.java
diff --git a/...detector/MonochromeRectangleDetector.java → ...detector/MonochromeRectangleDetector.java b/...detector/MonochromeRectangleDetector.java → ...detector/MonochromeRectangleDetector.java
diff --git a/...mmon/detector/WhiteRectangleDetector.java → ...mmon/detector/WhiteRectangleDetector.java b/...mmon/detector/WhiteRectangleDetector.java → ...mmon/detector/WhiteRectangleDetector.java
diff --git a/...e/zxing/common/reedsolomon/GenericGF.java → ...e/zxing/common/reedsolomon/GenericGF.java b/...e/zxing/common/reedsolomon/GenericGF.java → ...e/zxing/common/reedsolomon/GenericGF.java
diff --git a/...ing/common/reedsolomon/GenericGFPoly.java → ...ing/common/reedsolomon/GenericGFPoly.java b/...ing/common/reedsolomon/GenericGFPoly.java → ...ing/common/reedsolomon/GenericGFPoly.java
diff --git a/...ommon/reedsolomon/ReedSolomonDecoder.java → ...ommon/reedsolomon/ReedSolomonDecoder.java b/...ommon/reedsolomon/ReedSolomonDecoder.java → ...ommon/reedsolomon/ReedSolomonDecoder.java
diff --git a/...ommon/reedsolomon/ReedSolomonEncoder.java → ...ommon/reedsolomon/ReedSolomonEncoder.java b/...ommon/reedsolomon/ReedSolomonEncoder.java → ...ommon/reedsolomon/ReedSolomonEncoder.java
diff --git a/...mon/reedsolomon/ReedSolomonException.java → ...mon/reedsolomon/ReedSolomonException.java b/...mon/reedsolomon/ReedSolomonException.java → ...mon/reedsolomon/ReedSolomonException.java
diff --git a/...le/zxing/datamatrix/DataMatrixReader.java → ...le/zxing/datamatrix/DataMatrixReader.java b/...le/zxing/datamatrix/DataMatrixReader.java → ...le/zxing/datamatrix/DataMatrixReader.java
diff --git a/...le/zxing/datamatrix/DataMatrixWriter.java → ...le/zxing/datamatrix/DataMatrixWriter.java b/...le/zxing/datamatrix/DataMatrixWriter.java → ...le/zxing/datamatrix/DataMatrixWriter.java
diff --git a/...g/datamatrix/decoder/BitMatrixParser.java → ...g/datamatrix/decoder/BitMatrixParser.java b/...g/datamatrix/decoder/BitMatrixParser.java → ...g/datamatrix/decoder/BitMatrixParser.java
diff --git a/...e/zxing/datamatrix/decoder/DataBlock.java → ...e/zxing/datamatrix/decoder/DataBlock.java b/...e/zxing/datamatrix/decoder/DataBlock.java → ...e/zxing/datamatrix/decoder/DataBlock.java
diff --git a/...atrix/decoder/DecodedBitStreamParser.java → ...atrix/decoder/DecodedBitStreamParser.java b/...atrix/decoder/DecodedBitStreamParser.java → ...atrix/decoder/DecodedBitStreamParser.java
diff --git a/...gle/zxing/datamatrix/decoder/Decoder.java → ...gle/zxing/datamatrix/decoder/Decoder.java b/...gle/zxing/datamatrix/decoder/Decoder.java → ...gle/zxing/datamatrix/decoder/Decoder.java
diff --git a/...gle/zxing/datamatrix/decoder/Version.java → ...gle/zxing/datamatrix/decoder/Version.java b/...gle/zxing/datamatrix/decoder/Version.java → ...gle/zxing/datamatrix/decoder/Version.java
diff --git a/...e/zxing/datamatrix/detector/Detector.java → ...e/zxing/datamatrix/detector/Detector.java b/...e/zxing/datamatrix/detector/Detector.java → ...e/zxing/datamatrix/detector/Detector.java
diff --git a/...xing/datamatrix/encoder/ASCIIEncoder.java → ...xing/datamatrix/encoder/ASCIIEncoder.java b/...xing/datamatrix/encoder/ASCIIEncoder.java → ...xing/datamatrix/encoder/ASCIIEncoder.java
diff --git a/...ng/datamatrix/encoder/Base256Encoder.java → ...ng/datamatrix/encoder/Base256Encoder.java b/...ng/datamatrix/encoder/Base256Encoder.java → ...ng/datamatrix/encoder/Base256Encoder.java
diff --git a/.../zxing/datamatrix/encoder/C40Encoder.java → .../zxing/datamatrix/encoder/C40Encoder.java b/.../zxing/datamatrix/encoder/C40Encoder.java → .../zxing/datamatrix/encoder/C40Encoder.java
diff --git a/...trix/encoder/DataMatrixSymbolInfo144.java → ...trix/encoder/DataMatrixSymbolInfo144.java b/...trix/encoder/DataMatrixSymbolInfo144.java → ...trix/encoder/DataMatrixSymbolInfo144.java
diff --git a/.../datamatrix/encoder/DefaultPlacement.java → .../datamatrix/encoder/DefaultPlacement.java b/.../datamatrix/encoder/DefaultPlacement.java → .../datamatrix/encoder/DefaultPlacement.java
diff --git a/...ng/datamatrix/encoder/EdifactEncoder.java → ...ng/datamatrix/encoder/EdifactEncoder.java b/...ng/datamatrix/encoder/EdifactEncoder.java → ...ng/datamatrix/encoder/EdifactEncoder.java
diff --git a/...gle/zxing/datamatrix/encoder/Encoder.java → ...gle/zxing/datamatrix/encoder/Encoder.java b/...gle/zxing/datamatrix/encoder/Encoder.java → ...gle/zxing/datamatrix/encoder/Encoder.java
diff --git a/...ng/datamatrix/encoder/EncoderContext.java → ...ng/datamatrix/encoder/EncoderContext.java b/...ng/datamatrix/encoder/EncoderContext.java → ...ng/datamatrix/encoder/EncoderContext.java
diff --git a/...g/datamatrix/encoder/ErrorCorrection.java → ...g/datamatrix/encoder/ErrorCorrection.java b/...g/datamatrix/encoder/ErrorCorrection.java → ...g/datamatrix/encoder/ErrorCorrection.java
diff --git a/.../datamatrix/encoder/HighLevelEncoder.java → .../datamatrix/encoder/HighLevelEncoder.java b/.../datamatrix/encoder/HighLevelEncoder.java → .../datamatrix/encoder/HighLevelEncoder.java
diff --git a/.../zxing/datamatrix/encoder/SymbolInfo.java → .../zxing/datamatrix/encoder/SymbolInfo.java b/.../zxing/datamatrix/encoder/SymbolInfo.java → .../zxing/datamatrix/encoder/SymbolInfo.java
diff --git a/...g/datamatrix/encoder/SymbolShapeHint.java → ...g/datamatrix/encoder/SymbolShapeHint.java b/...g/datamatrix/encoder/SymbolShapeHint.java → ...g/datamatrix/encoder/SymbolShapeHint.java
diff --git a/...zxing/datamatrix/encoder/TextEncoder.java → ...zxing/datamatrix/encoder/TextEncoder.java b/...zxing/datamatrix/encoder/TextEncoder.java → ...zxing/datamatrix/encoder/TextEncoder.java
diff --git a/.../zxing/datamatrix/encoder/X12Encoder.java → .../zxing/datamatrix/encoder/X12Encoder.java b/.../zxing/datamatrix/encoder/X12Encoder.java → .../zxing/datamatrix/encoder/X12Encoder.java
diff --git a/...google/zxing/maxicode/MaxiCodeReader.java → ...google/zxing/maxicode/MaxiCodeReader.java b/...google/zxing/maxicode/MaxiCodeReader.java → ...google/zxing/maxicode/MaxiCodeReader.java
diff --git a/...ing/maxicode/decoder/BitMatrixParser.java → ...ing/maxicode/decoder/BitMatrixParser.java b/...ing/maxicode/decoder/BitMatrixParser.java → ...ing/maxicode/decoder/BitMatrixParser.java
diff --git a/...icode/decoder/DecodedBitStreamParser.java → ...icode/decoder/DecodedBitStreamParser.java b/...icode/decoder/DecodedBitStreamParser.java → ...icode/decoder/DecodedBitStreamParser.java
diff --git a/...oogle/zxing/maxicode/decoder/Decoder.java → ...oogle/zxing/maxicode/decoder/Decoder.java b/...oogle/zxing/maxicode/decoder/Decoder.java → ...oogle/zxing/maxicode/decoder/Decoder.java
diff --git a/.../google/zxing/multi/ByQuadrantReader.java → .../google/zxing/multi/ByQuadrantReader.java b/.../google/zxing/multi/ByQuadrantReader.java → .../google/zxing/multi/ByQuadrantReader.java
diff --git a/...g/multi/GenericMultipleBarcodeReader.java → ...g/multi/GenericMultipleBarcodeReader.java b/...g/multi/GenericMultipleBarcodeReader.java → ...g/multi/GenericMultipleBarcodeReader.java
diff --git a/...le/zxing/multi/MultipleBarcodeReader.java → ...le/zxing/multi/MultipleBarcodeReader.java b/...le/zxing/multi/MultipleBarcodeReader.java → ...le/zxing/multi/MultipleBarcodeReader.java
diff --git a/...zxing/multi/qrcode/QRCodeMultiReader.java → ...zxing/multi/qrcode/QRCodeMultiReader.java b/...zxing/multi/qrcode/QRCodeMultiReader.java → ...zxing/multi/qrcode/QRCodeMultiReader.java
diff --git a/.../multi/qrcode/detector/MultiDetector.java → .../multi/qrcode/detector/MultiDetector.java b/.../multi/qrcode/detector/MultiDetector.java → .../multi/qrcode/detector/MultiDetector.java
diff --git a/...de/detector/MultiFinderPatternFinder.java → ...de/detector/MultiFinderPatternFinder.java b/...de/detector/MultiFinderPatternFinder.java → ...de/detector/MultiFinderPatternFinder.java
diff --git a/.../com/google/zxing/oned/CodaBarReader.java → .../com/google/zxing/oned/CodaBarReader.java b/.../com/google/zxing/oned/CodaBarReader.java → .../com/google/zxing/oned/CodaBarReader.java
diff --git a/.../com/google/zxing/oned/CodaBarWriter.java → .../com/google/zxing/oned/CodaBarWriter.java b/.../com/google/zxing/oned/CodaBarWriter.java → .../com/google/zxing/oned/CodaBarWriter.java
diff --git a/.../com/google/zxing/oned/Code128Reader.java → .../com/google/zxing/oned/Code128Reader.java b/.../com/google/zxing/oned/Code128Reader.java → .../com/google/zxing/oned/Code128Reader.java
diff --git a/.../com/google/zxing/oned/Code128Writer.java → .../com/google/zxing/oned/Code128Writer.java b/.../com/google/zxing/oned/Code128Writer.java → .../com/google/zxing/oned/Code128Writer.java
diff --git a/...c/com/google/zxing/oned/Code39Reader.java → ...a/com/google/zxing/oned/Code39Reader.java b/...c/com/google/zxing/oned/Code39Reader.java → ...a/com/google/zxing/oned/Code39Reader.java
diff --git a/...c/com/google/zxing/oned/Code39Writer.java → ...a/com/google/zxing/oned/Code39Writer.java b/...c/com/google/zxing/oned/Code39Writer.java → ...a/com/google/zxing/oned/Code39Writer.java
diff --git a/...c/com/google/zxing/oned/Code93Reader.java → ...a/com/google/zxing/oned/Code93Reader.java b/...c/com/google/zxing/oned/Code93Reader.java → ...a/com/google/zxing/oned/Code93Reader.java
diff --git a/...rc/com/google/zxing/oned/EAN13Reader.java → ...va/com/google/zxing/oned/EAN13Reader.java b/...rc/com/google/zxing/oned/EAN13Reader.java → ...va/com/google/zxing/oned/EAN13Reader.java
diff --git a/...rc/com/google/zxing/oned/EAN13Writer.java → ...va/com/google/zxing/oned/EAN13Writer.java b/...rc/com/google/zxing/oned/EAN13Writer.java → ...va/com/google/zxing/oned/EAN13Writer.java
diff --git a/...src/com/google/zxing/oned/EAN8Reader.java → ...ava/com/google/zxing/oned/EAN8Reader.java b/...src/com/google/zxing/oned/EAN8Reader.java → ...ava/com/google/zxing/oned/EAN8Reader.java
diff --git a/...src/com/google/zxing/oned/EAN8Writer.java → ...ava/com/google/zxing/oned/EAN8Writer.java b/...src/com/google/zxing/oned/EAN8Writer.java → ...ava/com/google/zxing/oned/EAN8Writer.java
diff --git a/...zxing/oned/EANManufacturerOrgSupport.java → ...zxing/oned/EANManufacturerOrgSupport.java b/...zxing/oned/EANManufacturerOrgSupport.java → ...zxing/oned/EANManufacturerOrgSupport.java
diff --git a/.../src/com/google/zxing/oned/ITFReader.java → ...java/com/google/zxing/oned/ITFReader.java b/.../src/com/google/zxing/oned/ITFReader.java → ...java/com/google/zxing/oned/ITFReader.java
diff --git a/.../src/com/google/zxing/oned/ITFWriter.java → ...java/com/google/zxing/oned/ITFWriter.java b/.../src/com/google/zxing/oned/ITFWriter.java → ...java/com/google/zxing/oned/ITFWriter.java
diff --git a/...gle/zxing/oned/MultiFormatOneDReader.java → ...gle/zxing/oned/MultiFormatOneDReader.java b/...gle/zxing/oned/MultiFormatOneDReader.java → ...gle/zxing/oned/MultiFormatOneDReader.java
diff --git a/...e/zxing/oned/MultiFormatUPCEANReader.java → ...e/zxing/oned/MultiFormatUPCEANReader.java b/...e/zxing/oned/MultiFormatUPCEANReader.java → ...e/zxing/oned/MultiFormatUPCEANReader.java
diff --git a/...src/com/google/zxing/oned/OneDReader.java → ...ava/com/google/zxing/oned/OneDReader.java b/...src/com/google/zxing/oned/OneDReader.java → ...ava/com/google/zxing/oned/OneDReader.java
diff --git a/.../zxing/oned/OneDimensionalCodeWriter.java → .../zxing/oned/OneDimensionalCodeWriter.java b/.../zxing/oned/OneDimensionalCodeWriter.java → .../zxing/oned/OneDimensionalCodeWriter.java
diff --git a/...src/com/google/zxing/oned/UPCAReader.java → ...ava/com/google/zxing/oned/UPCAReader.java b/...src/com/google/zxing/oned/UPCAReader.java → ...ava/com/google/zxing/oned/UPCAReader.java
diff --git a/...src/com/google/zxing/oned/UPCAWriter.java → ...ava/com/google/zxing/oned/UPCAWriter.java b/...src/com/google/zxing/oned/UPCAWriter.java → ...ava/com/google/zxing/oned/UPCAWriter.java
diff --git a/...e/zxing/oned/UPCEANExtension2Support.java → ...e/zxing/oned/UPCEANExtension2Support.java b/...e/zxing/oned/UPCEANExtension2Support.java → ...e/zxing/oned/UPCEANExtension2Support.java
diff --git a/...e/zxing/oned/UPCEANExtension5Support.java → ...e/zxing/oned/UPCEANExtension5Support.java b/...e/zxing/oned/UPCEANExtension5Support.java → ...e/zxing/oned/UPCEANExtension5Support.java
diff --git a/...le/zxing/oned/UPCEANExtensionSupport.java → ...le/zxing/oned/UPCEANExtensionSupport.java b/...le/zxing/oned/UPCEANExtensionSupport.java → ...le/zxing/oned/UPCEANExtensionSupport.java
diff --git a/...c/com/google/zxing/oned/UPCEANReader.java → ...a/com/google/zxing/oned/UPCEANReader.java b/...c/com/google/zxing/oned/UPCEANReader.java → ...a/com/google/zxing/oned/UPCEANReader.java
diff --git a/...c/com/google/zxing/oned/UPCEANWriter.java → ...a/com/google/zxing/oned/UPCEANWriter.java b/...c/com/google/zxing/oned/UPCEANWriter.java → ...a/com/google/zxing/oned/UPCEANWriter.java
diff --git a/...src/com/google/zxing/oned/UPCEReader.java → ...ava/com/google/zxing/oned/UPCEReader.java b/...src/com/google/zxing/oned/UPCEReader.java → ...ava/com/google/zxing/oned/UPCEReader.java
diff --git a/...gle/zxing/oned/rss/AbstractRSSReader.java → ...gle/zxing/oned/rss/AbstractRSSReader.java b/...gle/zxing/oned/rss/AbstractRSSReader.java → ...gle/zxing/oned/rss/AbstractRSSReader.java
diff --git a/.../google/zxing/oned/rss/DataCharacter.java → .../google/zxing/oned/rss/DataCharacter.java b/.../google/zxing/oned/rss/DataCharacter.java → .../google/zxing/oned/rss/DataCharacter.java
diff --git a/.../google/zxing/oned/rss/FinderPattern.java → .../google/zxing/oned/rss/FinderPattern.java b/.../google/zxing/oned/rss/FinderPattern.java → .../google/zxing/oned/rss/FinderPattern.java
diff --git a/core/src/com/google/zxing/oned/rss/Pair.java → .../java/com/google/zxing/oned/rss/Pair.java b/core/src/com/google/zxing/oned/rss/Pair.java → .../java/com/google/zxing/oned/rss/Pair.java
diff --git a/...om/google/zxing/oned/rss/RSS14Reader.java → ...om/google/zxing/oned/rss/RSS14Reader.java b/...om/google/zxing/oned/rss/RSS14Reader.java → ...om/google/zxing/oned/rss/RSS14Reader.java
diff --git a/...c/com/google/zxing/oned/rss/RSSUtils.java → ...a/com/google/zxing/oned/rss/RSSUtils.java b/...c/com/google/zxing/oned/rss/RSSUtils.java → ...a/com/google/zxing/oned/rss/RSSUtils.java
diff --git a/...ng/oned/rss/expanded/BitArrayBuilder.java → ...ng/oned/rss/expanded/BitArrayBuilder.java b/...ng/oned/rss/expanded/BitArrayBuilder.java → ...ng/oned/rss/expanded/BitArrayBuilder.java
diff --git a/...zxing/oned/rss/expanded/ExpandedPair.java → ...zxing/oned/rss/expanded/ExpandedPair.java b/...zxing/oned/rss/expanded/ExpandedPair.java → ...zxing/oned/rss/expanded/ExpandedPair.java
diff --git a/.../zxing/oned/rss/expanded/ExpandedRow.java → .../zxing/oned/rss/expanded/ExpandedRow.java b/.../zxing/oned/rss/expanded/ExpandedRow.java → .../zxing/oned/rss/expanded/ExpandedRow.java
diff --git a/.../oned/rss/expanded/RSSExpandedReader.java → .../oned/rss/expanded/RSSExpandedReader.java b/.../oned/rss/expanded/RSSExpandedReader.java → .../oned/rss/expanded/RSSExpandedReader.java
diff --git a/...ss/expanded/decoders/AI013103decoder.java → ...ss/expanded/decoders/AI013103decoder.java b/...ss/expanded/decoders/AI013103decoder.java → ...ss/expanded/decoders/AI013103decoder.java
diff --git a/...ss/expanded/decoders/AI01320xDecoder.java → ...ss/expanded/decoders/AI01320xDecoder.java b/...ss/expanded/decoders/AI01320xDecoder.java → ...ss/expanded/decoders/AI01320xDecoder.java
diff --git a/...ss/expanded/decoders/AI01392xDecoder.java → ...ss/expanded/decoders/AI01392xDecoder.java b/...ss/expanded/decoders/AI01392xDecoder.java → ...ss/expanded/decoders/AI01392xDecoder.java
diff --git a/...ss/expanded/decoders/AI01393xDecoder.java → ...ss/expanded/decoders/AI01393xDecoder.java b/...ss/expanded/decoders/AI01393xDecoder.java → ...ss/expanded/decoders/AI01393xDecoder.java
diff --git a/.../expanded/decoders/AI013x0x1xDecoder.java → .../expanded/decoders/AI013x0x1xDecoder.java b/.../expanded/decoders/AI013x0x1xDecoder.java → .../expanded/decoders/AI013x0x1xDecoder.java
diff --git a/...ss/expanded/decoders/AI013x0xDecoder.java → ...ss/expanded/decoders/AI013x0xDecoder.java b/...ss/expanded/decoders/AI013x0xDecoder.java → ...ss/expanded/decoders/AI013x0xDecoder.java
diff --git a/...ss/expanded/decoders/AI01AndOtherAIs.java → ...ss/expanded/decoders/AI01AndOtherAIs.java b/...ss/expanded/decoders/AI01AndOtherAIs.java → ...ss/expanded/decoders/AI01AndOtherAIs.java
diff --git a/...ed/rss/expanded/decoders/AI01decoder.java → ...ed/rss/expanded/decoders/AI01decoder.java b/...ed/rss/expanded/decoders/AI01decoder.java → ...ed/rss/expanded/decoders/AI01decoder.java
diff --git a/.../expanded/decoders/AI01weightDecoder.java → .../expanded/decoders/AI01weightDecoder.java b/.../expanded/decoders/AI01weightDecoder.java → .../expanded/decoders/AI01weightDecoder.java
diff --git a/...ded/decoders/AbstractExpandedDecoder.java → ...ded/decoders/AbstractExpandedDecoder.java b/...ded/decoders/AbstractExpandedDecoder.java → ...ded/decoders/AbstractExpandedDecoder.java
diff --git a/...d/rss/expanded/decoders/AnyAIDecoder.java → ...d/rss/expanded/decoders/AnyAIDecoder.java b/...d/rss/expanded/decoders/AnyAIDecoder.java → ...d/rss/expanded/decoders/AnyAIDecoder.java
diff --git a/.../expanded/decoders/BlockParsedResult.java → .../expanded/decoders/BlockParsedResult.java b/.../expanded/decoders/BlockParsedResult.java → .../expanded/decoders/BlockParsedResult.java
diff --git a/...xpanded/decoders/CurrentParsingState.java → ...xpanded/decoders/CurrentParsingState.java b/...xpanded/decoders/CurrentParsingState.java → ...xpanded/decoders/CurrentParsingState.java
diff --git a/...ed/rss/expanded/decoders/DecodedChar.java → ...ed/rss/expanded/decoders/DecodedChar.java b/...ed/rss/expanded/decoders/DecodedChar.java → ...ed/rss/expanded/decoders/DecodedChar.java
diff --git a/...expanded/decoders/DecodedInformation.java → ...expanded/decoders/DecodedInformation.java b/...expanded/decoders/DecodedInformation.java → ...expanded/decoders/DecodedInformation.java
diff --git a/...rss/expanded/decoders/DecodedNumeric.java → ...rss/expanded/decoders/DecodedNumeric.java b/...rss/expanded/decoders/DecodedNumeric.java → ...rss/expanded/decoders/DecodedNumeric.java
diff --git a/.../rss/expanded/decoders/DecodedObject.java → .../rss/expanded/decoders/DecodedObject.java b/.../rss/expanded/decoders/DecodedObject.java → .../rss/expanded/decoders/DecodedObject.java
diff --git a/...ed/rss/expanded/decoders/FieldParser.java → ...ed/rss/expanded/decoders/FieldParser.java b/...ed/rss/expanded/decoders/FieldParser.java → ...ed/rss/expanded/decoders/FieldParser.java
diff --git a/...xpanded/decoders/GeneralAppIdDecoder.java → ...xpanded/decoders/GeneralAppIdDecoder.java b/...xpanded/decoders/GeneralAppIdDecoder.java → ...xpanded/decoders/GeneralAppIdDecoder.java
diff --git a/...com/google/zxing/pdf417/PDF417Common.java → ...com/google/zxing/pdf417/PDF417Common.java b/...com/google/zxing/pdf417/PDF417Common.java → ...com/google/zxing/pdf417/PDF417Common.java
diff --git a/...com/google/zxing/pdf417/PDF417Reader.java → ...com/google/zxing/pdf417/PDF417Reader.java b/...com/google/zxing/pdf417/PDF417Reader.java → ...com/google/zxing/pdf417/PDF417Reader.java
diff --git a/...le/zxing/pdf417/PDF417ResultMetadata.java → ...le/zxing/pdf417/PDF417ResultMetadata.java b/...le/zxing/pdf417/PDF417ResultMetadata.java → ...le/zxing/pdf417/PDF417ResultMetadata.java
diff --git a/...com/google/zxing/pdf417/PDF417Writer.java → ...com/google/zxing/pdf417/PDF417Writer.java b/...com/google/zxing/pdf417/PDF417Writer.java → ...com/google/zxing/pdf417/PDF417Writer.java
diff --git a/...zxing/pdf417/decoder/BarcodeMetadata.java → ...zxing/pdf417/decoder/BarcodeMetadata.java b/...zxing/pdf417/decoder/BarcodeMetadata.java → ...zxing/pdf417/decoder/BarcodeMetadata.java
diff --git a/...le/zxing/pdf417/decoder/BarcodeValue.java → ...le/zxing/pdf417/decoder/BarcodeValue.java b/...le/zxing/pdf417/decoder/BarcodeValue.java → ...le/zxing/pdf417/decoder/BarcodeValue.java
diff --git a/...gle/zxing/pdf417/decoder/BoundingBox.java → ...gle/zxing/pdf417/decoder/BoundingBox.java b/...gle/zxing/pdf417/decoder/BoundingBox.java → ...gle/zxing/pdf417/decoder/BoundingBox.java
diff --git a/...google/zxing/pdf417/decoder/Codeword.java → ...google/zxing/pdf417/decoder/Codeword.java b/...google/zxing/pdf417/decoder/Codeword.java → ...google/zxing/pdf417/decoder/Codeword.java
diff --git a/...df417/decoder/DecodedBitStreamParser.java → ...df417/decoder/DecodedBitStreamParser.java b/...df417/decoder/DecodedBitStreamParser.java → ...df417/decoder/DecodedBitStreamParser.java
diff --git a/...zxing/pdf417/decoder/DetectionResult.java → ...zxing/pdf417/decoder/DetectionResult.java b/...zxing/pdf417/decoder/DetectionResult.java → ...zxing/pdf417/decoder/DetectionResult.java
diff --git a/...pdf417/decoder/DetectionResultColumn.java → ...pdf417/decoder/DetectionResultColumn.java b/...pdf417/decoder/DetectionResultColumn.java → ...pdf417/decoder/DetectionResultColumn.java
diff --git a/...er/DetectionResultRowIndicatorColumn.java → ...er/DetectionResultRowIndicatorColumn.java b/...er/DetectionResultRowIndicatorColumn.java → ...er/DetectionResultRowIndicatorColumn.java
diff --git a/...pdf417/decoder/PDF417CodewordDecoder.java → ...pdf417/decoder/PDF417CodewordDecoder.java b/...pdf417/decoder/PDF417CodewordDecoder.java → ...pdf417/decoder/PDF417CodewordDecoder.java
diff --git a/...pdf417/decoder/PDF417ScanningDecoder.java → ...pdf417/decoder/PDF417ScanningDecoder.java b/...pdf417/decoder/PDF417ScanningDecoder.java → ...pdf417/decoder/PDF417ScanningDecoder.java
diff --git a/...ng/pdf417/decoder/ec/ErrorCorrection.java → ...ng/pdf417/decoder/ec/ErrorCorrection.java b/...ng/pdf417/decoder/ec/ErrorCorrection.java → ...ng/pdf417/decoder/ec/ErrorCorrection.java
diff --git a/...le/zxing/pdf417/decoder/ec/ModulusGF.java → ...le/zxing/pdf417/decoder/ec/ModulusGF.java b/...le/zxing/pdf417/decoder/ec/ModulusGF.java → ...le/zxing/pdf417/decoder/ec/ModulusGF.java
diff --git a/.../zxing/pdf417/decoder/ec/ModulusPoly.java → .../zxing/pdf417/decoder/ec/ModulusPoly.java b/.../zxing/pdf417/decoder/ec/ModulusPoly.java → .../zxing/pdf417/decoder/ec/ModulusPoly.java
diff --git a/...oogle/zxing/pdf417/detector/Detector.java → ...oogle/zxing/pdf417/detector/Detector.java b/...oogle/zxing/pdf417/detector/Detector.java → ...oogle/zxing/pdf417/detector/Detector.java
diff --git a/...pdf417/detector/PDF417DetectorResult.java → ...pdf417/detector/PDF417DetectorResult.java b/...pdf417/detector/PDF417DetectorResult.java → ...pdf417/detector/PDF417DetectorResult.java
diff --git a/...e/zxing/pdf417/encoder/BarcodeMatrix.java → ...e/zxing/pdf417/encoder/BarcodeMatrix.java b/...e/zxing/pdf417/encoder/BarcodeMatrix.java → ...e/zxing/pdf417/encoder/BarcodeMatrix.java
diff --git a/...ogle/zxing/pdf417/encoder/BarcodeRow.java → ...ogle/zxing/pdf417/encoder/BarcodeRow.java b/...ogle/zxing/pdf417/encoder/BarcodeRow.java → ...ogle/zxing/pdf417/encoder/BarcodeRow.java
diff --git a/...ogle/zxing/pdf417/encoder/Compaction.java → ...ogle/zxing/pdf417/encoder/Compaction.java b/...ogle/zxing/pdf417/encoder/Compaction.java → ...ogle/zxing/pdf417/encoder/Compaction.java
diff --git a/...ogle/zxing/pdf417/encoder/Dimensions.java → ...ogle/zxing/pdf417/encoder/Dimensions.java b/...ogle/zxing/pdf417/encoder/Dimensions.java → ...ogle/zxing/pdf417/encoder/Dimensions.java
diff --git a/...m/google/zxing/pdf417/encoder/PDF417.java → ...m/google/zxing/pdf417/encoder/PDF417.java b/...m/google/zxing/pdf417/encoder/PDF417.java → ...m/google/zxing/pdf417/encoder/PDF417.java
diff --git a/...pdf417/encoder/PDF417ErrorCorrection.java → ...pdf417/encoder/PDF417ErrorCorrection.java b/...pdf417/encoder/PDF417ErrorCorrection.java → ...pdf417/encoder/PDF417ErrorCorrection.java
diff --git a/...df417/encoder/PDF417HighLevelEncoder.java → ...df417/encoder/PDF417HighLevelEncoder.java b/...df417/encoder/PDF417HighLevelEncoder.java → ...df417/encoder/PDF417HighLevelEncoder.java
diff --git a/...com/google/zxing/qrcode/QRCodeReader.java → ...com/google/zxing/qrcode/QRCodeReader.java b/...com/google/zxing/qrcode/QRCodeReader.java → ...com/google/zxing/qrcode/QRCodeReader.java
diff --git a/...com/google/zxing/qrcode/QRCodeWriter.java → ...com/google/zxing/qrcode/QRCodeWriter.java b/...com/google/zxing/qrcode/QRCodeWriter.java → ...com/google/zxing/qrcode/QRCodeWriter.java
diff --git a/...zxing/qrcode/decoder/BitMatrixParser.java → ...zxing/qrcode/decoder/BitMatrixParser.java b/...zxing/qrcode/decoder/BitMatrixParser.java → ...zxing/qrcode/decoder/BitMatrixParser.java
diff --git a/...oogle/zxing/qrcode/decoder/DataBlock.java → ...oogle/zxing/qrcode/decoder/DataBlock.java b/...oogle/zxing/qrcode/decoder/DataBlock.java → ...oogle/zxing/qrcode/decoder/DataBlock.java
diff --git a/...google/zxing/qrcode/decoder/DataMask.java → ...google/zxing/qrcode/decoder/DataMask.java b/...google/zxing/qrcode/decoder/DataMask.java → ...google/zxing/qrcode/decoder/DataMask.java
diff --git a/...rcode/decoder/DecodedBitStreamParser.java → ...rcode/decoder/DecodedBitStreamParser.java b/...rcode/decoder/DecodedBitStreamParser.java → ...rcode/decoder/DecodedBitStreamParser.java
diff --git a/.../google/zxing/qrcode/decoder/Decoder.java → .../google/zxing/qrcode/decoder/Decoder.java b/.../google/zxing/qrcode/decoder/Decoder.java → .../google/zxing/qrcode/decoder/Decoder.java
diff --git a/.../qrcode/decoder/ErrorCorrectionLevel.java → .../qrcode/decoder/ErrorCorrectionLevel.java b/.../qrcode/decoder/ErrorCorrectionLevel.java → .../qrcode/decoder/ErrorCorrectionLevel.java
diff --git a/...ing/qrcode/decoder/FormatInformation.java → ...ing/qrcode/decoder/FormatInformation.java b/...ing/qrcode/decoder/FormatInformation.java → ...ing/qrcode/decoder/FormatInformation.java
diff --git a/...com/google/zxing/qrcode/decoder/Mode.java → ...com/google/zxing/qrcode/decoder/Mode.java b/...com/google/zxing/qrcode/decoder/Mode.java → ...com/google/zxing/qrcode/decoder/Mode.java
diff --git a/...qrcode/decoder/QRCodeDecoderMetaData.java → ...qrcode/decoder/QRCodeDecoderMetaData.java b/...qrcode/decoder/QRCodeDecoderMetaData.java → ...qrcode/decoder/QRCodeDecoderMetaData.java
diff --git a/.../google/zxing/qrcode/decoder/Version.java → .../google/zxing/qrcode/decoder/Version.java b/.../google/zxing/qrcode/decoder/Version.java → .../google/zxing/qrcode/decoder/Version.java
diff --git a/...ing/qrcode/detector/AlignmentPattern.java → ...ing/qrcode/detector/AlignmentPattern.java b/...ing/qrcode/detector/AlignmentPattern.java → ...ing/qrcode/detector/AlignmentPattern.java
diff --git a/...code/detector/AlignmentPatternFinder.java → ...code/detector/AlignmentPatternFinder.java b/...code/detector/AlignmentPatternFinder.java → ...code/detector/AlignmentPatternFinder.java
diff --git a/...oogle/zxing/qrcode/detector/Detector.java → ...oogle/zxing/qrcode/detector/Detector.java b/...oogle/zxing/qrcode/detector/Detector.java → ...oogle/zxing/qrcode/detector/Detector.java
diff --git a/.../zxing/qrcode/detector/FinderPattern.java → .../zxing/qrcode/detector/FinderPattern.java b/.../zxing/qrcode/detector/FinderPattern.java → .../zxing/qrcode/detector/FinderPattern.java
diff --git a/.../qrcode/detector/FinderPatternFinder.java → .../qrcode/detector/FinderPatternFinder.java b/.../qrcode/detector/FinderPatternFinder.java → .../qrcode/detector/FinderPatternFinder.java
diff --git a/...ng/qrcode/detector/FinderPatternInfo.java → ...ng/qrcode/detector/FinderPatternInfo.java b/...ng/qrcode/detector/FinderPatternInfo.java → ...ng/qrcode/detector/FinderPatternInfo.java
diff --git a/...oogle/zxing/qrcode/encoder/BlockPair.java → ...oogle/zxing/qrcode/encoder/BlockPair.java b/...oogle/zxing/qrcode/encoder/BlockPair.java → ...oogle/zxing/qrcode/encoder/BlockPair.java
diff --git a/...ogle/zxing/qrcode/encoder/ByteMatrix.java → ...ogle/zxing/qrcode/encoder/ByteMatrix.java b/...ogle/zxing/qrcode/encoder/ByteMatrix.java → ...ogle/zxing/qrcode/encoder/ByteMatrix.java
diff --git a/.../google/zxing/qrcode/encoder/Encoder.java → .../google/zxing/qrcode/encoder/Encoder.java b/.../google/zxing/qrcode/encoder/Encoder.java → .../google/zxing/qrcode/encoder/Encoder.java
diff --git a/...google/zxing/qrcode/encoder/MaskUtil.java → ...google/zxing/qrcode/encoder/MaskUtil.java b/...google/zxing/qrcode/encoder/MaskUtil.java → ...google/zxing/qrcode/encoder/MaskUtil.java
diff --git a/...ogle/zxing/qrcode/encoder/MatrixUtil.java → ...ogle/zxing/qrcode/encoder/MatrixUtil.java b/...ogle/zxing/qrcode/encoder/MatrixUtil.java → ...ogle/zxing/qrcode/encoder/MatrixUtil.java
diff --git a/...m/google/zxing/qrcode/encoder/QRCode.java → ...m/google/zxing/qrcode/encoder/QRCode.java b/...m/google/zxing/qrcode/encoder/QRCode.java → ...m/google/zxing/qrcode/encoder/QRCode.java
diff --git a/...ogle/zxing/AllPositiveBlackBoxTester.java → ...ogle/zxing/AllPositiveBlackBoxTester.java b/...ogle/zxing/AllPositiveBlackBoxTester.java → ...ogle/zxing/AllPositiveBlackBoxTester.java
diff --git a/...e/zxing/BufferedImageLuminanceSource.java → ...e/zxing/BufferedImageLuminanceSource.java b/...e/zxing/BufferedImageLuminanceSource.java → ...e/zxing/BufferedImageLuminanceSource.java
diff --git a/...e/zxing/aztec/AztecBlackBox1TestCase.java → ...e/zxing/aztec/AztecBlackBox1TestCase.java b/...e/zxing/aztec/AztecBlackBox1TestCase.java → ...e/zxing/aztec/AztecBlackBox1TestCase.java
@@ -25,7 +25,7 @@
 public final class AztecBlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public AztecBlackBox1TestCase() {
-    super("test/data/blackbox/aztec-1", new AztecReader(), BarcodeFormat.AZTEC);
+    super("src/test/resources/blackbox/aztec-1", new AztecReader(), BarcodeFormat.AZTEC);
     addTest(12, 12, 0.0f);
     addTest(12, 12, 90.0f);
     addTest(12, 12, 180.0f);

diff --git a/...e/zxing/aztec/AztecBlackBox2TestCase.java → ...e/zxing/aztec/AztecBlackBox2TestCase.java b/...e/zxing/aztec/AztecBlackBox2TestCase.java → ...e/zxing/aztec/AztecBlackBox2TestCase.java
@@ -27,7 +27,7 @@
 public final class AztecBlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public AztecBlackBox2TestCase() {
-    super("test/data/blackbox/aztec-2", new AztecReader(), BarcodeFormat.AZTEC);
+    super("src/test/resources/blackbox/aztec-2", new AztecReader(), BarcodeFormat.AZTEC);
     addTest(5, 5, 0.0f);
     addTest(4, 4, 90.0f);
     addTest(6, 6, 180.0f);

diff --git a/...le/zxing/aztec/detector/DetectorTest.java → ...le/zxing/aztec/detector/DetectorTest.java b/...le/zxing/aztec/detector/DetectorTest.java → ...le/zxing/aztec/detector/DetectorTest.java
diff --git a/...ogle/zxing/aztec/encoder/EncoderTest.java → ...ogle/zxing/aztec/encoder/EncoderTest.java b/...ogle/zxing/aztec/encoder/EncoderTest.java → ...ogle/zxing/aztec/encoder/EncoderTest.java
diff --git a/...sult/AddressBookParsedResultTestCase.java → ...sult/AddressBookParsedResultTestCase.java b/...sult/AddressBookParsedResultTestCase.java → ...sult/AddressBookParsedResultTestCase.java
diff --git a/.../result/CalendarParsedResultTestCase.java → .../result/CalendarParsedResultTestCase.java b/.../result/CalendarParsedResultTestCase.java → .../result/CalendarParsedResultTestCase.java
diff --git a/...ult/EmailAddressParsedResultTestCase.java → ...ult/EmailAddressParsedResultTestCase.java b/...ult/EmailAddressParsedResultTestCase.java → ...ult/EmailAddressParsedResultTestCase.java
diff --git a/.../ExpandedProductParsedResultTestCase.java → .../ExpandedProductParsedResultTestCase.java b/.../ExpandedProductParsedResultTestCase.java → .../ExpandedProductParsedResultTestCase.java
diff --git a/...lient/result/GeoParsedResultTestCase.java → ...lient/result/GeoParsedResultTestCase.java b/...lient/result/GeoParsedResultTestCase.java → ...lient/result/GeoParsedResultTestCase.java
diff --git a/...ient/result/ISBNParsedResultTestCase.java → ...ient/result/ISBNParsedResultTestCase.java b/...ient/result/ISBNParsedResultTestCase.java → ...ient/result/ISBNParsedResultTestCase.java
diff --git a/...nt/result/ParsedReaderResultTestCase.java → ...nt/result/ParsedReaderResultTestCase.java b/...nt/result/ParsedReaderResultTestCase.java → ...nt/result/ParsedReaderResultTestCase.java
diff --git a/...t/result/ProductParsedResultTestCase.java → ...t/result/ProductParsedResultTestCase.java b/...t/result/ProductParsedResultTestCase.java → ...t/result/ProductParsedResultTestCase.java
diff --git a/...nt/result/SMSMMSParsedResultTestCase.java → ...nt/result/SMSMMSParsedResultTestCase.java b/...nt/result/SMSMMSParsedResultTestCase.java → ...nt/result/SMSMMSParsedResultTestCase.java
diff --git a/...lient/result/TelParsedResultTestCase.java → ...lient/result/TelParsedResultTestCase.java b/...lient/result/TelParsedResultTestCase.java → ...lient/result/TelParsedResultTestCase.java
diff --git a/...lient/result/URIParsedResultTestCase.java → ...lient/result/URIParsedResultTestCase.java b/...lient/result/URIParsedResultTestCase.java → ...lient/result/URIParsedResultTestCase.java
diff --git a/...ient/result/WifiParsedResultTestCase.java → ...ient/result/WifiParsedResultTestCase.java b/...ient/result/WifiParsedResultTestCase.java → ...ient/result/WifiParsedResultTestCase.java
diff --git a/...xing/common/AbstractBlackBoxTestCase.java → ...xing/common/AbstractBlackBoxTestCase.java b/...xing/common/AbstractBlackBoxTestCase.java → ...xing/common/AbstractBlackBoxTestCase.java
diff --git a/...mon/AbstractNegativeBlackBoxTestCase.java → ...mon/AbstractNegativeBlackBoxTestCase.java b/...mon/AbstractNegativeBlackBoxTestCase.java → ...mon/AbstractNegativeBlackBoxTestCase.java
diff --git a/...google/zxing/common/BitArrayTestCase.java → ...google/zxing/common/BitArrayTestCase.java b/...google/zxing/common/BitArrayTestCase.java → ...google/zxing/common/BitArrayTestCase.java
diff --git a/...oogle/zxing/common/BitMatrixTestCase.java → ...oogle/zxing/common/BitMatrixTestCase.java b/...oogle/zxing/common/BitMatrixTestCase.java → ...oogle/zxing/common/BitMatrixTestCase.java
diff --git a/...google/zxing/common/BitSourceBuilder.java → ...google/zxing/common/BitSourceBuilder.java b/...google/zxing/common/BitSourceBuilder.java → ...google/zxing/common/BitSourceBuilder.java
diff --git a/...oogle/zxing/common/BitSourceTestCase.java → ...oogle/zxing/common/BitSourceTestCase.java b/...oogle/zxing/common/BitSourceTestCase.java → ...oogle/zxing/common/BitSourceTestCase.java
diff --git a/.../common/PerspectiveTransformTestCase.java → .../common/PerspectiveTransformTestCase.java b/.../common/PerspectiveTransformTestCase.java → .../common/PerspectiveTransformTestCase.java
diff --git a/...gle/zxing/common/StringUtilsTestCase.java → ...gle/zxing/common/StringUtilsTestCase.java b/...gle/zxing/common/StringUtilsTestCase.java → ...gle/zxing/common/StringUtilsTestCase.java
diff --git a/...m/google/zxing/common/SummaryResults.java → ...m/google/zxing/common/SummaryResults.java b/...m/google/zxing/common/SummaryResults.java → ...m/google/zxing/common/SummaryResults.java
diff --git a/...c/com/google/zxing/common/TestResult.java → ...a/com/google/zxing/common/TestResult.java b/...c/com/google/zxing/common/TestResult.java → ...a/com/google/zxing/common/TestResult.java
diff --git a/...mmon/reedsolomon/ReedSolomonTestCase.java → ...mmon/reedsolomon/ReedSolomonTestCase.java b/...mmon/reedsolomon/ReedSolomonTestCase.java → ...mmon/reedsolomon/ReedSolomonTestCase.java
diff --git a/...tamatrix/DataMatrixBlackBox1TestCase.java → ...tamatrix/DataMatrixBlackBox1TestCase.java b/...tamatrix/DataMatrixBlackBox1TestCase.java → ...tamatrix/DataMatrixBlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class DataMatrixBlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public DataMatrixBlackBox1TestCase() {
-    super("test/data/blackbox/datamatrix-1", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX);
+    super("src/test/resources/blackbox/datamatrix-1", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX);
     addTest(18, 18, 0.0f);
     addTest(18, 18, 90.0f);
     addTest(18, 18, 180.0f);

diff --git a/...tamatrix/DataMatrixBlackBox2TestCase.java → ...tamatrix/DataMatrixBlackBox2TestCase.java b/...tamatrix/DataMatrixBlackBox2TestCase.java → ...tamatrix/DataMatrixBlackBox2TestCase.java
@@ -26,7 +26,7 @@
 public final class DataMatrixBlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public DataMatrixBlackBox2TestCase() {
-    super("test/data/blackbox/datamatrix-2", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX);
+    super("src/test/resources/blackbox/datamatrix-2", new MultiFormatReader(), BarcodeFormat.DATA_MATRIX);
     addTest(8, 15, 0, 1, 0.0f);
     addTest(14, 16, 0, 1, 90.0f);
     addTest(14, 15, 0, 1, 180.0f);

diff --git a/.../datamatrix/DataMatrixWriterTestCase.java → .../datamatrix/DataMatrixWriterTestCase.java b/.../datamatrix/DataMatrixWriterTestCase.java → .../datamatrix/DataMatrixWriterTestCase.java
diff --git a/...coder/DecodedBitStreamParserTestCase.java → ...coder/DecodedBitStreamParserTestCase.java b/...coder/DecodedBitStreamParserTestCase.java → ...coder/DecodedBitStreamParserTestCase.java
diff --git a/...ng/datamatrix/encoder/DebugPlacement.java → ...ng/datamatrix/encoder/DebugPlacement.java b/...ng/datamatrix/encoder/DebugPlacement.java → ...ng/datamatrix/encoder/DebugPlacement.java
diff --git a/...trix/encoder/ErrorCorrectionTestCase.java → ...trix/encoder/ErrorCorrectionTestCase.java b/...trix/encoder/ErrorCorrectionTestCase.java → ...trix/encoder/ErrorCorrectionTestCase.java
diff --git a/...trix/encoder/HighLevelEncodeTestCase.java → ...trix/encoder/HighLevelEncodeTestCase.java b/...trix/encoder/HighLevelEncodeTestCase.java → ...trix/encoder/HighLevelEncodeTestCase.java
diff --git a/...datamatrix/encoder/PlacementTestCase.java → ...datamatrix/encoder/PlacementTestCase.java b/...datamatrix/encoder/PlacementTestCase.java → ...datamatrix/encoder/PlacementTestCase.java
diff --git a/...atamatrix/encoder/SymbolInfoTestCase.java → ...atamatrix/encoder/SymbolInfoTestCase.java b/...atamatrix/encoder/SymbolInfoTestCase.java → ...atamatrix/encoder/SymbolInfoTestCase.java
diff --git a/...tive/FalsePositives2BlackBoxTestCase.java → ...tive/FalsePositives2BlackBoxTestCase.java b/...tive/FalsePositives2BlackBoxTestCase.java → ...tive/FalsePositives2BlackBoxTestCase.java
@@ -26,7 +26,7 @@
 public final class FalsePositives2BlackBoxTestCase extends AbstractNegativeBlackBoxTestCase {
 
   public FalsePositives2BlackBoxTestCase() {
-    super("test/data/blackbox/falsepositives-2");
+    super("src/test/resources/blackbox/falsepositives-2");
     addTest(4, 0.0f);
     addTest(4, 90.0f);
     addTest(4, 180.0f);

diff --git a/...ative/FalsePositivesBlackBoxTestCase.java → ...ative/FalsePositivesBlackBoxTestCase.java b/...ative/FalsePositivesBlackBoxTestCase.java → ...ative/FalsePositivesBlackBoxTestCase.java
@@ -26,7 +26,7 @@
 public final class FalsePositivesBlackBoxTestCase extends AbstractNegativeBlackBoxTestCase {
 
   public FalsePositivesBlackBoxTestCase() {
-    super("test/data/blackbox/falsepositives");
+    super("src/test/resources/blackbox/falsepositives");
     addTest(2, 0.0f);
     addTest(2, 90.0f);
     addTest(2, 180.0f);

diff --git a/...ing/negative/PartialBlackBoxTestCase.java → ...ing/negative/PartialBlackBoxTestCase.java b/...ing/negative/PartialBlackBoxTestCase.java → ...ing/negative/PartialBlackBoxTestCase.java
@@ -26,7 +26,7 @@
 public final class PartialBlackBoxTestCase extends AbstractNegativeBlackBoxTestCase {
 
   public PartialBlackBoxTestCase() {
-    super("test/data/blackbox/partial");
+    super("src/test/resources/blackbox/partial");
     addTest(2, 0.0f);
     addTest(2, 90.0f);
     addTest(2, 180.0f);

diff --git a/...negative/UnsupportedBlackBoxTestCase.java → ...negative/UnsupportedBlackBoxTestCase.java b/...negative/UnsupportedBlackBoxTestCase.java → ...negative/UnsupportedBlackBoxTestCase.java
@@ -26,7 +26,7 @@
 public final class UnsupportedBlackBoxTestCase extends AbstractNegativeBlackBoxTestCase {
 
   public UnsupportedBlackBoxTestCase() {
-    super("test/data/blackbox/unsupported");
+    super("src/test/resources/blackbox/unsupported");
     addTest(0, 0.0f);
     addTest(0, 90.0f);
     addTest(0, 180.0f);

diff --git a/...gle/zxing/oned/CodaBarWriterTestCase.java → ...gle/zxing/oned/CodaBarWriterTestCase.java b/...gle/zxing/oned/CodaBarWriterTestCase.java → ...gle/zxing/oned/CodaBarWriterTestCase.java
diff --git a/.../zxing/oned/CodabarBlackBox1TestCase.java → .../zxing/oned/CodabarBlackBox1TestCase.java b/.../zxing/oned/CodabarBlackBox1TestCase.java → .../zxing/oned/CodabarBlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class CodabarBlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public CodabarBlackBox1TestCase() {
-    super("test/data/blackbox/codabar-1", new MultiFormatReader(), BarcodeFormat.CODABAR);
+    super("src/test/resources/blackbox/codabar-1", new MultiFormatReader(), BarcodeFormat.CODABAR);
     addTest(11, 11, 0.0f);
     addTest(11, 11, 180.0f);
   }

diff --git a/.../zxing/oned/Code128BlackBox1TestCase.java → .../zxing/oned/Code128BlackBox1TestCase.java b/.../zxing/oned/Code128BlackBox1TestCase.java → .../zxing/oned/Code128BlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class Code128BlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public Code128BlackBox1TestCase() {
-    super("test/data/blackbox/code128-1", new MultiFormatReader(), BarcodeFormat.CODE_128);
+    super("src/test/resources/blackbox/code128-1", new MultiFormatReader(), BarcodeFormat.CODE_128);
     addTest(5, 5, 0.0f);
     addTest(5, 5, 180.0f);
   }

diff --git a/.../zxing/oned/Code128BlackBox2TestCase.java → .../zxing/oned/Code128BlackBox2TestCase.java b/.../zxing/oned/Code128BlackBox2TestCase.java → .../zxing/oned/Code128BlackBox2TestCase.java
@@ -26,7 +26,7 @@
 public final class Code128BlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public Code128BlackBox2TestCase() {
-    super("test/data/blackbox/code128-2", new MultiFormatReader(), BarcodeFormat.CODE_128);
+    super("src/test/resources/blackbox/code128-2", new MultiFormatReader(), BarcodeFormat.CODE_128);
     addTest(36, 39, 0.0f);
     addTest(36, 39, 180.0f);
   }

diff --git a/.../zxing/oned/Code128BlackBox3TestCase.java → .../zxing/oned/Code128BlackBox3TestCase.java b/.../zxing/oned/Code128BlackBox3TestCase.java → .../zxing/oned/Code128BlackBox3TestCase.java
@@ -26,7 +26,7 @@
 public final class Code128BlackBox3TestCase extends AbstractBlackBoxTestCase {
 
   public Code128BlackBox3TestCase() {
-    super("test/data/blackbox/code128-3", new MultiFormatReader(), BarcodeFormat.CODE_128);
+    super("src/test/resources/blackbox/code128-3", new MultiFormatReader(), BarcodeFormat.CODE_128);
     addTest(2, 2, 0.0f);
     addTest(2, 2, 180.0f);
   }

diff --git a/...e/zxing/oned/Code39BlackBox1TestCase.java → ...e/zxing/oned/Code39BlackBox1TestCase.java b/...e/zxing/oned/Code39BlackBox1TestCase.java → ...e/zxing/oned/Code39BlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class Code39BlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public Code39BlackBox1TestCase() {
-    super("test/data/blackbox/code39-1", new MultiFormatReader(), BarcodeFormat.CODE_39);
+    super("src/test/resources/blackbox/code39-1", new MultiFormatReader(), BarcodeFormat.CODE_39);
     addTest(4, 4, 0.0f);
     addTest(4, 4, 180.0f);
   }

diff --git a/...e/zxing/oned/Code39BlackBox3TestCase.java → ...e/zxing/oned/Code39BlackBox3TestCase.java b/...e/zxing/oned/Code39BlackBox3TestCase.java → ...e/zxing/oned/Code39BlackBox3TestCase.java
@@ -26,7 +26,7 @@
 public final class Code39BlackBox3TestCase extends AbstractBlackBoxTestCase {
 
   public Code39BlackBox3TestCase() {
-    super("test/data/blackbox/code39-3", new MultiFormatReader(), BarcodeFormat.CODE_39);
+    super("src/test/resources/blackbox/code39-3", new MultiFormatReader(), BarcodeFormat.CODE_39);
     addTest(17, 17, 0.0f);
     addTest(17, 17, 180.0f);
   }

diff --git a/...oned/Code39ExtendedBlackBox2TestCase.java → ...oned/Code39ExtendedBlackBox2TestCase.java b/...oned/Code39ExtendedBlackBox2TestCase.java → ...oned/Code39ExtendedBlackBox2TestCase.java
@@ -25,7 +25,7 @@
 public final class Code39ExtendedBlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public Code39ExtendedBlackBox2TestCase() {
-    super("test/data/blackbox/code39-2", new Code39Reader(false, true), BarcodeFormat.CODE_39);
+    super("src/test/resources/blackbox/code39-2", new Code39Reader(false, true), BarcodeFormat.CODE_39);
     addTest(2, 2, 0.0f);
     addTest(2, 2, 180.0f);
   }

diff --git a/...e/zxing/oned/Code93BlackBox1TestCase.java → ...e/zxing/oned/Code93BlackBox1TestCase.java b/...e/zxing/oned/Code93BlackBox1TestCase.java → ...e/zxing/oned/Code93BlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class Code93BlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public Code93BlackBox1TestCase() {
-    super("test/data/blackbox/code93-1", new MultiFormatReader(), BarcodeFormat.CODE_93);
+    super("src/test/resources/blackbox/code93-1", new MultiFormatReader(), BarcodeFormat.CODE_93);
     addTest(3, 3, 0.0f);
     addTest(3, 3, 180.0f);
   }

diff --git a/...le/zxing/oned/EAN13BlackBox1TestCase.java → ...le/zxing/oned/EAN13BlackBox1TestCase.java b/...le/zxing/oned/EAN13BlackBox1TestCase.java → ...le/zxing/oned/EAN13BlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class EAN13BlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public EAN13BlackBox1TestCase() {
-    super("test/data/blackbox/ean13-1", new MultiFormatReader(), BarcodeFormat.EAN_13);
+    super("src/test/resources/blackbox/ean13-1", new MultiFormatReader(), BarcodeFormat.EAN_13);
     addTest(30, 32, 0.0f);
     addTest(27, 32, 180.0f);
   }

diff --git a/...le/zxing/oned/EAN13BlackBox2TestCase.java → ...le/zxing/oned/EAN13BlackBox2TestCase.java b/...le/zxing/oned/EAN13BlackBox2TestCase.java → ...le/zxing/oned/EAN13BlackBox2TestCase.java
@@ -28,7 +28,7 @@
 public final class EAN13BlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public EAN13BlackBox2TestCase() {
-    super("test/data/blackbox/ean13-2", new MultiFormatReader(), BarcodeFormat.EAN_13);
+    super("src/test/resources/blackbox/ean13-2", new MultiFormatReader(), BarcodeFormat.EAN_13);
     addTest(12, 17, 0, 1, 0.0f);
     addTest(11, 17, 0, 1, 180.0f);
   }

diff --git a/...le/zxing/oned/EAN13BlackBox3TestCase.java → ...le/zxing/oned/EAN13BlackBox3TestCase.java b/...le/zxing/oned/EAN13BlackBox3TestCase.java → ...le/zxing/oned/EAN13BlackBox3TestCase.java
@@ -26,7 +26,7 @@
 public final class EAN13BlackBox3TestCase extends AbstractBlackBoxTestCase {
 
   public EAN13BlackBox3TestCase() {
-    super("test/data/blackbox/ean13-3", new MultiFormatReader(), BarcodeFormat.EAN_13);
+    super("src/test/resources/blackbox/ean13-3", new MultiFormatReader(), BarcodeFormat.EAN_13);
     addTest(53, 55, 0.0f);
     addTest(55, 55, 180.0f);
   }

diff --git a/...le/zxing/oned/EAN13BlackBox4TestCase.java → ...le/zxing/oned/EAN13BlackBox4TestCase.java b/...le/zxing/oned/EAN13BlackBox4TestCase.java → ...le/zxing/oned/EAN13BlackBox4TestCase.java
@@ -27,7 +27,7 @@
 public final class EAN13BlackBox4TestCase extends AbstractBlackBoxTestCase {
 
   public EAN13BlackBox4TestCase() {
-    super("test/data/blackbox/ean13-4", new MultiFormatReader(), BarcodeFormat.EAN_13);
+    super("src/test/resources/blackbox/ean13-4", new MultiFormatReader(), BarcodeFormat.EAN_13);
     addTest(6, 13, 1, 1, 0.0f);
     addTest(7, 13, 1, 1, 180.0f);
   }

diff --git a/...ng/oned/EAN13BlackBox5BlurryTestCase.java → ...ng/oned/EAN13BlackBox5BlurryTestCase.java b/...ng/oned/EAN13BlackBox5BlurryTestCase.java → ...ng/oned/EAN13BlackBox5BlurryTestCase.java
@@ -27,7 +27,7 @@
 public final class EAN13BlackBox5BlurryTestCase extends AbstractBlackBoxTestCase {
 
   public EAN13BlackBox5BlurryTestCase() {
-    super("test/data/blackbox/ean13-5", new MultiFormatReader(), BarcodeFormat.EAN_13);
+    super("src/test/resources/blackbox/ean13-5", new MultiFormatReader(), BarcodeFormat.EAN_13);
     addTest(0, 0, 0.0f);
     addTest(0, 0, 180.0f);
   }

diff --git a/...oogle/zxing/oned/EAN13WriterTestCase.java → ...oogle/zxing/oned/EAN13WriterTestCase.java b/...oogle/zxing/oned/EAN13WriterTestCase.java → ...oogle/zxing/oned/EAN13WriterTestCase.java
diff --git a/...gle/zxing/oned/EAN8BlackBox1TestCase.java → ...gle/zxing/oned/EAN8BlackBox1TestCase.java b/...gle/zxing/oned/EAN8BlackBox1TestCase.java → ...gle/zxing/oned/EAN8BlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class EAN8BlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public EAN8BlackBox1TestCase() {
-    super("test/data/blackbox/ean8-1", new MultiFormatReader(), BarcodeFormat.EAN_8);
+    super("src/test/resources/blackbox/ean8-1", new MultiFormatReader(), BarcodeFormat.EAN_8);
     addTest(8, 8, 0.0f);
     addTest(8, 8, 180.0f);
   }

diff --git a/...google/zxing/oned/EAN8WriterTestCase.java → ...google/zxing/oned/EAN8WriterTestCase.java b/...google/zxing/oned/EAN8WriterTestCase.java → ...google/zxing/oned/EAN8WriterTestCase.java
diff --git a/...g/oned/EANManufacturerOrgSupportTest.java → ...g/oned/EANManufacturerOrgSupportTest.java b/...g/oned/EANManufacturerOrgSupportTest.java → ...g/oned/EANManufacturerOrgSupportTest.java
diff --git a/...ogle/zxing/oned/ITFBlackBox1TestCase.java → ...ogle/zxing/oned/ITFBlackBox1TestCase.java b/...ogle/zxing/oned/ITFBlackBox1TestCase.java → ...ogle/zxing/oned/ITFBlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class ITFBlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public ITFBlackBox1TestCase() {
-    super("test/data/blackbox/itf-1", new MultiFormatReader(), BarcodeFormat.ITF);
+    super("src/test/resources/blackbox/itf-1", new MultiFormatReader(), BarcodeFormat.ITF);
     addTest(9, 13, 0.0f);
     addTest(12, 13, 180.0f);
   }

diff --git a/...ogle/zxing/oned/ITFBlackBox2TestCase.java → ...ogle/zxing/oned/ITFBlackBox2TestCase.java b/...ogle/zxing/oned/ITFBlackBox2TestCase.java → ...ogle/zxing/oned/ITFBlackBox2TestCase.java
@@ -26,7 +26,7 @@
 public final class ITFBlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public ITFBlackBox2TestCase() {
-    super("test/data/blackbox/itf-2", new MultiFormatReader(), BarcodeFormat.ITF);
+    super("src/test/resources/blackbox/itf-2", new MultiFormatReader(), BarcodeFormat.ITF);
     addTest(13, 13, 0.0f);
     addTest(13, 13, 180.0f);
   }

diff --git a/...gle/zxing/oned/UPCABlackBox1TestCase.java → ...gle/zxing/oned/UPCABlackBox1TestCase.java b/...gle/zxing/oned/UPCABlackBox1TestCase.java → ...gle/zxing/oned/UPCABlackBox1TestCase.java
@@ -26,7 +26,7 @@
 public final class UPCABlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox1TestCase() {
-    super("test/data/blackbox/upca-1", new MultiFormatReader(), BarcodeFormat.UPC_A);
+    super("src/test/resources/blackbox/upca-1", new MultiFormatReader(), BarcodeFormat.UPC_A);
     addTest(14, 18, 0, 1, 0.0f);
     addTest(16, 18, 0, 1, 180.0f);
   }

diff --git a/...gle/zxing/oned/UPCABlackBox2TestCase.java → ...gle/zxing/oned/UPCABlackBox2TestCase.java b/...gle/zxing/oned/UPCABlackBox2TestCase.java → ...gle/zxing/oned/UPCABlackBox2TestCase.java
@@ -26,7 +26,7 @@
 public final class UPCABlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox2TestCase() {
-    super("test/data/blackbox/upca-2", new MultiFormatReader(), BarcodeFormat.UPC_A);
+    super("src/test/resources/blackbox/upca-2", new MultiFormatReader(), BarcodeFormat.UPC_A);
     addTest(30, 36, 0, 2, 0.0f);
     addTest(31, 36, 0, 2, 180.0f);
   }

diff --git a/...oned/UPCABlackBox3ReflectiveTestCase.java → ...oned/UPCABlackBox3ReflectiveTestCase.java b/...oned/UPCABlackBox3ReflectiveTestCase.java → ...oned/UPCABlackBox3ReflectiveTestCase.java
@@ -26,7 +26,7 @@
 public final class UPCABlackBox3ReflectiveTestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox3ReflectiveTestCase() {
-    super("test/data/blackbox/upca-3", new MultiFormatReader(), BarcodeFormat.UPC_A);
+    super("src/test/resources/blackbox/upca-3", new MultiFormatReader(), BarcodeFormat.UPC_A);
     addTest(7, 9, 0, 2, 0.0f);
     addTest(8, 9, 0, 2, 180.0f);
   }

diff --git a/...gle/zxing/oned/UPCABlackBox4TestCase.java → ...gle/zxing/oned/UPCABlackBox4TestCase.java b/...gle/zxing/oned/UPCABlackBox4TestCase.java → ...gle/zxing/oned/UPCABlackBox4TestCase.java
@@ -26,7 +26,7 @@
 public final class UPCABlackBox4TestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox4TestCase() {
-    super("test/data/blackbox/upca-4", new MultiFormatReader(), BarcodeFormat.UPC_A);
+    super("src/test/resources/blackbox/upca-4", new MultiFormatReader(), BarcodeFormat.UPC_A);
     addTest(9, 11, 0, 1, 0.0f);
     addTest(9, 11, 0, 1, 180.0f);
   }

diff --git a/...gle/zxing/oned/UPCABlackBox5TestCase.java → ...gle/zxing/oned/UPCABlackBox5TestCase.java b/...gle/zxing/oned/UPCABlackBox5TestCase.java → ...gle/zxing/oned/UPCABlackBox5TestCase.java
@@ -26,7 +26,7 @@
 public final class UPCABlackBox5TestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox5TestCase() {
-    super("test/data/blackbox/upca-5", new MultiFormatReader(), BarcodeFormat.UPC_A);
+    super("src/test/resources/blackbox/upca-5", new MultiFormatReader(), BarcodeFormat.UPC_A);
     addTest(20, 23, 0, 0, 0.0f);
     addTest(22, 23, 0, 0, 180.0f);
   }

diff --git a/...ing/oned/UPCABlackBox6BlurryTestCase.java → ...ing/oned/UPCABlackBox6BlurryTestCase.java b/...ing/oned/UPCABlackBox6BlurryTestCase.java → ...ing/oned/UPCABlackBox6BlurryTestCase.java
@@ -27,7 +27,7 @@
 public final class UPCABlackBox6BlurryTestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox6BlurryTestCase() {
-    super("test/data/blackbox/upca-6", new MultiFormatReader(), BarcodeFormat.UPC_A);
+    super("src/test/resources/blackbox/upca-6", new MultiFormatReader(), BarcodeFormat.UPC_A);
     addTest(0, 0, 0.0f);
     addTest(0, 0, 180.0f);
   }