diff --git a/settings/common.py b/settings/common.py
index d3da4d13..3f0018f3 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -157,7 +157,7 @@ INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.staticfiles",
 
-    "taiga.base.users",
+    "taiga.users",
     "taiga.base.notifications",
     "taiga.base.searches",
     "taiga.base",
diff --git a/taiga/base/users/__init__.py b/taiga/users/__init__.py
similarity index 100%
rename from taiga/base/users/__init__.py
rename to taiga/users/__init__.py
diff --git a/taiga/base/users/admin.py b/taiga/users/admin.py
similarity index 100%
rename from taiga/base/users/admin.py
rename to taiga/users/admin.py
diff --git a/taiga/base/users/api.py b/taiga/users/api.py
similarity index 100%
rename from taiga/base/users/api.py
rename to taiga/users/api.py
diff --git a/taiga/base/users/fixtures/initial_user.json b/taiga/users/fixtures/initial_user.json
similarity index 100%
rename from taiga/base/users/fixtures/initial_user.json
rename to taiga/users/fixtures/initial_user.json
diff --git a/taiga/base/users/forms.py b/taiga/users/forms.py
similarity index 100%
rename from taiga/base/users/forms.py
rename to taiga/users/forms.py
diff --git a/taiga/base/users/migrations/0001_initial.py b/taiga/users/migrations/0001_initial.py
similarity index 100%
rename from taiga/base/users/migrations/0001_initial.py
rename to taiga/users/migrations/0001_initial.py
diff --git a/taiga/base/users/migrations/0002_auto__add_field_role_project__del_unique_role_slug__add_unique_role_sl.py b/taiga/users/migrations/0002_auto__add_field_role_project__del_unique_role_slug__add_unique_role_sl.py
similarity index 100%
rename from taiga/base/users/migrations/0002_auto__add_field_role_project__del_unique_role_slug__add_unique_role_sl.py
rename to taiga/users/migrations/0002_auto__add_field_role_project__del_unique_role_slug__add_unique_role_sl.py
diff --git a/taiga/base/users/migrations/0003_roles_per_project.py b/taiga/users/migrations/0003_roles_per_project.py
similarity index 100%
rename from taiga/base/users/migrations/0003_roles_per_project.py
rename to taiga/users/migrations/0003_roles_per_project.py
diff --git a/taiga/base/users/migrations/0004_remove_unassigned_roles.py b/taiga/users/migrations/0004_remove_unassigned_roles.py
similarity index 100%
rename from taiga/base/users/migrations/0004_remove_unassigned_roles.py
rename to taiga/users/migrations/0004_remove_unassigned_roles.py
diff --git a/taiga/base/users/migrations/__init__.py b/taiga/users/migrations/__init__.py
similarity index 100%
rename from taiga/base/users/migrations/__init__.py
rename to taiga/users/migrations/__init__.py
diff --git a/taiga/base/users/models.py b/taiga/users/models.py
similarity index 100%
rename from taiga/base/users/models.py
rename to taiga/users/models.py
diff --git a/taiga/base/users/serializers.py b/taiga/users/serializers.py
similarity index 100%
rename from taiga/base/users/serializers.py
rename to taiga/users/serializers.py
diff --git a/taiga/base/users/templates/emails/password_recovery-body-html.jinja b/taiga/users/templates/emails/password_recovery-body-html.jinja
similarity index 100%
rename from taiga/base/users/templates/emails/password_recovery-body-html.jinja
rename to taiga/users/templates/emails/password_recovery-body-html.jinja
diff --git a/taiga/base/users/templates/emails/password_recovery-body-text.jinja b/taiga/users/templates/emails/password_recovery-body-text.jinja
similarity index 100%
rename from taiga/base/users/templates/emails/password_recovery-body-text.jinja
rename to taiga/users/templates/emails/password_recovery-body-text.jinja
diff --git a/taiga/base/users/templates/emails/password_recovery-subject.jinja b/taiga/users/templates/emails/password_recovery-subject.jinja
similarity index 100%
rename from taiga/base/users/templates/emails/password_recovery-subject.jinja
rename to taiga/users/templates/emails/password_recovery-subject.jinja
diff --git a/taiga/base/users/tests/__init__.py b/taiga/users/tests/__init__.py
similarity index 100%
rename from taiga/base/users/tests/__init__.py
rename to taiga/users/tests/__init__.py