diff --git a/mayan/apps/kaze/__init__.py b/mayan/apps/kaze/__init__.py
new file mode 100644
index 0000000000..c814a10e27
--- /dev/null
+++ b/mayan/apps/kaze/__init__.py
@@ -0,0 +1,3 @@
+from __future__ import unicode_literals
+
+default_app_config = 'kaze.apps.KazeApp'
diff --git a/mayan/apps/server/apps.py b/mayan/apps/kaze/apps.py
similarity index 58%
rename from mayan/apps/server/apps.py
rename to mayan/apps/kaze/apps.py
index 0e68d942b5..9e662e3023 100644
--- a/mayan/apps/server/apps.py
+++ b/mayan/apps/kaze/apps.py
@@ -5,9 +5,9 @@ from django.utils.translation import ugettext_lazy as _
 from common import MayanAppConfig
 
 
-class ServerApp(MayanAppConfig):
-    name = 'server'
-    verbose_name = _('Server')
+class KazeApp(MayanAppConfig):
+    name = 'kaze'
+    verbose_name = _('Kaze')
 
     def ready(self):
-        super(ServerApp, self).ready()
+        super(KazeApp, self).ready()
diff --git a/mayan/apps/server/management/__init__.py b/mayan/apps/kaze/management/__init__.py
similarity index 100%
rename from mayan/apps/server/management/__init__.py
rename to mayan/apps/kaze/management/__init__.py
diff --git a/mayan/apps/server/management/commands/__init__.py b/mayan/apps/kaze/management/commands/__init__.py
similarity index 100%
rename from mayan/apps/server/management/commands/__init__.py
rename to mayan/apps/kaze/management/commands/__init__.py
diff --git a/mayan/apps/server/management/commands/serve.py b/mayan/apps/kaze/management/commands/serve.py
similarity index 100%
rename from mayan/apps/server/management/commands/serve.py
rename to mayan/apps/kaze/management/commands/serve.py
diff --git a/mayan/apps/server/__init__.py b/mayan/apps/server/__init__.py
deleted file mode 100644
index f21ae61b31..0000000000
--- a/mayan/apps/server/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import unicode_literals
-
-default_app_config = 'server.apps.ServerApp'
diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index 75d962e76a..6370ebba62 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -71,11 +71,11 @@ INSTALLED_APPS = (
     'converter',
     'django_gpg',
     'dynamic_search',
+    'kaze',
     'lock_manager',
     'mimetype',
     'navigation',
     'permissions',
-    'server',
     'smart_settings',
     'user_management',
     # Mayan EDMS
diff --git a/requirements/base.txt b/requirements/base.txt
index 0e12651d4b..977f289885 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -35,3 +35,4 @@ python-magic==0.4.10
 pytz==2015.4
 
 sh==1.11
+tornado==4.3