diff --git a/docs-web/src/main/webapp/Gruntfile.js b/docs-web/src/main/webapp/Gruntfile.js
index 44adc424..cb4ad357 100644
--- a/docs-web/src/main/webapp/Gruntfile.js
+++ b/docs-web/src/main/webapp/Gruntfile.js
@@ -22,7 +22,7 @@ module.exports = function(grunt) {
           separator: ';'
         },
         src: ['src/lib/jquery.js','src/lib/jquery.ui.js','src/lib/underscore.js','src/lib/colorpicker.js', 'src/lib/angular.js', 'src/lib/angular.*.js',
-          'dist/app/docs/app.js', 'dist/app/docs/controller/*.js', 'dist/app/docs/directive/*.js', 'dist/app/docs/filter/*.js', 'dist/app/docs/service/*.js'],
+          'dist/app/docs/app.js', 'dist/app/docs/controller/**/*.js', 'dist/app/docs/directive/*.js', 'dist/app/docs/filter/*.js', 'dist/app/docs/service/*.js'],
         dest: 'dist/docs.js'
       },
       share: {
diff --git a/docs-web/src/main/webapp/src/app/docs/app.js b/docs-web/src/main/webapp/src/app/docs/app.js
index 8c706924..4af87719 100644
--- a/docs-web/src/main/webapp/src/app/docs/app.js
+++ b/docs-web/src/main/webapp/src/app/docs/app.js
@@ -61,6 +61,15 @@ angular.module('docs',
         }
       }
     })
