diff --git a/src/Controller/UserSettingsController.php b/src/Controller/UserSettingsController.php
index 27d80c66..b8163ed8 100644
--- a/src/Controller/UserSettingsController.php
+++ b/src/Controller/UserSettingsController.php
@@ -49,7 +49,7 @@ use App\Events\SecurityEvent;
 use App\Events\SecurityEvents;
 use App\Form\TFAGoogleSettingsType;
 use App\Form\UserSettingsType;
-use App\Services\TFA\BackupCodeManager;
+use App\Services\UserSystem\TFA\BackupCodeManager;
 use Doctrine\ORM\EntityManagerInterface;
 use RuntimeException;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticator;
diff --git a/src/Services/TFA/BackupCodeGenerator.php b/src/Services/UserSystem/TFA/BackupCodeGenerator.php
similarity index 98%
rename from src/Services/TFA/BackupCodeGenerator.php
rename to src/Services/UserSystem/TFA/BackupCodeGenerator.php
index 2c0b3479..e80b308b 100644
--- a/src/Services/TFA/BackupCodeGenerator.php
+++ b/src/Services/UserSystem/TFA/BackupCodeGenerator.php
@@ -40,7 +40,7 @@ declare(strict_types=1);
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-namespace App\Services\TFA;
+namespace App\Services\UserSystem\TFA;
 
 use Exception;
 use RuntimeException;
diff --git a/src/Services/TFA/BackupCodeManager.php b/src/Services/UserSystem/TFA/BackupCodeManager.php
similarity index 98%
rename from src/Services/TFA/BackupCodeManager.php
rename to src/Services/UserSystem/TFA/BackupCodeManager.php
index ae3cae17..4f7f6c24 100644
--- a/src/Services/TFA/BackupCodeManager.php
+++ b/src/Services/UserSystem/TFA/BackupCodeManager.php
@@ -40,7 +40,7 @@ declare(strict_types=1);
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-namespace App\Services\TFA;
+namespace App\Services\UserSystem\TFA;
 
 use App\Entity\UserSystem\User;
 
diff --git a/tests/Services/TFA/BackupCodeGeneratorTest.php b/tests/Services/UserSystem/TFA/BackupCodeGeneratorTest.php
similarity index 96%
rename from tests/Services/TFA/BackupCodeGeneratorTest.php
rename to tests/Services/UserSystem/TFA/BackupCodeGeneratorTest.php
index 7adfe0d8..21e64c67 100644
--- a/tests/Services/TFA/BackupCodeGeneratorTest.php
+++ b/tests/Services/UserSystem/TFA/BackupCodeGeneratorTest.php
@@ -40,9 +40,9 @@ declare(strict_types=1);
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-namespace App\Tests\Services\TFA;
+namespace App\Tests\Services\UserSystem\TFA;
 
-use App\Services\TFA\BackupCodeGenerator;
+use App\Services\UserSystem\TFA\BackupCodeGenerator;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 
diff --git a/tests/Services/TFA/BackupCodeManagerTest.php b/tests/Services/UserSystem/TFA/BackupCodeManagerTest.php
similarity index 97%
rename from tests/Services/TFA/BackupCodeManagerTest.php
rename to tests/Services/UserSystem/TFA/BackupCodeManagerTest.php
index a6b881d0..f39c805d 100644
--- a/tests/Services/TFA/BackupCodeManagerTest.php
+++ b/tests/Services/UserSystem/TFA/BackupCodeManagerTest.php
@@ -40,10 +40,10 @@ declare(strict_types=1);
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-namespace App\Tests\Services\TFA;
+namespace App\Tests\Services\UserSystem\TFA;
 
 use App\Entity\UserSystem\User;
-use App\Services\TFA\BackupCodeManager;
+use App\Services\UserSystem\TFA\BackupCodeManager;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class BackupCodeManagerTest extends WebTestCase