diff --git a/src/Data/MaskPatternTester.php b/src/Common/MaskPatternTester.php
similarity index 98%
rename from src/Data/MaskPatternTester.php
rename to src/Common/MaskPatternTester.php
index 942d09244..abda352a7 100644
--- a/src/Data/MaskPatternTester.php
+++ b/src/Common/MaskPatternTester.php
@@ -10,9 +10,9 @@
  * @noinspection PhpUnused
  */
 
-namespace chillerlan\QRCode\Data;
+namespace chillerlan\QRCode\Common;
 
-use chillerlan\QRCode\Common\MaskPattern;
+use chillerlan\QRCode\Data\QRData;
 use function abs, array_search, call_user_func_array, min;
 
 /**
diff --git a/src/QRCode.php b/src/QRCode.php
index 1ab3e4844..6e655450b 100755
--- a/src/QRCode.php
+++ b/src/QRCode.php
@@ -11,9 +11,9 @@
 namespace chillerlan\QRCode;
 
 use chillerlan\QRCode\Data\{
-	AlphaNum, Byte, ECI, Kanji, MaskPatternTester, Number, QRData, QRCodeDataException, QRDataModeInterface, QRMatrix
+	AlphaNum, Byte, ECI, Kanji, Number, QRData, QRCodeDataException, QRDataModeInterface, QRMatrix
 };
-use chillerlan\QRCode\Common\{ECICharset, MaskPattern, Mode};
+use chillerlan\QRCode\Common\{ECICharset, MaskPattern, MaskPatternTester, Mode};
 use chillerlan\QRCode\Output\{QRCodeOutputException, QRFpdf, QRImage, QRImagick, QRMarkup, QROutputInterface, QRString};
 use chillerlan\Settings\SettingsContainerInterface;
 use function class_exists, in_array, mb_convert_encoding, mb_detect_encoding;
diff --git a/tests/Data/MaskPatternTesterTest.php b/tests/Common/MaskPatternTesterTest.php
similarity index 86%
rename from tests/Data/MaskPatternTesterTest.php
rename to tests/Common/MaskPatternTesterTest.php
index cf162be38..d08889255 100644
--- a/tests/Data/MaskPatternTesterTest.php
+++ b/tests/Common/MaskPatternTesterTest.php
@@ -8,11 +8,11 @@
  * @license      MIT
  */
 
-namespace chillerlan\QRCodeTest\Data;
+namespace chillerlan\QRCodeTest\Common;
 
-use chillerlan\QRCode\Common\MaskPattern;
+use chillerlan\QRCode\Common\{MaskPattern, MaskPatternTester};
+use chillerlan\QRCode\Data\{Byte, QRData};
 use chillerlan\QRCode\QROptions;
-use chillerlan\QRCode\Data\{Byte, MaskPatternTester, QRData};
 use PHPUnit\Framework\TestCase;
 
 /**