diff --git a/bin/ghlister b/bin/ghlister
index aceeeb0..da4c5d9 100755
--- a/bin/ghlister
+++ b/bin/ghlister
@@ -13,8 +13,8 @@ import sys
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from ghlister import lister, models
-from ghlister.db_utils import session_scope
+from swh.lister.github import lister, models
+from swh.lister.github.db_utils import session_scope
 
 
 DEFAULT_CONF = {
diff --git a/ghlister/__init__.py b/swh/lister/github/__init__.py
similarity index 100%
rename from ghlister/__init__.py
rename to swh/lister/github/__init__.py
diff --git a/ghlister/db_utils.py b/swh/lister/github/db_utils.py
similarity index 100%
rename from ghlister/db_utils.py
rename to swh/lister/github/db_utils.py
diff --git a/ghlister/lister.py b/swh/lister/github/lister.py
similarity index 97%
rename from ghlister/lister.py
rename to swh/lister/github/lister.py
index c4b58f1..9bbde6a 100644
--- a/ghlister/lister.py
+++ b/swh/lister/github/lister.py
@@ -14,8 +14,8 @@ import time
 from pprint import pformat
 from sqlalchemy import func
 
-from ghlister.db_utils import session_scope
-from ghlister.models import Repository
+from swh.lister.github.db_utils import session_scope
+from swh.lister.github.models import Repository
 
 
 GH_API_URL = 'https://api.github.com'
diff --git a/ghlister/models.py b/swh/lister/github/models.py
similarity index 100%
rename from ghlister/models.py
rename to swh/lister/github/models.py