diff --git a/src/aztec.rs b/src/aztec.rs
index 25fa82c..41c0034 100644
--- a/src/aztec.rs
+++ b/src/aztec.rs
@@ -8,7 +8,7 @@ use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,FormatException,NotFoundEx
 use crate::aztec::decoder::Decoder;
 use crate::aztec::detector::Detector;
 
-use crate::aztec::encoder{AztecCode,Encoder};
+use crate::aztec::encoder::{AztecCode,Encoder};
 
 
 // AztecDetectorResult.java
diff --git a/src/aztec/decoder.rs b/src/aztec/decoder.rs
index db3bc99..60ea8a2 100644
--- a/src/aztec/decoder.rs
+++ b/src/aztec/decoder.rs
@@ -1,11 +1,7 @@
-import com.google.zxing.FormatException;
-import com.google.zxing.aztec.AztecDetectorResult;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.CharacterSetECI;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.common.reedsolomon.GenericGF;
-import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
-import com.google.zxing.common.reedsolomon.ReedSolomonException;
+use create::FormatException;
+use crate::aztec::AztecDetectorResult;
+use crate::common::{BitMatrix,CharacterSetECI,DecoderResult};
+use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
 
 /**
  * <p>The main class which implements Aztec Code decoding -- as opposed to locating and extracting
diff --git a/src/aztec/detector.rs b/src/aztec/detector.rs
index 82941c4..139897c 100644
--- a/src/aztec/detector.rs
+++ b/src/aztec/detector.rs
@@ -1,13 +1,8 @@
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.aztec.AztecDetectorResult;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.GridSampler;
-import com.google.zxing.common.detector.MathUtils;
-import com.google.zxing.common.detector.WhiteRectangleDetector;
-import com.google.zxing.common.reedsolomon.GenericGF;
-import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
-import com.google.zxing.common.reedsolomon.ReedSolomonException;
+use crate::{NotFoundException,ResultPoint};
+use crate::aztec::AztecDetectorResult;
+use crate::common::{BitMatrix,GridSampler};
+use crate::common::detector::{MathUtils,WhiteRectangleDetector};
+use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
 
 
 /**
diff --git a/src/aztec/encoder.rs b/src/aztec/encoder.rs
index 1628bfb..1109331 100644
--- a/src/aztec/encoder.rs
+++ b/src/aztec/encoder.rs
@@ -1,5 +1,5 @@
 use crate::common::{BitArray,BitMatrix,CharacterSetECI};
-use crate::common::reedsolomon{GenericGF,ReedSolomonEncoder};
+use crate::common::reedsolomon::{GenericGF,ReedSolomonEncoder};
 
 // Token.java
 const EMPTY: Token = SimpleToken::new(null, 0, 0);
diff --git a/src/datamatrix.rs b/src/datamatrix.rs
index d6af627..add30d2 100644
--- a/src/datamatrix.rs
+++ b/src/datamatrix.rs
@@ -1,31 +1,10 @@
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.ChecksumException;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.FormatException;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.Reader;
-import com.google.zxing.Result;
-import com.google.zxing.ResultMetadataType;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.common.DetectorResult;
-import com.google.zxing.datamatrix.decoder.Decoder;
-import com.google.zxing.datamatrix.detector.Detector;
+use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,ChecksumException,FormatException,NotFoundException,Reader,RXingResult,ResultMetadataType,ResultPoint,EncodeHintType,Writer,Dimension};
+use crate::common::{DecoderResult,BitMatrix,DetectorResult,};
+use crate::datamatrix::decoder::{Decoder};
+use crate::datamatrix::detector::{Detector};
+use crate::datamatrix::encoder::{DefaultPlacement,ErrorCorrection,HighLevelEncoder,MinimalEncoder,SymbolInfo,SymbolShapeHint};
+use crate::qrcode::encoder::ByteMatrix;
 
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.Writer;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.datamatrix.encoder.DefaultPlacement;
-import com.google.zxing.Dimension;
-import com.google.zxing.datamatrix.encoder.ErrorCorrection;
-import com.google.zxing.datamatrix.encoder.HighLevelEncoder;
-import com.google.zxing.datamatrix.encoder.MinimalEncoder;
-import com.google.zxing.datamatrix.encoder.SymbolInfo;
-import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
-import com.google.zxing.qrcode.encoder.ByteMatrix;
 
 // DataMatrixReader.java
 /**
diff --git a/src/datamatrix/decoder.rs b/src/datamatrix/decoder.rs
index ae76062..7782c0b 100644
--- a/src/datamatrix/decoder.rs
+++ b/src/datamatrix/decoder.rs
@@ -1,21 +1,7 @@
-//
+use crate::{FormatException,ChecksumException,FormatException};
+use crate::common::{BitMatrix,DecoderResult,BitSource,ECIStringBuilder};
+use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
 
-import com.google.zxing.FormatException;
-
-import com.google.zxing.ChecksumException;
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.common.reedsolomon.GenericGF;
-import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
-import com.google.zxing.common.reedsolomon.ReedSolomonException;
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
-
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitSource;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.common.ECIStringBuilder;
 
 // BitMatrixParser.java
 /**
diff --git a/src/datamatrix/detector.rs b/src/datamatrix/detector.rs
index 931ea8d..81b9ced 100644
--- a/src/datamatrix/detector.rs
+++ b/src/datamatrix/detector.rs
@@ -1,9 +1,6 @@
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.DetectorResult;
-import com.google.zxing.common.GridSampler;
-import com.google.zxing.common.detector.WhiteRectangleDetector;
+use crate::{NotFoundException,ResultPoint};
+use crate::common::{BitMatrix,DetectorResult,GridSampler};
+use crate::common::detector::WhiteRectangleDetector;
 
 // Detector.java
 /**
diff --git a/src/datamatrix/encoder.rs b/src/datamatrix/encoder.rs
index baf8f84..f9a4e83 100644
--- a/src/datamatrix/encoder.rs
+++ b/src/datamatrix/encoder.rs
@@ -1,5 +1,5 @@
-import com.google.zxing.Dimension;
-import com.google.zxing.common.MinimalECIInput;
+use crate::Dimension;
+use crate::common::MinimalECIInput;
 
 // ASCIIEncoder.java
 
diff --git a/src/multi/qrcode.rs b/src/multi/qrcode.rs
index 8be9931..922c385 100644
--- a/src/multi/qrcode.rs
+++ b/src/multi/qrcode.rs
@@ -1,5 +1,5 @@
 use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,NotFoundException,ReaderException,RXingResult,ResultMetadataType,ResultPoint};
-use crate::common{DecoderResult,DetectorResult};
+use crate::common::{DecoderResult,DetectorResult};
 use crate::multi::{MultipleBarcodeReader};
 use crate::multi::qrcode::detector::MultiDetector;
 use create::qrcode::{QRCodeReader};
diff --git a/src/oned/rss.rs b/src/oned/rss.rs
index 8498a81..8ac3be6 100644
--- a/src/oned/rss.rs
+++ b/src/oned/rss.rs
@@ -1,18 +1,7 @@
-import com.google.zxing.NotFoundException;
-import com.google.zxing.common.detector.MathUtils;
-import com.google.zxing.oned.OneDReader;
-
-import com.google.zxing.ResultPoint;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.Result;
-import com.google.zxing.ResultMetadataType;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.ResultPointCallback;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.common.detector.MathUtils;
+use crate::{NotFoundException,ResultPoint,BarcodeFormat,DecodeHintType,NotFoundException,RXingResult,ResultMetadataType,ResultPoint,ResultPointCallback};
+use crate::common::BitArray;
+use crate::common::detector::{MathUtils};
+use crate::oned::{OneDReader};
 
 
 
diff --git a/src/oned/rss/expanded.rs b/src/oned/rss/expanded.rs
index cf73a7e..0de6532 100644
--- a/src/oned/rss/expanded.rs
+++ b/src/oned/rss/expanded.rs
@@ -1,22 +1,8 @@
-import com.google.zxing.common.BitArray;
+use crate::{BarcodeFormat,DecodeHintType,FormatException,NotFoundException,RXingResult,ResultMetadataType,ResultPoint};
+use crate::common::BitArray;
+use crate::oned::rss::{DataCharacter,FinderPattern,AbstractRSSReader,RSSUtils};
+use crate::oned::rss::expanded::decoders::AbstractExpandedDecoder;
 
-import com.google.zxing.oned.rss.DataCharacter;
-import com.google.zxing.oned.rss.FinderPattern;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.FormatException;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.Result;
-import com.google.zxing.ResultMetadataType;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.common.detector.MathUtils;
-import com.google.zxing.oned.rss.AbstractRSSReader;
-import com.google.zxing.oned.rss.DataCharacter;
-import com.google.zxing.oned.rss.FinderPattern;
-import com.google.zxing.oned.rss.RSSUtils;
-import com.google.zxing.oned.rss.expanded.decoders.AbstractExpandedDecoder;
 
 // NEW FILE: bit_array_builder.rs
 /*
diff --git a/src/oned/rss/expanded/decoders.rs b/src/oned/rss/expanded/decoders.rs
index 9d96bed..36fbd64 100644
--- a/src/oned/rss/expanded/decoders.rs
+++ b/src/oned/rss/expanded/decoders.rs
@@ -1,15 +1,5 @@
-import com.google.zxing.FormatException;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.common.BitArray;
-
-import com.google.zxing.FormatException;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.common.BitArray;
-
-import com.google.zxing.NotFoundException;
-import com.google.zxing.common.BitArray;
-
-import com.google.zxing.FormatException;
+use crate::{FormatException,NotFoundException};
+use crate::common::BitArray;
 
 
 
diff --git a/src/pdf417/decoder.rs b/src/pdf417/decoder.rs
index a532da2..935eb01 100644
--- a/src/pdf417/decoder.rs
+++ b/src/pdf417/decoder.rs
@@ -1,31 +1,9 @@
-import com.google.zxing.pdf417.PDF417Common;
+use crate::pdf417::decoder::ec::ErrorCorrection;
+use crate::common::detector::MathUtils;
+use crate::common::{BitMatrix,ECIStringBuilder,DecoderResult};
+use crate::{NotFoundException,ResultPoint,FormatException,ChecksumException,};
+use crate::pdf417::{PDF417Common,PDF417ResultMetadata};
 
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.common.BitMatrix;
-
-import com.google.zxing.FormatException;
-import com.google.zxing.common.ECIStringBuilder;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.pdf417.PDF417ResultMetadata;
-
-import com.google.zxing.pdf417.PDF417Common;
-
-import com.google.zxing.ResultPoint;
-import com.google.zxing.pdf417.PDF417Common;
-
-import com.google.zxing.common.detector.MathUtils;
-import com.google.zxing.pdf417.PDF417Common;
-
-import com.google.zxing.ChecksumException;
-import com.google.zxing.FormatException;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.common.detector.MathUtils;
-import com.google.zxing.pdf417.PDF417Common;
-import com.google.zxing.pdf417.decoder.ec.ErrorCorrection;
 
 // NEW FILE: barcode_metadata.rs
 /*
diff --git a/src/pdf417/decoder/ec.rs b/src/pdf417/decoder/ec.rs
index b1e5975..d67dcbc 100644
--- a/src/pdf417/decoder/ec.rs
+++ b/src/pdf417/decoder/ec.rs
@@ -1,7 +1,5 @@
-import com.google.zxing.ChecksumException;
-
-import com.google.zxing.pdf417.PDF417Common;
-
+use crate::ChecksumException;
+use crate::pdf417::PDF417Common;
 
 
 
diff --git a/src/pdf417/detector.rs b/src/pdf417/detector.rs
index 72f5205..6df7e18 100644
--- a/src/pdf417/detector.rs
+++ b/src/pdf417/detector.rs
@@ -1,13 +1,5 @@
-
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.common.BitMatrix;
-
-
-import com.google.zxing.ResultPoint;
-import com.google.zxing.common.BitMatrix;
+use crate::{BinaryBitmap,NotFoundException,DecodeHintType,ResultPoint};
+use crate::common::BitMatrix;
 
 // NEW FILE: detector.rs
 /*
diff --git a/src/pdf417/encoder.rs b/src/pdf417/encoder.rs
index 72c6ac1..ef21bd2 100644
--- a/src/pdf417/encoder.rs
+++ b/src/pdf417/encoder.rs
@@ -1,10 +1,5 @@
-import com.google.zxing.WriterException;
-
-import com.google.zxing.WriterException;
-import com.google.zxing.common.CharacterSetECI;
-import com.google.zxing.common.ECIInput;
-import com.google.zxing.common.MinimalECIInput;
-
+use crate::{WriterException,};
+use crate::common::{CharacterSetECI,ECIInput,MinimalECIInput};
 
 
 // NEW FILE: barcode_matrix.rs
diff --git a/src/qrcode/decoder.rs b/src/qrcode/decoder.rs
index 18e8694..199ce5c 100644
--- a/src/qrcode/decoder.rs
+++ b/src/qrcode/decoder.rs
@@ -1,34 +1,6 @@
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
-
-
-import com.google.zxing.common.BitMatrix;
-
-
-
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitSource;
-import com.google.zxing.common.CharacterSetECI;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.common.StringUtils;
-
-
-import com.google.zxing.ChecksumException;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.DecoderResult;
-import com.google.zxing.common.reedsolomon.GenericGF;
-import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
-import com.google.zxing.common.reedsolomon.ReedSolomonException;
-
-
-import com.google.zxing.ResultPoint;
-
-
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
+use crate::{FormatException,DecodeHintType,ChecksumException,ResultPoint};
+use crate::comon::{BitMatrix,BitSource,CharacterSetECI,DecoderResult,StringUtils};
+use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
 
 
 
diff --git a/src/qrcode/detector.rs b/src/qrcode/detector.rs
index 76a846f..206690d 100644
--- a/src/qrcode/detector.rs
+++ b/src/qrcode/detector.rs
@@ -1,30 +1,7 @@
-import com.google.zxing.ResultPoint;
-
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPointCallback;
-import com.google.zxing.common.BitMatrix;
-
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.FormatException;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.ResultPointCallback;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.DetectorResult;
-import com.google.zxing.common.GridSampler;
-import com.google.zxing.common.PerspectiveTransform;
-import com.google.zxing.common.detector.MathUtils;
-import com.google.zxing.qrcode.decoder.Version;
-
-import com.google.zxing.ResultPoint;
-
-
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.ResultPointCallback;
-import com.google.zxing.common.BitMatrix;
-
+use crate::{ResultPoint,NotFoundException,ResultPointCallback,DecodeHintType,FormatException};
+use crate::common::{BitMatrix,DetectorResult,GridSampler,PerspectiveTransform};
+use crate::common::detector::{MathUtils};
+use crate::qrcode::decoder::Version;
 
 
 // NEW FILE: alignment_pattern.rs
diff --git a/src/qrcode/encoder.rs b/src/qrcode/encoder.rs
index 3a24968..59011d2 100644
--- a/src/qrcode/encoder.rs
+++ b/src/qrcode/encoder.rs
@@ -1,30 +1,7 @@
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.common.StringUtils;
-import com.google.zxing.common.CharacterSetECI;
-import com.google.zxing.common.reedsolomon.GenericGF;
-import com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.decoder.Mode;
-import com.google.zxing.qrcode.decoder.Version;
-
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.decoder.Version;
-
-import com.google.zxing.qrcode.decoder.Mode;
-import com.google.zxing.qrcode.decoder.Version;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.common.ECIEncoderSet;
-import com.google.zxing.WriterException;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.decoder.Mode;
-import com.google.zxing.qrcode.decoder.Version;
-
+use crate::{EncodeHintType,WriterException,};
+use crate::common::{BitArray,StringUtils,CharacterSetECI,ECIEncoderSet,};
+use crate::common::reedsolmon::{GenericGF,ReedSolomonEncoder,};
+use crate::qrcode::decoder::{ErrorCorrectionLevel,Mode,Version,};
 
 // NEW FILE: block_pair.rs
 /*