diff --git a/Build/UnitTestsBootstrap.php b/Build/UnitTestsBootstrap.php
index de4a525ec..340588a39 100644
--- a/Build/UnitTestsBootstrap.php
+++ b/Build/UnitTestsBootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the TYPO3 CMS project.
  *
diff --git a/Build/php-cs-fixer/config.php b/Build/php-cs-fixer/config.php
index eccbf146d..f8fa5c273 100644
--- a/Build/php-cs-fixer/config.php
+++ b/Build/php-cs-fixer/config.php
@@ -1,5 +1,18 @@
 <?php
 
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
 if (PHP_SAPI !== 'cli') {
     die('This script supports command line usage only. Please check your command.');
 }
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index fad2eb3c6..ccd9542c6 100644
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
diff --git a/Classes/Exception.php b/Classes/Exception.php
index f135b2bc9..cfb19e5c9 100644
--- a/Classes/Exception.php
+++ b/Classes/Exception.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide;
+
 /**
  * General styleguide exception
  */
diff --git a/Classes/Form/Element/User1Element.php b/Classes/Form/Element/User1Element.php
index 10722a8f6..d2e16e8d9 100644
--- a/Classes/Form/Element/User1Element.php
+++ b/Classes/Form/Element/User1Element.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\Form\Element;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\Form\Element;
+
 use TYPO3\CMS\Backend\Form\Behavior\OnFieldChangeTrait;
 use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 use TYPO3\CMS\Core\Page\JavaScriptModuleInstruction;
diff --git a/Classes/Service/KauderwelschService.php b/Classes/Service/KauderwelschService.php
index 26a3b0fbf..07d801148 100644
--- a/Classes/Service/KauderwelschService.php
+++ b/Classes/Service/KauderwelschService.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\Service;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\Service;
+
 /**
  * Get test strings
  */
diff --git a/Classes/TcaDataGenerator/Exception.php b/Classes/TcaDataGenerator/Exception.php
index 98f17d54f..76188b57b 100644
--- a/Classes/TcaDataGenerator/Exception.php
+++ b/Classes/TcaDataGenerator/Exception.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 /**
  * TcaDataGenerator exception
  */
diff --git a/Classes/TcaDataGenerator/FieldGenerator/AbstractFieldGenerator.php b/Classes/TcaDataGenerator/FieldGenerator/AbstractFieldGenerator.php
index fbda8d5e6..689c99d81 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/AbstractFieldGenerator.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/AbstractFieldGenerator.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\Service\KauderwelschService;
 
