diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php
index 3203cf1f0c..7b9d9a3534 100644
--- a/libraries/classes/Controllers/Database/CentralColumnsController.php
+++ b/libraries/classes/Controllers/Database/CentralColumnsController.php
@@ -7,8 +7,8 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;
 
-use PhpMyAdmin\CentralColumns;
 use PhpMyAdmin\Core;
+use PhpMyAdmin\Database\CentralColumns;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php
index a9c5664c10..3521edb9b3 100644
--- a/libraries/classes/Controllers/Database/StructureController.php
+++ b/libraries/classes/Controllers/Database/StructureController.php
@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;
 
-use PhpMyAdmin\CentralColumns;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\CheckUserPrivileges;
 use PhpMyAdmin\Common;
 use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Core;
+use PhpMyAdmin\Database\CentralColumns;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Message;
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
index c759ce9f38..57cfb0c983 100644
--- a/libraries/classes/Controllers/Table/StructureController.php
+++ b/libraries/classes/Controllers/Table/StructureController.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Table;
 
-use PhpMyAdmin\CentralColumns;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\CheckUserPrivileges;
 use PhpMyAdmin\Common;
@@ -12,6 +11,7 @@ use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\Controllers\SqlController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\CreateAddField;
+use PhpMyAdmin\Database\CentralColumns;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Engines\Innodb;
 use PhpMyAdmin\Html\Generator;
diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/Database/CentralColumns.php
similarity index 99%
rename from libraries/classes/CentralColumns.php
rename to libraries/classes/Database/CentralColumns.php
index 92d1ff330a..e894eec300 100644
--- a/libraries/classes/CentralColumns.php
+++ b/libraries/classes/Database/CentralColumns.php
@@ -1,14 +1,17 @@
 <?php
-/**
- * Functions for displaying user preferences pages
- */
 
 declare(strict_types=1);
 
-namespace PhpMyAdmin;
+namespace PhpMyAdmin\Database;
 
+use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Charsets\Charset;
 use PhpMyAdmin\Charsets\Collation;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Message;
+use PhpMyAdmin\Relation;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
 use function array_unique;
 use function bin2hex;
 use function ceil;
@@ -23,9 +26,6 @@ use function mb_strtoupper;
 use function sprintf;
 use function trim;
 
