diff --git a/Makefile.local b/Makefile.local
index a0cda2c3..462b203d 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,30 +1,30 @@
-FLAKEFLAGS='--exclude=swh/manage.py,swh/deposit/settings.py,swh/deposit/migrations/'
+FLAKEFLAGS='--exclude=swh/deposit/manage.py,swh/deposit/settings.py,swh/deposit/migrations/'
 
-MANAGE=python3 -m swh.manage
+MANAGE=python3 -m swh.deposit.manage
 
 db-drop:
 	dropdb swh-deposit-dev || return 0
 
 db-create: db-drop
 	createdb swh-deposit-dev
 
 db-prepare:
 	$(MANAGE) makemigrations
 
 db-migrate:
 	$(MANAGE) migrate
 
 db-load-data:
 	$(MANAGE) loaddata deposit_data
 
 db-load-private-data: db-load-data
 	$(MANAGE) loaddata ../private_data.yaml
 
 run-dev:
 	$(MANAGE) runserver
 
 run:
 	gunicorn3 -b 127.0.0.1:5006 swh.deposit.wsgi
 
 test:
-	./swh/manage.py test
+	./swh/deposit/manage.py test
diff --git a/swh/manage.py b/swh/deposit/manage.py
similarity index 96%
rename from swh/manage.py
rename to swh/deposit/manage.py
index 5d758e80..2be65708 100755
--- a/swh/manage.py
+++ b/swh/deposit/manage.py
@@ -1,53 +1,53 @@
 #!/usr/bin/env python3
 
-# Copyright (C) 2017  The Software Heritage developers
+# Copyright (C) 2017-2019  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import os
 import sys
 
 from swh.core import config
 
 
 DEFAULT_CONFIG = {
     'port': ('int', 5006),
     'host': ('str', '127.0.0.1'),
 }
 
 
 if __name__ == "__main__":
     settings_file = 'development'
     if sys.argv[1] == 'runserver':
         # override the default host:port for the 'runserver' task
         conf = config.load_named_config('deposit/server',
                                         default_conf=DEFAULT_CONFIG)
         extra_cmd = ['%s:%s' % (conf['host'], conf['port'])]
         cmd = sys.argv + extra_cmd
     elif sys.argv[1] == 'test':
         # override the default settings file to read in testing mode
         settings_file = 'testing'
         cmd = sys.argv
     else:  # otherwise, do nothing
         cmd = sys.argv
 
     os.environ.setdefault('DJANGO_SETTINGS_MODULE',
                           'swh.deposit.settings.%s' % settings_file)
 
     try:
         from django.core.management import execute_from_command_line
     except ImportError:
         # The above import may fail for some other reason. Ensure that the
         # issue is really that Django is missing to avoid masking other
         # exceptions on Python 2.
         try:
             import django  # noqa
         except ImportError:
             raise ImportError(
                 "Couldn't import Django. Are you sure it's installed and "
                 "available on your PYTHONPATH environment variable? Did you "
                 "forget to activate a virtual environment?"
             )
         raise
     execute_from_command_line(cmd)