diff --git a/Classes/TcaDataGenerator/FieldGenerator/ConfigDefault.php b/Classes/TcaDataGenerator/FieldGenerator/ConfigDefault.php
index 35bac8675..3cbe147b9 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/ConfigDefault.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/ConfigDefault.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeCheck.php b/Classes/TcaDataGenerator/FieldGenerator/TypeCheck.php
index 9718d6660..ab16219f9 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeCheck.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeCheck.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeColor.php b/Classes/TcaDataGenerator/FieldGenerator/TypeColor.php
index 1aa4f9df5..c1ee484a0 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeColor.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeColor.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetime.php b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetime.php
index 3a2e729c2..40c98b64f 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetime.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetime.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeDbTypeDatetime.php b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeDbTypeDatetime.php
index 80ef21581..c4ad2362e 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeDbTypeDatetime.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeDbTypeDatetime.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDate.php b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDate.php
index f61e84d3c..6fe235727 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDate.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDate.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDateDbTypeDate.php b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDateDbTypeDate.php
index 0e9bed5da..754c91cf7 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDateDbTypeDate.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatDateDbTypeDate.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTime.php b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTime.php
index 71a78d525..22f81e06d 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTime.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTime.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use Doctrine\DBAL\Types\IntegerType;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryHelper;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTimesec.php b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTimesec.php
index d60cdfeb2..d8c28eb4b 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTimesec.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeFormatTimesec.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use Doctrine\DBAL\Types\IntegerType;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryHelper;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeRequiredFormatDate.php b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeRequiredFormatDate.php
index 588f9a836..65ae32401 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeRequiredFormatDate.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeDatetimeRequiredFormatDate.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeEmail.php b/Classes/TcaDataGenerator/FieldGenerator/TypeEmail.php
index b252a3e1c..26cb3ec5f 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeEmail.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeEmail.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeFile.php b/Classes/TcaDataGenerator/FieldGenerator/TypeFile.php
index ba93ac1e6..161e66021 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeFile.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeFile.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeFlex.php b/Classes/TcaDataGenerator/FieldGenerator/TypeFlex.php
index 4dd3d79b4..ddd6d0713 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeFlex.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeFlex.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeFolder.php b/Classes/TcaDataGenerator/FieldGenerator/TypeFolder.php
index ea6ed7a33..83dc3f976 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeFolder.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeFolder.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsers.php b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsers.php
index 4b4db8b6b..c7f093698 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsers.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsers.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsersBeGroups.php b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsersBeGroups.php
index b311f1974..c3763ad4e 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsersBeGroups.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedBeUsersBeGroups.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedPages.php b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedPages.php
index 667fb8105..b789e94b5 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedPages.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedPages.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedStaticdata.php b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedStaticdata.php
index 42babfb90..d108f897c 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedStaticdata.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedStaticdata.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedSysFiles.php b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedSysFiles.php
index cf09083fb..41aadd1ac 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedSysFiles.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupAllowedSysFiles.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupFal.php b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupFal.php
index 6e7753f8a..057783ef8 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeGroupFal.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeGroupFal.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeImageManipulation.php b/Classes/TcaDataGenerator/FieldGenerator/TypeImageManipulation.php
index 5eb8b8701..9cac5454d 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeImageManipulation.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeImageManipulation.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInline1n.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInline1n.php
index b2177eec4..4dd0731fc 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInline1n.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInline1n.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInlineExpandsingle.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInlineExpandsingle.php
index d6b01b203..63da1cc86 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInlineExpandsingle.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInlineExpandsingle.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInlineFalSelectSingle12Foreign.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInlineFalSelectSingle12Foreign.php
index 4adf20d8e..627b7d4e5 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInlineFalSelectSingle12Foreign.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInlineFalSelectSingle12Foreign.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInlineUsecombination.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInlineUsecombination.php
index cf5bfbd68..78ebd2a97 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInlineUsecombination.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInlineUsecombination.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInput.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInput.php
index 131ba20d4..4ad91a66d 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInput.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInput.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputDynamicTextWithRecordUid.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputDynamicTextWithRecordUid.php
index fdda97ee8..77b5b6297 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputDynamicTextWithRecordUid.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputDynamicTextWithRecordUid.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalAlphanum.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalAlphanum.php
index 89565ebb1..899048a15 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalAlphanum.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalAlphanum.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalIsIn.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalIsIn.php
index e232ffec7..f6b7ba44f 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalIsIn.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalIsIn.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalMd5.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalMd5.php
index 559338bf4..5013509f0 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalMd5.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalMd5.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalNum.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalNum.php
index ac14574ac..675afe7a1 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalNum.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalNum.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalUpper.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalUpper.php
index 07a0a0736..21dffd2b6 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalUpper.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalUpper.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalYear.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalYear.php
index 6464fe1f8..d33ea7822 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalYear.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputEvalYear.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputForceL10nParent.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputForceL10nParent.php
index 5d6cd92e9..91c2db864 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputForceL10nParent.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputForceL10nParent.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4.php
index 435d850bc..e0668e456 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4Min4.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4Min4.php
index efc29683c..bef177c8e 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4Min4.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputMax4Min4.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeInputWizardSelect.php b/Classes/TcaDataGenerator/FieldGenerator/TypeInputWizardSelect.php
index bf8998de1..fcc00d92b 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeInputWizardSelect.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeInputWizardSelect.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeLink.php b/Classes/TcaDataGenerator/FieldGenerator/TypeLink.php
index 4bfb33bb8..9a503d095 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeLink.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeLink.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeNone.php b/Classes/TcaDataGenerator/FieldGenerator/TypeNone.php
index 1a6b9d997..d0ecfdc48 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeNone.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeNone.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeNoneFormatDateTime.php b/Classes/TcaDataGenerator/FieldGenerator/TypeNoneFormatDateTime.php
index eb125975a..c15ebcd29 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeNoneFormatDateTime.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeNoneFormatDateTime.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeNumber.php b/Classes/TcaDataGenerator/FieldGenerator/TypeNumber.php
index 74860e692..afef3f58e 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeNumber.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeNumber.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeNumberFormatDecimal.php b/Classes/TcaDataGenerator/FieldGenerator/TypeNumberFormatDecimal.php
index 3eb98f7c1..e48d90d98 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeNumberFormatDecimal.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeNumberFormatDecimal.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypePassthrough.php b/Classes/TcaDataGenerator/FieldGenerator/TypePassthrough.php
index d9fb0e3e6..19ebb2451 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypePassthrough.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypePassthrough.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypePassword.php b/Classes/TcaDataGenerator/FieldGenerator/TypePassword.php
index ae95f4eb8..265eeeffc 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypePassword.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypePassword.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypePasswordHashedFalse.php b/Classes/TcaDataGenerator/FieldGenerator/TypePasswordHashedFalse.php
index c4f5202df..e549c9d5c 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypePasswordHashedFalse.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypePasswordHashedFalse.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeRadio.php b/Classes/TcaDataGenerator/FieldGenerator/TypeRadio.php
index b68efe4f0..ffb08a709 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeRadio.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeRadio.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeSelect.php b/Classes/TcaDataGenerator/FieldGenerator/TypeSelect.php
index 0b801abcf..a044b7f70 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeSelect.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeSelect.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeMultipleForeignTableStaticData.php b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeMultipleForeignTableStaticData.php
index a3570e485..1ecc49f2d 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeMultipleForeignTableStaticData.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeMultipleForeignTableStaticData.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSelectTree.php b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSelectTree.php
index e248d94fe..7e5abef62 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSelectTree.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSelectTree.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTable.php b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTable.php
index 8c156f38d..adb4f982c 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTable.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTable.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTableForType.php b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTableForType.php
index 2ffeccef5..b0ff41b8b 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTableForType.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeSelectRenderTypeSingleForeignTableForType.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeText.php b/Classes/TcaDataGenerator/FieldGenerator/TypeText.php
index 55495bc15..9d190657b 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeText.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeText.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeTextDefaultExtrasRichtext.php b/Classes/TcaDataGenerator/FieldGenerator/TypeTextDefaultExtrasRichtext.php
index 853ae7886..d37418ecd 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeTextDefaultExtrasRichtext.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeTextDefaultExtrasRichtext.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatDatetime.php b/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatDatetime.php
index a56b5fe56..2cb3a0d95 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatDatetime.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatDatetime.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatT3editor.php b/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatT3editor.php
index 3ad302ac9..d28dbcb5a 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatT3editor.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeTextFormatT3editor.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeTextMax30.php b/Classes/TcaDataGenerator/FieldGenerator/TypeTextMax30.php
index 56569264d..f1f50570f 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeTextMax30.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeTextMax30.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardSelect.php b/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardSelect.php
index 132bcafc9..c0bdedfa0 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardSelect.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardSelect.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardTable.php b/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardTable.php
index b57954304..dafeddbce 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardTable.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeTextWizardTable.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGenerator/TypeUser.php b/Classes/TcaDataGenerator/FieldGenerator/TypeUser.php
index c1c6878cb..4011f3109 100644
--- a/Classes/TcaDataGenerator/FieldGenerator/TypeUser.php
+++ b/Classes/TcaDataGenerator/FieldGenerator/TypeUser.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGenerator;
+
 use TYPO3\CMS\Styleguide\TcaDataGenerator\FieldGeneratorInterface;
 
 /**
diff --git a/Classes/TcaDataGenerator/FieldGeneratorInterface.php b/Classes/TcaDataGenerator/FieldGeneratorInterface.php
index f907e5e95..abffcb469 100644
--- a/Classes/TcaDataGenerator/FieldGeneratorInterface.php
+++ b/Classes/TcaDataGenerator/FieldGeneratorInterface.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 /**
  * Interface for field value generators
  */
