diff --git a/mod/api.php b/mod/api.php
index 9a802b515a..929832480a 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -8,7 +8,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 require_once __DIR__ . '/../include/api.php';
 
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 8479217195..0641b9177b 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -13,7 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Network;
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index a9e17b34b3..28845634ad 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -25,7 +25,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
diff --git a/mod/events.php b/mod/events.php
index 5e129aaf61..6547a9b9ce 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -19,7 +19,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
diff --git a/mod/message.php b/mod/message.php
index 393d5d276b..8efe825cd9 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -15,7 +15,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
diff --git a/mod/network.php b/mod/network.php
index 44c7c8b44f..5d8656cd35 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -27,7 +27,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\Term;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
diff --git a/mod/notifications.php b/mod/notifications.php
index 90036705bc..502a2397de 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -13,7 +13,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Model\Introduction;
 use Friendica\Model\Notify;
 
diff --git a/mod/oexchange.php b/mod/oexchange.php
index e042a22f52..a55ee56d21 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -6,7 +6,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
diff --git a/mod/profiles.php b/mod/profiles.php
index d3a6c3e38a..46bc36db53 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -20,7 +20,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
diff --git a/mod/regmod.php b/mod/regmod.php
index 295d8df25f..ab03f93933 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -11,7 +11,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Register;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 function user_allow($hash)
 {
diff --git a/mod/settings.php b/mod/settings.php
index 8b5254976d..ad83b68210 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -24,7 +24,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Protocol\Email;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\Network;
diff --git a/src/App.php b/src/App.php
index 3325f5b260..3ea7d05f0c 100644
--- a/src/App.php
+++ b/src/App.php
@@ -18,7 +18,7 @@ use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
 use Friendica\Model\Profile;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\ConfigFileLoader;
diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index 08bac2c1d0..2993c20a7b 100644
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -5,6 +5,7 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
 
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 01af275864..48bb9ba310 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -18,6 +18,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Network\Probe;
diff --git a/src/Module/Home.php b/src/Module/Home.php
index e6fb8c3496..8fdb613f9b 100644
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -6,6 +6,7 @@ use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Module\Security\Login;
 
 /**
  * Home module - Landing page of the current node
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index b9cda4863e..ded41fe392 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -17,7 +17,7 @@ use Friendica\Model\FileTag;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\Crypto;
diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index db1a6f86b3..d399ba8ddf 100644
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -19,6 +19,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile as ProfileModel;
 use Friendica\Model\User;
+use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php
index e3515713f5..f9988c0049 100644
--- a/src/Module/Search/Directory.php
+++ b/src/Module/Search/Directory.php
@@ -5,7 +5,7 @@ namespace Friendica\Module\Search;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
 use Friendica\Module\BaseSearchModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use Friendica\Util\Strings;
 
 /**
diff --git a/src/Module/Login.php b/src/Module/Security/Login.php
similarity index 98%
rename from src/Module/Login.php
rename to src/Module/Security/Login.php
index d7c537839d..311cbdd9bb 100644
--- a/src/Module/Login.php
+++ b/src/Module/Security/Login.php
@@ -4,7 +4,7 @@
  * @file src/Module/Login.php
  */
 
-namespace Friendica\Module;
+namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
+use Friendica\Module\Register;
 use Friendica\Util\Strings;
 
 /**
diff --git a/src/Module/Logout.php b/src/Module/Security/Logout.php
similarity index 95%
rename from src/Module/Logout.php
rename to src/Module/Security/Logout.php
index 9e6c674b35..062d55687b 100644
--- a/src/Module/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -3,7 +3,7 @@
  * @file src/Module/Logout.php
  */
 
-namespace Friendica\Module;
+namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;
diff --git a/src/Module/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
similarity index 97%
rename from src/Module/TwoFactor/Recovery.php
rename to src/Module/Security/TwoFactor/Recovery.php
index 371b7d7d53..90e1488ed9 100644
--- a/src/Module/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module\TwoFactor;
+namespace Friendica\Module\Security\TwoFactor;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;
diff --git a/src/Module/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
similarity index 97%
rename from src/Module/TwoFactor/Verify.php
rename to src/Module/Security/TwoFactor/Verify.php
index 828f125498..10327aea59 100644
--- a/src/Module/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module\TwoFactor;
+namespace Friendica\Module\Security\TwoFactor;
 
 use Friendica\BaseModule;
 use Friendica\App\Authentication;
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index 72b233f422..fe7423c5d2 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -9,7 +9,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Model\TwoFactor\AppSpecificPassword;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 /**
  * // Page 5: 2FA enabled, app-specific password generation
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index 34d6f97b49..03c866ce89 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -12,7 +12,7 @@ use Friendica\Model\TwoFactor\AppSpecificPassword;
 use Friendica\Model\TwoFactor\RecoveryCode;
 use Friendica\Model\User;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use PragmaRX\Google2FA\Google2FA;
 
 class Index extends BaseSettingsModule
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index 0d7de7d902..8bd40bec98 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -9,7 +9,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Model\TwoFactor\RecoveryCode;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 
 /**
  * // Page 3: 2FA enabled but not verified, show recovery codes
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 63c186e3a8..28ee999d14 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -14,7 +14,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Module\BaseSettingsModule;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
 use PragmaRX\Google2FA\Google2FA;
 
 /**
diff --git a/static/routes.config.php b/static/routes.config.php
index 15e7383a4b..9dced33107 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -23,8 +23,8 @@ return [
 	],
 
 	'/2fa' => [
-		'[/]'       => [Module\TwoFactor\Verify::class,   [R::GET, R::POST]],
-		'/recovery' => [Module\TwoFactor\Recovery::class, [R::GET, R::POST]],
+		'[/]'       => [Module\Security\TwoFactor\Verify::class,   [R::GET, R::POST]],
+		'/recovery' => [Module\Security\TwoFactor\Recovery::class, [R::GET, R::POST]],
 	],
 
 	'/api' => [
@@ -156,8 +156,8 @@ return [
 
 	'/like/{item:\d+}'    => [Module\Like::class,            [R::GET]],
 	'/localtime'          => [Module\Debug\Localtime::class, [R::GET, R::POST]],
-	'/login'              => [Module\Login::class,           [R::GET, R::POST]],
-	'/logout'             => [Module\Logout::class,          [R::GET, R::POST]],
+	'/login'              => [Module\Security\Login::class,  [R::GET, R::POST]],
+	'/logout'             => [Module\Security\Logout::class, [R::GET, R::POST]],
 	'/magic'              => [Module\Magic::class,           [R::GET]],
 	'/maintenance'        => [Module\Maintenance::class,     [R::GET]],
 	'/manifest'           => [Module\Manifest::class,        [R::GET]],