diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 4e54e67..a0f721c 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1774,3 +1774,38 @@ def search_groups(session, pattern=None, grp_name=None, grp_type=None):
         return query.first()
     else:
         return query.all()
+
+
+def get_group(session, group):
+    ''' Return a specific group for the specified group name.
+
+    :arg session: the session with which to connect to the database.
+
+    '''
+    query = session.query(
+        model.PagureGroup
+    ).filter(
+        model.PagureGroup.group_name == group
+    ).order_by(
+        model.PagureGroup.group_name
+    )
+
+    return query.first()
+
+
+def get_user_group(session, userid, groupid):
+    ''' Return a specific user_group for the specified group and user
+    identifiers.
+
+    :arg session: the session with which to connect to the database.
+
+    '''
+    query = session.query(
+        model.PagureUserGroup
+    ).filter(
+        model.PagureUserGroup.user_id == userid
+    ).filter(
+        model.PagureUserGroup.group_id == groupid
+    )
+
+    return query.first()
diff --git a/pagure/lib/login.py b/pagure/lib/login.py
index 652fd82..5f20977 100644
--- a/pagure/lib/login.py
+++ b/pagure/lib/login.py
@@ -42,38 +42,6 @@ def get_session_by_visitkey(session, sessionid):
     return query.first()
 
 
-def get_groups(session):
-    ''' Return the list of groups present in the database.
-
-    :arg session: the session with which to connect to the database.
-
-    '''
-    query = session.query(
-        model.PagureGroup
-    ).order_by(
-        model.PagureGroup.group_name
-    )
-
-    return query.all()
-
-
-def get_group(session, group):
-    ''' Return a specific group for the specified group name.
-
-    :arg session: the session with which to connect to the database.
-
-    '''
-    query = session.query(
-        model.PagureGroup
-    ).filter(
-        model.PagureGroup.group_name == group
-    ).order_by(
-        model.PagureGroup.group_name
-    )
-
-    return query.first()
-
-
 def get_users_by_group(session, group):
     ''' Return the list of users for a specified group.
 
@@ -93,21 +61,3 @@ def get_users_by_group(session, group):
     )
 
     return query.all()
-
-
-def get_user_group(session, userid, groupid):
-    ''' Return a specific user_group for the specified group and user
-    identifiers.
-
-    :arg session: the session with which to connect to the database.
-
-    '''
-    query = session.query(
-        model.PagureUserGroup
-    ).filter(
-        model.PagureUserGroup.user_id == userid
-    ).filter(
-        model.PagureUserGroup.group_id == groupid
-    )
-
-    return query.first()