diff --git a/Classes/TcaDataGenerator/FieldGeneratorResolver.php b/Classes/TcaDataGenerator/FieldGeneratorResolver.php
index 8a60e6ffc..4c98be9e7 100644
--- a/Classes/TcaDataGenerator/FieldGeneratorResolver.php
+++ b/Classes/TcaDataGenerator/FieldGeneratorResolver.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
diff --git a/Classes/TcaDataGenerator/Generator.php b/Classes/TcaDataGenerator/Generator.php
index 00e7b21ea..f2b77694e 100644
--- a/Classes/TcaDataGenerator/Generator.php
+++ b/Classes/TcaDataGenerator/Generator.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 use TYPO3\CMS\Core\Configuration\SiteConfiguration;
 use TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory;
 use TYPO3\CMS\Core\Crypto\Random;
diff --git a/Classes/TcaDataGenerator/GeneratorNotFoundException.php b/Classes/TcaDataGenerator/GeneratorNotFoundException.php
index cda79156d..7665b1bc2 100644
--- a/Classes/TcaDataGenerator/GeneratorNotFoundException.php
+++ b/Classes/TcaDataGenerator/GeneratorNotFoundException.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 /**
  * Exception thrown if FieldGenerator does not find a class
  */
diff --git a/Classes/TcaDataGenerator/RecordData.php b/Classes/TcaDataGenerator/RecordData.php
index ef24b193d..ad38d4024 100644
--- a/Classes/TcaDataGenerator/RecordData.php
+++ b/Classes/TcaDataGenerator/RecordData.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
diff --git a/Classes/TcaDataGenerator/RecordFinder.php b/Classes/TcaDataGenerator/RecordFinder.php
index c225e6be3..4fc9d28f6 100644
--- a/Classes/TcaDataGenerator/RecordFinder.php
+++ b/Classes/TcaDataGenerator/RecordFinder.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
diff --git a/Classes/TcaDataGenerator/TableHandler/AbstractTableHandler.php b/Classes/TcaDataGenerator/TableHandler/AbstractTableHandler.php
index 29b31f22f..098172978 100644
--- a/Classes/TcaDataGenerator/TableHandler/AbstractTableHandler.php
+++ b/Classes/TcaDataGenerator/TableHandler/AbstractTableHandler.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
+
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/Classes/TcaDataGenerator/TableHandler/General.php b/Classes/TcaDataGenerator/TableHandler/General.php
index 6daeb4034..2810a9ef8 100644
--- a/Classes/TcaDataGenerator/TableHandler/General.php
+++ b/Classes/TcaDataGenerator/TableHandler/General.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
+
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/Classes/TcaDataGenerator/TableHandler/InlineMn.php b/Classes/TcaDataGenerator/TableHandler/InlineMn.php
index 29aadf07b..1dc15eb95 100644
--- a/Classes/TcaDataGenerator/TableHandler/InlineMn.php
+++ b/Classes/TcaDataGenerator/TableHandler/InlineMn.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
+
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/Classes/TcaDataGenerator/TableHandler/InlineMnGroup.php b/Classes/TcaDataGenerator/TableHandler/InlineMnGroup.php
index dfc4c3778..012440aa2 100644
--- a/Classes/TcaDataGenerator/TableHandler/InlineMnGroup.php
+++ b/Classes/TcaDataGenerator/TableHandler/InlineMnGroup.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
+
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetric.php b/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetric.php
index 465fa7c65..da15be3b0 100644
--- a/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetric.php
+++ b/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetric.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
+
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetricGroup.php b/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetricGroup.php
index 8cf20d18f..aac8c7a03 100644
--- a/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetricGroup.php
+++ b/Classes/TcaDataGenerator/TableHandler/InlineMnSymmetricGroup.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
+
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/Classes/TcaDataGenerator/TableHandler/StaticData.php b/Classes/TcaDataGenerator/TableHandler/StaticData.php
index d8e875376..5385e422a 100644
--- a/Classes/TcaDataGenerator/TableHandler/StaticData.php
+++ b/Classes/TcaDataGenerator/TableHandler/StaticData.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator\TableHandler;
+
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Styleguide\TcaDataGenerator\RecordFinder;
diff --git a/Classes/TcaDataGenerator/TableHandlerInterface.php b/Classes/TcaDataGenerator/TableHandlerInterface.php
index 8c91bebe1..afdf3de64 100644
--- a/Classes/TcaDataGenerator/TableHandlerInterface.php
+++ b/Classes/TcaDataGenerator/TableHandlerInterface.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
-
 /*
  * This file is part of the TYPO3 CMS project.
  *
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\TcaDataGenerator;
+
 /**
  * Interface for table handlers
  */