+    .state('settings.security', {
+      url: '/security',
+      views: {
+        'settings': {
+          templateUrl: 'partial/docs/settings.security.html',
+          controller: 'SettingsSecurity'
+        }
+      }
+    })
     .state('settings.session', {
       url: '/session',
       views: {
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Document.js b/docs-web/src/main/webapp/src/app/docs/controller/document/Document.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/Document.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/Document.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentDefault.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentDefault.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentDefault.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentEdit.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentModalPdf.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalPdf.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentModalPdf.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalPdf.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentModalShare.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalShare.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentModalShare.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentModalShare.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentView.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentViewActivity.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewActivity.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentViewActivity.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewActivity.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentViewContent.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentViewContent.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewContent.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/DocumentViewPermissions.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewPermissions.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/DocumentViewPermissions.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewPermissions.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/FileModalView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/FileModalView.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/FileModalView.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/FileModalView.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/FileView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/FileView.js
rename to docs-web/src/main/webapp/src/app/docs/controller/document/FileView.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Settings.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/Settings.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/Settings.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/Settings.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsAccount.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsAccount.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsAccount.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsAccount.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsDefault.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsDefault.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsDefault.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsDefault.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsGroup.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroup.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsGroup.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroup.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsGroupEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroupEdit.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsGroupEdit.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsGroupEdit.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsLog.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsLog.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsLog.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsLog.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurity.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurity.js
new file mode 100644
index 00000000..451951c9
--- /dev/null
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSecurity.js
@@ -0,0 +1,7 @@
+'use strict';
+
+/**
+ * Settings security controller.
+ */
+angular.module('docs').controller('SettingsSecurity', function() {
+});
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsSession.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSession.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsSession.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsSession.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsUser.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsUser.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsUser.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsUser.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsUserEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsUserEdit.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsUserEdit.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsUserEdit.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/SettingsVocabulary.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsVocabulary.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/SettingsVocabulary.js
rename to docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsVocabulary.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Tag.js b/docs-web/src/main/webapp/src/app/docs/controller/tag/Tag.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/Tag.js
rename to docs-web/src/main/webapp/src/app/docs/controller/tag/Tag.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/GroupProfile.js b/docs-web/src/main/webapp/src/app/docs/controller/usergroup/GroupProfile.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/GroupProfile.js
rename to docs-web/src/main/webapp/src/app/docs/controller/usergroup/GroupProfile.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/UserGroup.js b/docs-web/src/main/webapp/src/app/docs/controller/usergroup/UserGroup.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/UserGroup.js
rename to docs-web/src/main/webapp/src/app/docs/controller/usergroup/UserGroup.js
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/UserProfile.js b/docs-web/src/main/webapp/src/app/docs/controller/usergroup/UserProfile.js
similarity index 100%
rename from docs-web/src/main/webapp/src/app/docs/controller/UserProfile.js
rename to docs-web/src/main/webapp/src/app/docs/controller/usergroup/UserProfile.js
diff --git a/docs-web/src/main/webapp/src/index.html b/docs-web/src/main/webapp/src/index.html
index 035de3a7..7697e75e 100644
--- a/docs-web/src/main/webapp/src/index.html
+++ b/docs-web/src/main/webapp/src/index.html
@@ -40,33 +40,34 @@
     <script src="lib/angular.ngprogress.js" type="text/javascript"></script>
     <script src="app/docs/app.js" type="text/javascript"></script>
     <script src="app/docs/controller/Main.js" type="text/javascript"></script>
-    <script src="app/docs/controller/Document.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentDefault.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentEdit.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentView.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentViewContent.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentViewPermissions.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentViewActivity.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentModalShare.js" type="text/javascript"></script>
-    <script src="app/docs/controller/DocumentModalPdf.js" type="text/javascript"></script>
-    <script src="app/docs/controller/FileView.js" type="text/javascript"></script>
-    <script src="app/docs/controller/FileModalView.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/Document.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentDefault.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentEdit.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentView.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentViewContent.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentViewPermissions.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentViewActivity.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentModalShare.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/DocumentModalPdf.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/FileView.js" type="text/javascript"></script>
+    <script src="app/docs/controller/document/FileModalView.js" type="text/javascript"></script>
     <script src="app/docs/controller/Login.js" type="text/javascript"></script>
-    <script src="app/docs/controller/Tag.js" type="text/javascript"></script>
+    <script src="app/docs/controller/tag/Tag.js" type="text/javascript"></script>
     <script src="app/docs/controller/Navigation.js" type="text/javascript"></script>
-    <script src="app/docs/controller/Settings.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsDefault.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsAccount.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsSession.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsLog.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsUser.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsUserEdit.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsGroup.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsGroupEdit.js" type="text/javascript"></script>
-    <script src="app/docs/controller/SettingsVocabulary.js" type="text/javascript"></script>
-    <script src="app/docs/controller/UserGroup.js" type="text/javascript"></script>
-    <script src="app/docs/controller/UserProfile.js" type="text/javascript"></script>
-    <script src="app/docs/controller/GroupProfile.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/Settings.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsDefault.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsAccount.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsSecurity.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsSession.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsLog.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsUser.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsUserEdit.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsGroup.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsGroupEdit.js" type="text/javascript"></script>
+    <script src="app/docs/controller/settings/SettingsVocabulary.js" type="text/javascript"></script>
+    <script src="app/docs/controller/usergroup/UserGroup.js" type="text/javascript"></script>
+    <script src="app/docs/controller/usergroup/UserProfile.js" type="text/javascript"></script>
+    <script src="app/docs/controller/usergroup/GroupProfile.js" type="text/javascript"></script>
     <script src="app/docs/service/User.js" type="text/javascript"></script>
     <script src="app/docs/service/Tag.js" type="text/javascript"></script>
     <script src="app/docs/filter/Newline.js" type="text/javascript"></script>
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.html b/docs-web/src/main/webapp/src/partial/docs/settings.html
index ced011b6..e9799ae9 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.html
@@ -1,9 +1,10 @@
 <div class="row">
-  <div class="col-md-4">
+  <div class="col-md-3">
     <div class="panel panel-default">
       <div class="panel-heading"><strong>Personal settings</strong></div>
       <ul class="list-group">
         <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/account" href="#/settings/account">User account</a>
+        <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/security" href="#/settings/security">Two-factor authentication</a>
         <a class="list-group-item" ng-class="{active: $uiRoute}" ui-route="/settings/session" href="#/settings/session">Opened sessions</a>
       </ul>
     </div>
@@ -19,7 +20,7 @@
     </div>
   </div>
 
-  <div class="col-md-8">
+  <div class="col-md-9">
     <div ui-view="settings"></div>
   </div>
 </div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.security.html b/docs-web/src/main/webapp/src/partial/docs/settings.security.html
new file mode 100644
index 00000000..90146484
--- /dev/null
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.security.html
@@ -0,0 +1 @@
+<h1>Two-factor <small>authentication</small></h1>
\ No newline at end of file