diff --git a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
index d2230bf04..9b744257e 100644
--- a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Authentication\Backend;
 
-use Icinga\Authentication\UserGroupBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Data\Db\DbConnection;
 use Icinga\User;
 
diff --git a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
index b7f366511..ff5cebefe 100644
--- a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
@@ -4,7 +4,7 @@
 namespace Icinga\Authentication\Backend;
 
 use Icinga\Application\Config;
-use Icinga\Authentication\UserGroupBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Exception\ConfigurationError;
 use Icinga\User;
 use Icinga\Util\String;
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 993475636..9d86b6ad6 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -4,6 +4,7 @@
 namespace Icinga\Authentication;
 
 use Exception;
+use Icinga\Authentication\Usergroup\UserGroupBackend;
 use Icinga\Application\Config;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotReadableError;
diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
similarity index 98%
rename from library/Icinga/Authentication/UserGroupBackend.php
rename to library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index f1289220d..9535d2be0 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication;
+namespace Icinga\Authentication\UserGroup;
 
 use Icinga\Authentication\Backend\DbUserGroupBackend;
 use Icinga\Authentication\Backend\IniUserGroupBackend;