diff --git a/Classes/UserFunctions/ExtensionConfiguration/User1.php b/Classes/UserFunctions/ExtensionConfiguration/User1.php
index feccb3d7b..4a987d4f9 100644
--- a/Classes/UserFunctions/ExtensionConfiguration/User1.php
+++ b/Classes/UserFunctions/ExtensionConfiguration/User1.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\ExtensionConfiguration;
+declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -15,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\ExtensionConfiguration;
+
 /**
  * User function 1
  */
diff --git a/Classes/UserFunctions/FormEngine/DisplayConditionUserFunc.php b/Classes/UserFunctions/FormEngine/DisplayConditionUserFunc.php
index 0ca3fd3ed..be9e3670d 100644
--- a/Classes/UserFunctions/FormEngine/DisplayConditionUserFunc.php
+++ b/Classes/UserFunctions/FormEngine/DisplayConditionUserFunc.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function to compare two fields
  */
diff --git a/Classes/UserFunctions/FormEngine/SelectItemSorter.php b/Classes/UserFunctions/FormEngine/SelectItemSorter.php
index e48ecf9c1..f32523ff7 100644
--- a/Classes/UserFunctions/FormEngine/SelectItemSorter.php
+++ b/Classes/UserFunctions/FormEngine/SelectItemSorter.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function to sort ites
  */
