diff --git a/src/Core/Console/ArchiveContact.php b/src/Console/ArchiveContact.php
similarity index 98%
rename from src/Core/Console/ArchiveContact.php
rename to src/Console/ArchiveContact.php
index b93c079b96..cf177cf2e2 100644
--- a/src/Core/Console/ArchiveContact.php
+++ b/src/Console/ArchiveContact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
similarity index 99%
rename from src/Core/Console/AutomaticInstallation.php
rename to src/Console/AutomaticInstallation.php
index e2857d6517..718573d27a 100644
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\Console;
 use Friendica\BaseObject;
diff --git a/src/Core/Console/Cache.php b/src/Console/Cache.php
similarity index 99%
rename from src/Core/Console/Cache.php
rename to src/Console/Cache.php
index 510c05b04a..eefb6cc60b 100644
--- a/src/Core/Console/Cache.php
+++ b/src/Console/Cache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
diff --git a/src/Core/Console/Config.php b/src/Console/Config.php
similarity index 99%
rename from src/Core/Console/Config.php
rename to src/Console/Config.php
index cf5c09fc0a..a27ca13498 100644
--- a/src/Core/Console/Config.php
+++ b/src/Console/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
diff --git a/src/Core/Console/CreateDoxygen.php b/src/Console/CreateDoxygen.php
similarity index 98%
rename from src/Core/Console/CreateDoxygen.php
rename to src/Console/CreateDoxygen.php
index 1de2cee040..0196839e3d 100644
--- a/src/Core/Console/CreateDoxygen.php
+++ b/src/Console/CreateDoxygen.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Description of CreateDoxygen
diff --git a/src/Core/Console/DatabaseStructure.php b/src/Console/DatabaseStructure.php
similarity index 98%
rename from src/Core/Console/DatabaseStructure.php
rename to src/Console/DatabaseStructure.php
index dededa9b3a..3feaa64d60 100644
--- a/src/Core/Console/DatabaseStructure.php
+++ b/src/Console/DatabaseStructure.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core;
 use Friendica\Core\Update;
diff --git a/src/Core/Console/DocBloxErrorChecker.php b/src/Console/DocBloxErrorChecker.php
similarity index 99%
rename from src/Core/Console/DocBloxErrorChecker.php
rename to src/Console/DocBloxErrorChecker.php
index 506e48f0fd..4393e99b18 100644
--- a/src/Core/Console/DocBloxErrorChecker.php
+++ b/src/Console/DocBloxErrorChecker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * When I installed docblox, I had the experience that it does not generate any output at all.
diff --git a/src/Core/Console/Extract.php b/src/Console/Extract.php
similarity index 98%
rename from src/Core/Console/Extract.php
rename to src/Console/Extract.php
index e7c751f942..7fac598fe9 100644
--- a/src/Core/Console/Extract.php
+++ b/src/Console/Extract.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Extracts translation strings from the Friendica project's files to be exported
diff --git a/src/Core/Console/GlobalCommunityBlock.php b/src/Console/GlobalCommunityBlock.php
similarity index 98%
rename from src/Core/Console/GlobalCommunityBlock.php
rename to src/Console/GlobalCommunityBlock.php
index d99d99ceea..bc067dada6 100644
--- a/src/Core/Console/GlobalCommunityBlock.php
+++ b/src/Console/GlobalCommunityBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\L10n;
 use Friendica\Model\Contact;
diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Console/GlobalCommunitySilence.php
similarity index 98%
rename from src/Core/Console/GlobalCommunitySilence.php
rename to src/Console/GlobalCommunitySilence.php
index b0281241e3..daaf551499 100644
--- a/src/Core/Console/GlobalCommunitySilence.php
+++ b/src/Console/GlobalCommunitySilence.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/src/Core/Console/Maintenance.php b/src/Console/Maintenance.php
similarity index 98%
rename from src/Core/Console/Maintenance.php
rename to src/Console/Maintenance.php
index 0cb0da9c60..080eb092b7 100644
--- a/src/Core/Console/Maintenance.php
+++ b/src/Console/Maintenance.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core;
 
