diff --git a/codeforlife/user/__init__.py b/codeforlife/user/__init__.py
index 4795fd8e..e69de29b 100644
--- a/codeforlife/user/__init__.py
+++ b/codeforlife/user/__init__.py
@@ -1 +0,0 @@
-from . import authentication as auth
diff --git a/codeforlife/user/authentication/__init__.py b/codeforlife/user/auth/__init__.py
similarity index 100%
rename from codeforlife/user/authentication/__init__.py
rename to codeforlife/user/auth/__init__.py
diff --git a/codeforlife/user/authentication/backends/__init__.py b/codeforlife/user/auth/backends/__init__.py
similarity index 100%
rename from codeforlife/user/authentication/backends/__init__.py
rename to codeforlife/user/auth/backends/__init__.py
diff --git a/codeforlife/user/authentication/backends/email_and_password.py b/codeforlife/user/auth/backends/email_and_password.py
similarity index 100%
rename from codeforlife/user/authentication/backends/email_and_password.py
rename to codeforlife/user/auth/backends/email_and_password.py
diff --git a/codeforlife/user/authentication/backends/user_id_and_login_id.py b/codeforlife/user/auth/backends/user_id_and_login_id.py
similarity index 100%
rename from codeforlife/user/authentication/backends/user_id_and_login_id.py
rename to codeforlife/user/auth/backends/user_id_and_login_id.py
diff --git a/codeforlife/user/authentication/backends/username_and_password_and_class_id.py b/codeforlife/user/auth/backends/username_and_password_and_class_id.py
similarity index 100%
rename from codeforlife/user/authentication/backends/username_and_password_and_class_id.py
rename to codeforlife/user/auth/backends/username_and_password_and_class_id.py
diff --git a/codeforlife/user/authentication/password_validators/__init__.py b/codeforlife/user/auth/password_validators/__init__.py
similarity index 100%
rename from codeforlife/user/authentication/password_validators/__init__.py
rename to codeforlife/user/auth/password_validators/__init__.py
diff --git a/codeforlife/user/authentication/password_validators/common.py b/codeforlife/user/auth/password_validators/common.py
similarity index 100%
rename from codeforlife/user/authentication/password_validators/common.py
rename to codeforlife/user/auth/password_validators/common.py
diff --git a/codeforlife/user/authentication/password_validators/dependent_student.py b/codeforlife/user/auth/password_validators/dependent_student.py
similarity index 100%
rename from codeforlife/user/authentication/password_validators/dependent_student.py
rename to codeforlife/user/auth/password_validators/dependent_student.py
diff --git a/codeforlife/user/authentication/password_validators/independent_student.py b/codeforlife/user/auth/password_validators/independent_student.py
similarity index 100%
rename from codeforlife/user/authentication/password_validators/independent_student.py
rename to codeforlife/user/auth/password_validators/independent_student.py
diff --git a/codeforlife/user/authentication/password_validators/teacher.py b/codeforlife/user/auth/password_validators/teacher.py
similarity index 100%
rename from codeforlife/user/authentication/password_validators/teacher.py
rename to codeforlife/user/auth/password_validators/teacher.py