diff --git a/Classes/UserFunctions/FormEngine/SlugPrefix.php b/Classes/UserFunctions/FormEngine/SlugPrefix.php
index 51056350a..cab74b161 100644
--- a/Classes/UserFunctions/FormEngine/SlugPrefix.php
+++ b/Classes/UserFunctions/FormEngine/SlugPrefix.php
@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function to compare two fields
  */
diff --git a/Classes/UserFunctions/FormEngine/TypeCheckbox8ItemsProcFunc.php b/Classes/UserFunctions/FormEngine/TypeCheckbox8ItemsProcFunc.php
index 0a14e093d..d77fc355e 100644
--- a/Classes/UserFunctions/FormEngine/TypeCheckbox8ItemsProcFunc.php
+++ b/Classes/UserFunctions/FormEngine/TypeCheckbox8ItemsProcFunc.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -15,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function used in checkbox_8
  */
diff --git a/Classes/UserFunctions/FormEngine/TypeRadio5ItemsProcFunc.php b/Classes/UserFunctions/FormEngine/TypeRadio5ItemsProcFunc.php
index eccd3a26f..b9f80bc17 100644
--- a/Classes/UserFunctions/FormEngine/TypeRadio5ItemsProcFunc.php
+++ b/Classes/UserFunctions/FormEngine/TypeRadio5ItemsProcFunc.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -15,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function used in radio_5
  */
diff --git a/Classes/UserFunctions/FormEngine/TypeSelect2ItemsProcFunc.php b/Classes/UserFunctions/FormEngine/TypeSelect2ItemsProcFunc.php
index fa24d158f..f603f0d72 100644
--- a/Classes/UserFunctions/FormEngine/TypeSelect2ItemsProcFunc.php
+++ b/Classes/UserFunctions/FormEngine/TypeSelect2ItemsProcFunc.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -15,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function used in select_2
  */
diff --git a/Classes/UserFunctions/FormEngine/TypeSelect33ItemsProcFunc.php b/Classes/UserFunctions/FormEngine/TypeSelect33ItemsProcFunc.php
index b99c797c9..17218c8ed 100644
--- a/Classes/UserFunctions/FormEngine/TypeSelect33ItemsProcFunc.php
+++ b/Classes/UserFunctions/FormEngine/TypeSelect33ItemsProcFunc.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -15,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function used in select_33
  */
diff --git a/Classes/UserFunctions/FormEngine/TypeUserPalette.php b/Classes/UserFunctions/FormEngine/TypeUserPalette.php
index 8fd35d6c2..117b5afa2 100644
--- a/Classes/UserFunctions/FormEngine/TypeUserPalette.php
+++ b/Classes/UserFunctions/FormEngine/TypeUserPalette.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -15,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\UserFunctions\FormEngine;
+
 /**
  * A user function rendering a type=user TCA type used in palette_1_1
  */
diff --git a/Tests/Unit/Service/KauderwelschServiceTest.php b/Tests/Unit/Service/KauderwelschServiceTest.php
index a24a03022..0af93e9a7 100644
--- a/Tests/Unit/Service/KauderwelschServiceTest.php
+++ b/Tests/Unit/Service/KauderwelschServiceTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace TYPO3\CMS\Styleguide\Tests\Unit\Service;
+declare(strict_types=1);
 
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -15,6 +15,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+namespace TYPO3\CMS\Styleguide\Tests\Unit\Service;
+
 use TYPO3\CMS\Styleguide\Service\KauderwelschService;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;