diff --git a/src/Core/Console/NewPassword.php b/src/Console/NewPassword.php
similarity index 98%
rename from src/Core/Console/NewPassword.php
rename to src/Console/NewPassword.php
index 3cd96ad322..dc6943817f 100644
--- a/src/Core/Console/NewPassword.php
+++ b/src/Console/NewPassword.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
diff --git a/src/Core/Console/PhpToPo.php b/src/Console/PhpToPo.php
similarity index 99%
rename from src/Core/Console/PhpToPo.php
rename to src/Console/PhpToPo.php
index 93d8274877..d73c7f4ab6 100644
--- a/src/Core/Console/PhpToPo.php
+++ b/src/Console/PhpToPo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Read a strings.php file and create messages.po in the same directory
diff --git a/src/Core/Console/PoToPhp.php b/src/Console/PoToPhp.php
similarity index 99%
rename from src/Core/Console/PoToPhp.php
rename to src/Console/PoToPhp.php
index d539eae5b6..c4ba42ccc4 100644
--- a/src/Core/Console/PoToPhp.php
+++ b/src/Console/PoToPhp.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 /**
  * Read a messages.po file and create strings.php in the same directory
diff --git a/src/Core/Console/PostUpdate.php b/src/Console/PostUpdate.php
similarity index 98%
rename from src/Core/Console/PostUpdate.php
rename to src/Console/PostUpdate.php
index a903cd7dd4..4d7246d90b 100644
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Console/PostUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
diff --git a/src/Core/Console/ServerBlock.php b/src/Console/ServerBlock.php
similarity index 99%
rename from src/Core/Console/ServerBlock.php
rename to src/Console/ServerBlock.php
index 94c97e1ddd..7e45f108bb 100644
--- a/src/Core/Console/ServerBlock.php
+++ b/src/Console/ServerBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Asika\SimpleConsole\Console;
diff --git a/src/Core/Console/Storage.php b/src/Console/Storage.php
similarity index 99%
rename from src/Core/Console/Storage.php
rename to src/Console/Storage.php
index 805ef0aea9..30b5567823 100644
--- a/src/Core/Console/Storage.php
+++ b/src/Console/Storage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\Core\StorageManager;
diff --git a/src/Core/Console/Typo.php b/src/Console/Typo.php
similarity index 98%
rename from src/Core/Console/Typo.php
rename to src/Console/Typo.php
index 8d07051e83..5f5fa0ba68 100644
--- a/src/Core/Console/Typo.php
+++ b/src/Console/Typo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Console;
+namespace Friendica\Console;
 
 use Friendica\BaseObject;
 
diff --git a/src/Core/Console.php b/src/Core/Console.php
index 0cc63a5913..2893c27b23 100644
--- a/src/Core/Console.php
+++ b/src/Core/Console.php
@@ -2,6 +2,8 @@
 
 namespace Friendica\Core;
 
+use Friendica;
+
 /**
  * Description of Console
  *
@@ -47,24 +49,24 @@ HELP;
 	}
 
 	protected $subConsoles = [
-		'cache'                  => __NAMESPACE__ . '\Console\Cache',
-		'config'                 => __NAMESPACE__ . '\Console\Config',
-		'createdoxygen'          => __NAMESPACE__ . '\Console\CreateDoxygen',
-		'docbloxerrorchecker'    => __NAMESPACE__ . '\Console\DocBloxErrorChecker',
-		'dbstructure'            => __NAMESPACE__ . '\Console\DatabaseStructure',
-		'extract'                => __NAMESPACE__ . '\Console\Extract',
-		'globalcommunityblock'   => __NAMESPACE__ . '\Console\GlobalCommunityBlock',
-		'globalcommunitysilence' => __NAMESPACE__ . '\Console\GlobalCommunitySilence',
-		'archivecontact'         => __NAMESPACE__ . '\Console\ArchiveContact',
-		'autoinstall'            => __NAMESPACE__ . '\Console\AutomaticInstallation',
-		'maintenance'            => __NAMESPACE__ . '\Console\Maintenance',
-		'newpassword'            => __NAMESPACE__ . '\Console\NewPassword',
-		'php2po'                 => __NAMESPACE__ . '\Console\PhpToPo',
-		'po2php'                 => __NAMESPACE__ . '\Console\PoToPhp',
-		'typo'                   => __NAMESPACE__ . '\Console\Typo',
-		'postupdate'             => __NAMESPACE__ . '\Console\PostUpdate',
-		'serverblock'            => __NAMESPACE__ . '\Console\ServerBlock',
-		'storage'                => __NAMESPACE__ . '\Console\Storage',
+		'cache'                  => Friendica\Console\Cache::class,
+		'config'                 => Friendica\Console\Config::class,
+		'createdoxygen'          => Friendica\Console\CreateDoxygen::class,
+		'docbloxerrorchecker'    => Friendica\Console\DocBloxErrorChecker::class,
+		'dbstructure'            => Friendica\Console\DatabaseStructure::class,
+		'extract'                => Friendica\Console\Extract::class,
+		'globalcommunityblock'   => Friendica\Console\GlobalCommunityBlock::class,
+		'globalcommunitysilence' => Friendica\Console\GlobalCommunitySilence::class,
+		'archivecontact'         => Friendica\Console\ArchiveContact::class,
+		'autoinstall'            => Friendica\Console\AutomaticInstallation::class,
+		'maintenance'            => Friendica\Console\Maintenance::class,
+		'newpassword'            => Friendica\Console\NewPassword::class,
+		'php2po'                 => Friendica\Console\PhpToPo::class,
+		'po2php'                 => Friendica\Console\PoToPhp::class,
+		'typo'                   => Friendica\Console\Typo::class,
+		'postupdate'             => Friendica\Console\PostUpdate::class,
+		'serverblock'            => Friendica\Console\ServerBlock::class,
+		'storage'                => Friendica\Console\Storage::class,
 	];
 
 	protected function doExecute()
diff --git a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php b/tests/src/Console/AutomaticInstallationConsoleTest.php
similarity index 99%
rename from tests/src/Core/Console/AutomaticInstallationConsoleTest.php
rename to tests/src/Console/AutomaticInstallationConsoleTest.php
index 9ed3d404f2..5ea349f8b1 100644
--- a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Console/AutomaticInstallationConsoleTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
+use Friendica\Console\AutomaticInstallation;
 use Friendica\Core\Config\Cache\ConfigCache;
-use Friendica\Core\Console\AutomaticInstallation;
 use Friendica\Core\Installer;
 use Friendica\Core\Logger;
 use Friendica\Test\Util\DBAMockTrait;
diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Console/ConfigConsoleTest.php
similarity index 97%
rename from tests/src/Core/Console/ConfigConsoleTest.php
rename to tests/src/Console/ConfigConsoleTest.php
index c58b05ec39..8658097f9a 100644
--- a/tests/src/Core/Console/ConfigConsoleTest.php
+++ b/tests/src/Console/ConfigConsoleTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
 use Friendica\App\Mode;
-use Friendica\Core\Console\Config;
+use Friendica\Console\Config;
 
 /**
  * @runTestsInSeparateProcesses
@@ -116,7 +116,7 @@ class ConfigConsoleTest extends ConsoleTest
 		$executable = $this->consoleArgv[0];
 		$assertion = <<<CONF
 Executable: {$executable}
-Class: Friendica\Core\Console\Config
+Class: Friendica\Console\Config
 Arguments: array (
   0 => 'test',
   1 => 'it',
diff --git a/tests/src/Core/Console/ConsoleTest.php b/tests/src/Console/ConsoleTest.php
similarity index 95%
rename from tests/src/Core/Console/ConsoleTest.php
rename to tests/src/Console/ConsoleTest.php
index e142e60066..21979e72b2 100644
--- a/tests/src/Core/Console/ConsoleTest.php
+++ b/tests/src/Console/ConsoleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
 use Asika\SimpleConsole\Console;
 use Friendica\Test\MockedTest;
diff --git a/tests/src/Core/Console/ServerBlockConsoleTest.php b/tests/src/Console/ServerBlockConsoleTest.php
similarity index 99%
rename from tests/src/Core/Console/ServerBlockConsoleTest.php
rename to tests/src/Console/ServerBlockConsoleTest.php
index 512a416f5e..11856eac16 100644
--- a/tests/src/Core/Console/ServerBlockConsoleTest.php
+++ b/tests/src/Console/ServerBlockConsoleTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Friendica\Test\src\Core\Console;
+namespace Friendica\Test\src\Console;
 
-use Friendica\Core\Console\ServerBlock;
+use Friendica\Console\ServerBlock;
 
 /**
  * @runTestsInSeparateProcesses