diff --git a/.gitignore b/.gitignore
index f4b2f47..bf52361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@ __pycache__/
 *.pyc
 *.sw*
 db.sqlite3
-membersystem/settings/local.py
+project/settings/local.py
 .pytest_cache
diff --git a/manage.py b/manage.py
index 3a81208..0b8fe53 100755
--- a/manage.py
+++ b/manage.py
@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "membersystem.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
diff --git a/profiles/apps.py b/profiles/apps.py
deleted file mode 100644
index 5501fda..0000000
--- a/profiles/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ProfilesConfig(AppConfig):
-    name = 'profiles'
diff --git a/profiles/tests.py b/profiles/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/profiles/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/membersystem/__init__.py b/project/__init__.py
similarity index 100%
rename from membersystem/__init__.py
rename to project/__init__.py
diff --git a/membersystem/context_processors.py b/project/context_processors.py
similarity index 99%
rename from membersystem/context_processors.py
rename to project/context_processors.py
index 31564b4..c4873c2 100644
--- a/membersystem/context_processors.py
+++ b/project/context_processors.py
@@ -1,5 +1,4 @@
 """Context processors for the membersystem app."""
-
 from django.contrib.sites.shortcuts import get_current_site
 
 
diff --git a/membersystem/settings/__init__.py b/project/settings/__init__.py
similarity index 100%
rename from membersystem/settings/__init__.py
rename to project/settings/__init__.py
diff --git a/membersystem/settings/base.py b/project/settings/base.py
similarity index 93%
rename from membersystem/settings/base.py
rename to project/settings/base.py
index 24e086d..158923b 100644
--- a/membersystem/settings/base.py
+++ b/project/settings/base.py
@@ -35,8 +35,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.sites',
 
-    'membersystem',
-    'profiles',
+    'users',
     'accounting',
     'membership',
 ]
@@ -51,12 +50,12 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'membersystem.urls'
+ROOT_URLCONF = 'project.urls'
 
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, "project", "templates")],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -64,7 +63,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'membersystem.context_processors.current_site',
+                'project.context_processors.current_site',
             ],
         },
     },
@@ -75,7 +74,7 @@ AUTHENTICATION_BACKENDS = (
     'allauth.account.auth_backends.AuthenticationBackend',
 )
 
-WSGI_APPLICATION = 'membersystem.wsgi.application'
+WSGI_APPLICATION = 'project.wsgi.application'
 
 
 # Database
diff --git a/membersystem/static/css/membersystem.css b/project/static/css/membersystem.css
similarity index 100%
rename from membersystem/static/css/membersystem.css
rename to project/static/css/membersystem.css
diff --git a/membersystem/templates/base.html b/project/templates/base.html
similarity index 99%
rename from membersystem/templates/base.html
rename to project/templates/base.html
index 0c21c7b..21f240c 100644
--- a/membersystem/templates/base.html
+++ b/project/templates/base.html
@@ -47,4 +47,3 @@
         </footer>
     </body>
 </html>
-
diff --git a/membersystem/urls.py b/project/urls.py
similarity index 100%
rename from membersystem/urls.py
rename to project/urls.py
diff --git a/membersystem/wsgi.py b/project/wsgi.py
similarity index 81%
rename from membersystem/wsgi.py
rename to project/wsgi.py
index a1d4885..2af7561 100644
--- a/membersystem/wsgi.py
+++ b/project/wsgi.py
@@ -10,6 +10,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "membersystem.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
 
 application = get_wsgi_application()
diff --git a/pytest.ini b/pytest.ini
index 1e2ec6a..9929fa7 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
 testpaths = .
 python_files = tests.py test_*.py *_tests.py
-DJANGO_SETTINGS_MODULE = membersystem.settings
+DJANGO_SETTINGS_MODULE = project.settings
 #norecursedirs = dist tmp* .svn .*
diff --git a/profiles/__init__.py b/users/__init__.py
similarity index 100%
rename from profiles/__init__.py
rename to users/__init__.py
diff --git a/profiles/admin.py b/users/admin.py
similarity index 100%
rename from profiles/admin.py
rename to users/admin.py
diff --git a/users/apps.py b/users/apps.py
new file mode 100644
index 0000000..4ce1fab
--- /dev/null
+++ b/users/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class UsersConfig(AppConfig):
+    name = 'users'
diff --git a/profiles/migrations/0001_initial.py b/users/migrations/0001_initial.py
similarity index 100%
rename from profiles/migrations/0001_initial.py
rename to users/migrations/0001_initial.py
diff --git a/profiles/migrations/__init__.py b/users/migrations/__init__.py
similarity index 100%
rename from profiles/migrations/__init__.py
rename to users/migrations/__init__.py
diff --git a/profiles/models.py b/users/models.py
similarity index 100%
rename from profiles/models.py
rename to users/models.py
diff --git a/profiles/views.py b/users/views.py
similarity index 100%
rename from profiles/views.py
rename to users/views.py