-/**
- * PhpMyAdmin\CentralColumns class
- */
 class CentralColumns
 {
     /**
diff --git a/libraries/services.php b/libraries/services.php
index 996b85c7b9..f10c1931fa 100644
--- a/libraries/services.php
+++ b/libraries/services.php
@@ -20,7 +20,7 @@ return [
             'arguments' => [CONFIG_FILE],
         ],
         'central_columns' => [
-            'class' => PhpMyAdmin\CentralColumns::class,
+            'class' => PhpMyAdmin\Database\CentralColumns::class,
             'arguments' => ['@dbi'],
         ],
         'check_user_privileges' => [
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6460de5993..81e3f64cd3 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,20 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Message\\:\\:rawError\\(\\) expects string, bool\\|string given\\.$#"
-			count: 2
-			path: libraries/classes/CentralColumns.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of static method PhpMyAdmin\\\\Message\\:\\:error\\(\\) expects string, bool\\|string given\\.$#"
-			count: 2
-			path: libraries/classes/CentralColumns.php
-
-		-
-			message: "#^Parameter \\#1 \\$message of method PhpMyAdmin\\\\Message\\:\\:addText\\(\\) expects string, bool\\|string given\\.$#"
-			count: 1
-			path: libraries/classes/CentralColumns.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between array\\<int, string\\> and false will always evaluate to false\\.$#"
 			count: 1
@@ -465,6 +450,21 @@ parameters:
 			count: 1
 			path: libraries/classes/CreateAddField.php
 
+		-
+			message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Message\\:\\:rawError\\(\\) expects string, bool\\|string given\\.$#"
+			count: 2
+			path: libraries/classes/Database/CentralColumns.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of static method PhpMyAdmin\\\\Message\\:\\:error\\(\\) expects string, bool\\|string given\\.$#"
+			count: 2
+			path: libraries/classes/Database/CentralColumns.php
+
+		-
+			message: "#^Parameter \\#1 \\$message of method PhpMyAdmin\\\\Message\\:\\:addText\\(\\) expects string, bool\\|string given\\.$#"
+			count: 1
+			path: libraries/classes/Database/CentralColumns.php
+
 		-
 			message: "#^Offset 'DTN' does not exist on array\\('C_NAME' \\=\\> array\\<int, string\\>, \\?'DCN' \\=\\> array\\<int, string\\>, \\?'DTN' \\=\\> array\\<int, string\\>, \\?'SCN' \\=\\> array\\<int, string\\>, \\?'STN' \\=\\> array\\<int, string\\>\\)\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 2d0926303e..136e073aa8 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="3.16@d03e5ef057d6adc656c0ff7e166c50b73b4f48f3">
-  <file src="libraries/classes/CentralColumns.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$tn_pageNow</code>
-    </InvalidScalarArgument>
-    <PossiblyInvalidArgument occurrences="5">
-      <code>$this-&gt;dbi-&gt;getError()</code>
-      <code>$this-&gt;dbi-&gt;getError()</code>
-      <code>$this-&gt;dbi-&gt;getError(DatabaseInterface::CONNECT_CONTROL)</code>
-      <code>$this-&gt;dbi-&gt;getError(DatabaseInterface::CONNECT_CONTROL)</code>
-      <code>$this-&gt;dbi-&gt;getError(DatabaseInterface::CONNECT_CONTROL)</code>
-    </PossiblyInvalidArgument>
-    <TypeDoesNotContainType occurrences="1">
-      <code>$table == ''</code>
-    </TypeDoesNotContainType>
-  </file>
   <file src="libraries/classes/Charsets.php">
     <TypeDoesNotContainType occurrences="1">
       <code>$pieces === false</code>
@@ -598,6 +583,21 @@
       <code>$_POST['field_extra'][$i] ?? false</code>
     </PossiblyFalseArgument>
   </file>
+  <file src="libraries/classes/Database/CentralColumns.php">
+    <InvalidScalarArgument occurrences="1">
+      <code>$tn_pageNow</code>
+    </InvalidScalarArgument>
+    <PossiblyInvalidArgument occurrences="5">
+      <code>$this-&gt;dbi-&gt;getError()</code>
+      <code>$this-&gt;dbi-&gt;getError()</code>
+      <code>$this-&gt;dbi-&gt;getError(DatabaseInterface::CONNECT_CONTROL)</code>
+      <code>$this-&gt;dbi-&gt;getError(DatabaseInterface::CONNECT_CONTROL)</code>
+      <code>$this-&gt;dbi-&gt;getError(DatabaseInterface::CONNECT_CONTROL)</code>
+    </PossiblyInvalidArgument>
+    <TypeDoesNotContainType occurrences="1">
+      <code>$table == ''</code>
+    </TypeDoesNotContainType>
+  </file>
   <file src="libraries/classes/Database/DatabaseList.php">
     <PossiblyNullPropertyAssignmentValue occurrences="1">
       <code>null</code>
diff --git a/test/classes/CentralColumnsTest.php b/test/classes/Database/CentralColumnsTest.php
similarity index 99%
rename from test/classes/CentralColumnsTest.php
rename to test/classes/Database/CentralColumnsTest.php
index 53d1fda3e0..79ea04ca8f 100644
--- a/test/classes/CentralColumnsTest.php
+++ b/test/classes/Database/CentralColumnsTest.php
@@ -1,21 +1,16 @@
 <?php
-/**
- * tests for PhpMyAdmin\CentralColumns
- */
 
 declare(strict_types=1);
 
-namespace PhpMyAdmin\Tests;
+namespace PhpMyAdmin\Tests\Database;
 
-use PhpMyAdmin\CentralColumns;
+use PhpMyAdmin\Database\CentralColumns;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
+use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Types;
 use function array_slice;
 
-/**
- * tests for PhpMyAdmin\CentralColumns
- */
 class CentralColumnsTest extends AbstractTestCase
 {
     /** @var CentralColumns */