207 files changed, 240 insertions, 209 deletions

diff --git a/.gitignore b/.gitignore
index ddaadaa5..67c044d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.DS_Store
 *.egg-info
 /web-ui/node_modules
-/web-ui/app/bower_components
+/web-ui/public/bower_components
 /web-ui/lib/
 /web-ui/public/signup.js
 .tmp
@@ -13,8 +13,8 @@ dist/
 *archive.zip
 *.swp
 *.swo
-/web-ui/app/js/generated
-/web-ui/app/css
+/web-ui/public/js/generated
+/web-ui/public/css
 test-results.xml
 /control_tower.html
 /state.yml
diff --git a/doc/first-steps.md b/doc/first-steps.md
index e4a24097..0485b236 100644
--- a/doc/first-steps.md
+++ b/doc/first-steps.md
@@ -55,7 +55,7 @@ After that take some minutes to familiarize yourself with the user interface.
 
 To get a better feeling for the code base, let's try some smaller changes. Let's assume that we'd like to change the way subjects are displayed in the mail list.
 First we want to find the location in the code that renders the subjects. 
-Start your favorite text editor and open pixelated-user-agent/web-ui/app/js/mail_list/ui/mail_items/mail_item.js. Find the method named render. This seems to be the right location. To verify our assumption, let's change the html content. 
+Start your favorite text editor and open pixelated-user-agent/web-ui/public/js/mail_list/ui/mail_items/mail_item.js. Find the method named render. This seems to be the right location. To verify our assumption, let's change the html content. 
 
 ```javascript
   this.render = function () {
@@ -139,7 +139,7 @@ cd web-ui
 Now refresh your browser again to see the changes in effect.
 
 Finally we would like to change the color of the highlighting. The pixleated user agent uses [SASS](http://sass-lang.com/) to make handling styles a little bit easier.
-You can find the style sheets in web-ui/app/scss/. The search-hightlight is defined in styles.scss:
+You can find the style sheets in web-ui/public/scss/. The search-hightlight is defined in styles.scss:
 
 ```scss
 .search-highlight {
diff --git a/service/pixelated/application.py b/service/pixelated/application.py
index 9f33cb82..0c2383dd 100644
--- a/service/pixelated/application.py
+++ b/service/pixelated/application.py
@@ -88,12 +88,22 @@ def _create_service_factory(args):
         return ServicesFactory(UserAgentMode(is_single_user=False))
 
 
+def get_templates_folder():
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), "assets")
+
+
+def get_static_folder():
+    # TODO: make sure sandbox keeps working
+    # TODO: make sure this works for packaging
+    return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public"))
+
+
 def initialize():
     log.info('Starting the Pixelated user agent')
     args = arguments.parse_user_agent_args()
     logger.init(debug=args.debug)
     services_factory = _create_service_factory(args)
-    resource = RootResource(services_factory)
+    resource = RootResource(services_factory, templates_folder=get_templates_folder(), static_folder=get_static_folder())
 
     def start():
         start_async = _start_mode(args, resource, services_factory)
@@ -154,7 +164,7 @@ def _setup_multi_user(args, root_resource, services_factory):
 def set_up_protected_resources(root_resource, provider, services_factory, banner=None, authenticator=None):
     session_checker = SessionChecker(services_factory)
 
-    anonymous_resource = RootResource(services_factory, public=True)
+    anonymous_resource = RootResource(services_factory, templates_folder=get_templates_folder(), static_folder=get_static_folder(), public=True)
     realm = PixelatedRealm(root_resource, anonymous_resource)
     _portal = portal.Portal(realm, [session_checker, AllowAnonymousAccess()])
 
diff --git a/service/pixelated/resources/inbox_resource.py b/service/pixelated/resources/inbox_resource.py
index 426de5cc..d9ba86a5 100644
--- a/service/pixelated/resources/inbox_resource.py
+++ b/service/pixelated/resources/inbox_resource.py
@@ -46,7 +46,7 @@ class InboxResource(BaseResource):
 
     def _get_not_quite_the_templates_folder(self):
         path = os.path.dirname(os.path.abspath(pixelated.__file__))
-        return os.path.join(path, '..', '..', 'web-ui', 'app')
+        return os.path.join(path, '..', '..', 'web-ui', 'public')
 
     def _get_templates_folder(self):
         path = os.path.dirname(os.path.abspath(pixelated.__file__))
diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py
index 7d61ddce..6300efdb 100644
--- a/service/pixelated/resources/login_resource.py
+++ b/service/pixelated/resources/login_resource.py
@@ -51,11 +51,11 @@ def _get_public_folder():
 
 
 def _get_static_folder():
-    static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app"))
+    static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "public"))
     # this is a workaround for packaging
     if not os.path.exists(static_folder):
         static_folder = os.path.abspath(
-            os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "app"))
+            os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "public"))
     if not os.path.exists(static_folder):
         static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent')
     return static_folder
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py
index 1d32935b..375f27f6 100644
--- a/service/pixelated/resources/root_resource.py
+++ b/service/pixelated/resources/root_resource.py
@@ -44,13 +44,13 @@ logger = Logger()
 
 class RootResource(BaseResource):
 
-    def __init__(self, services_factory, public=False):
+    def __init__(self, services_factory, templates_folder, static_folder, public=False):
         BaseResource.__init__(self, services_factory)
         self._public = public
         self._assets_folder = self._get_assets_folder()
         self._startup_assets_folder = self._get_startup_folder()
-        self._static_folder = self._get_static_folder()
-        self._html_template = open(os.path.join(self._static_folder, 'index.html')).read()
+        self._static_folder = static_folder
+        self._html_template = open(os.path.join(templates_folder, 'index.html')).read()
         self._services_factory = services_factory
         with open(os.path.join(self._startup_assets_folder, 'Interstitial.html')) as f:
             self.interstitial = f.read()
@@ -61,6 +61,7 @@ class RootResource(BaseResource):
     def _startup_mode(self):
         self.putChildProtected('assets', File(self._assets_folder))
         self.putChildPublic('startup-assets', File(self._startup_assets_folder))
+        self.putChildPublic('static', File(self._static_folder))
         self._mode = MODE_STARTUP
         logger.debug('Root in STARTUP mode. %s' % self)
 
@@ -128,13 +129,3 @@ class RootResource(BaseResource):
     def _get_startup_folder(self):
         path = os.path.dirname(os.path.abspath(__file__))
         return os.path.join(path, '..', 'assets')
-
-    def _get_static_folder(self):
-        static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app"))
-        # this is a workaround for packaging
-        if not os.path.exists(static_folder):
-            static_folder = os.path.abspath(
-                os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "app"))
-        if not os.path.exists(static_folder):
-            static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent')
-        return static_folder
diff --git a/service/test/integration/test_static_files.py b/service/test/integration/test_static_files.py
new file mode 100644
index 00000000..e3fa8af5
--- /dev/null
+++ b/service/test/integration/test_static_files.py
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2016 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+
+
+from twisted.internet.defer import inlineCallbacks
+from test.support.integration import SoledadTestBase
+
+
+class StaticFilesTest(SoledadTestBase):
+
+    @inlineCallbacks
+    def test_should_find_static_file(self):
+        _, request = yield self.app_test_client.get('/static/js/main.js', as_json=False, ajax=False)
+        self.assertEqual(200, request.responseCode)
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index 4e3758c5..c611fbd0 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -38,7 +38,7 @@ from leap.soledad.client import Soledad
 from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor
 from pixelated.adapter.mailstore.leap_attachment_store import LeapAttachmentStore
 from pixelated.adapter.services.feedback_service import FeedbackService
-from pixelated.application import UserAgentMode, set_up_protected_resources
+from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder, get_templates_folder
 from pixelated.config.sessions import LeapSession
 from pixelated.config.services import Services, ServicesFactory, SingleUserServicesFactory
 from pixelated.config.site import PixelatedSite
@@ -218,10 +218,11 @@ class AppTestClient(object):
             services = self._test_account.services
             self.service_factory.add_session('someuserid', services)
 
-            self.resource = RootResource(self.service_factory)
+            self.resource = RootResource(self.service_factory, get_templates_folder(), get_static_folder())
             provider = mock()
             self.resource.initialize(provider)
         else:
+            # TODO: write test for me (=
             self.service_factory = StubServicesFactory(self.accounts, mode)
             provider = mock()
             bonafide_checker = StubAuthenticator(provider)
diff --git a/service/test/support/integration/multi_user_client.py b/service/test/support/integration/multi_user_client.py
index 4b9b2864..d7ab77a0 100644
--- a/service/test/support/integration/multi_user_client.py
+++ b/service/test/support/integration/multi_user_client.py
@@ -19,7 +19,7 @@ from mockito import mock, when, any as ANY
 from pixelated.authentication import Authenticator, Authentication
 from twisted.internet import defer
 
-from pixelated.application import UserAgentMode, set_up_protected_resources
+from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder, get_templates_folder
 from pixelated.config.services import ServicesFactory
 
 from pixelated.config.sessions import LeapSessionFactory
@@ -46,7 +46,7 @@ class MultiUserClient(AppTestClient):
 
         self.service_factory = ServicesFactory(UserAgentMode(is_single_user=False))
 
-        root_resource = RootResource(self.service_factory)
+        root_resource = RootResource(self.service_factory, get_templates_folder(), get_static_folder())
         leap_provider = mock()
         self.credentials_checker = StubSRPChecker(leap_provider)
         self.resource = set_up_protected_resources(root_resource, leap_provider, self.service_factory)
diff --git a/service/test/unit/resources/test_auth.py b/service/test/unit/resources/test_auth.py
index f4012b1b..7112ed96 100644
--- a/service/test/unit/resources/test_auth.py
+++ b/service/test/unit/resources/test_auth.py
@@ -1,4 +1,6 @@
 from mockito import mock, when, any as ANY
+
+from pixelated.application import get_templates_folder, get_static_folder
 from pixelated.resources.auth import SessionChecker, PixelatedRealm, PixelatedAuthSessionWrapper
 from pixelated.resources.login_resource import LoginResource
 from pixelated.resources.root_resource import RootResource
@@ -40,8 +42,8 @@ class TestPixelatedAuthSessionWrapper(unittest.TestCase):
         session_checker = SessionChecker(services_factory)
         self.portal = Portal(self.realm_mock, [session_checker, AllowAnonymousAccess()])
         self.user_uuid_mock = mock()
-        self.root_resource = RootResource(services_factory)
-        self.anonymous_resource = RootResource(services_factory, public=True)
+        self.root_resource = RootResource(services_factory, get_templates_folder(), get_static_folder())
+        self.anonymous_resource = RootResource(services_factory, get_templates_folder(), get_static_folder(), public=True)
 
         self.session_wrapper = PixelatedAuthSessionWrapper(self.portal, self.root_resource, self.anonymous_resource)
         self.request = DummyRequest([])
diff --git a/service/test/unit/resources/test_root_resource.py b/service/test/unit/resources/test_root_resource.py
index 9d738a83..e72efe59 100644
--- a/service/test/unit/resources/test_root_resource.py
+++ b/service/test/unit/resources/test_root_resource.py
@@ -5,7 +5,7 @@ from mock import MagicMock, patch
 from mockito import mock, when, any as ANY
 
 import pixelated
-from pixelated.application import UserAgentMode
+from pixelated.application import UserAgentMode, get_templates_folder, get_static_folder
 from pixelated.resources import IPixelatedSession, UnAuthorizedResource
 from pixelated.resources.features_resource import FeaturesResource
 from pixelated.resources.login_resource import LoginResource
@@ -22,7 +22,7 @@ from pixelated.resources.root_resource import InboxResource, RootResource, MODE_
 class TestPublicRootResource(unittest.TestCase):
 
     def setUp(self):
-        self.public_root_resource = RootResource(mock(), public=True)
+        self.public_root_resource = RootResource(mock(), get_templates_folder(), get_static_folder(), public=True)
         self.web = DummySite(self.public_root_resource)
 
     @patch('pixelated.resources.mails_resource.events.register')
@@ -105,7 +105,7 @@ class TestRootResource(unittest.TestCase):
         when(self.services_factory).services(ANY()).thenReturn(self.services)
         self.mail_service.account_email = self.MAIL_ADDRESS
 
-        self.root_resource = RootResource(self.services_factory)
+        self.root_resource = RootResource(self.services_factory, get_templates_folder(), get_static_folder())
         self.web = DummySite(self.root_resource)
 
     @patch('pixelated.resources.mails_resource.events.register')
diff --git a/web-ui/.bowerrc b/web-ui/.bowerrc
index 5773025b..d1c592ed 100644
--- a/web-ui/.bowerrc
+++ b/web-ui/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "app/bower_components"
+  "directory": "public/bower_components"
 }
diff --git a/web-ui/.jshintignore b/web-ui/.jshintignore
index 6a32b1a4..8dfe4354 100644
--- a/web-ui/.jshintignore
+++ b/web-ui/.jshintignore
@@ -1,4 +1,4 @@
-app/node_modules
-app/bower_components
-app/js/lib
-app/js/generated
+public/node_modules
+public/bower_components
+public/js/lib
+public/js/generated
diff --git a/web-ui/.tx/config b/web-ui/.tx/config
index 25299ced..04fc6bc2 100644
--- a/web-ui/.tx/config
+++ b/web-ui/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [pixelated-user-agent.web-ui]
-file_filter = app/locales/<lang>/translation.json
-source_file = app/locales/en_US/translation.json
+file_filter = public/locales/<lang>/translation.json
+source_file = public/locales/en_US/translation.json
 source_lang = en_US
 type = KEYVALUEJSON
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
deleted file mode 100644
index d4185471..00000000
--- a/web-ui/app/js/views/templates.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2014 ThoughtWorks, Inc.
- *
- * Pixelated is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pixelated is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
- */
-
-define(['hbs/templates'], function (templates) {
-  'use strict';
-
-  var Templates = {
-    compose: {
-      box: window.Pixelated['app/templates/compose/compose_box.hbs'],
-      inlineBox: window.Pixelated['app/templates/compose/inline_box.hbs'],
-      replySection: window.Pixelated['app/templates/compose/reply_section.hbs'],
-      recipientInput: window.Pixelated['app/templates/compose/recipient_input.hbs'],
-      fixedRecipient: window.Pixelated['app/templates/compose/fixed_recipient.hbs'],
-      recipients: window.Pixelated['app/templates/compose/recipients.hbs'],
-      feedback: window.Pixelated['app/templates/compose/feedback_box.hbs'],
-      attachmentsList: window.Pixelated['app/templates/compose/attachments_list.hbs'],
-      attachmentItem: window.Pixelated['app/templates/compose/attachment_item.hbs'],
-      attachmentUploadItem: window.Pixelated['app/templates/compose/attachment_upload_item.hbs'],
-      uploadAttachmentFailed: window.Pixelated['app/templates/compose/upload_attachment_failed.hbs']
-    },
-    tags: {
-      tagList: window.Pixelated['app/templates/tags/tag_list.hbs'],
-      tag: window.Pixelated['app/templates/tags/tag.hbs'],
-      tagInner: window.Pixelated['app/templates/tags/tag_inner.hbs'],
-      shortcut: window.Pixelated['app/templates/tags/shortcut.hbs']
-    },
-    userAlerts: {
-      message: window.Pixelated['app/templates/user_alerts/message.hbs']
-    },
-    mails: {
-      single: window.Pixelated['app/templates/mails/single.hbs'],
-      fullView: window.Pixelated['app/templates/mails/full_view.hbs'],
-      mailActions: window.Pixelated['app/templates/mails/mail_actions.hbs'],
-      draft: window.Pixelated['app/templates/mails/draft.hbs'],
-      sent: window.Pixelated['app/templates/mails/sent.hbs'],
-      trash: window.Pixelated['app/templates/mails/trash.hbs']
-    },
-    mailActions: {
-      actionsBox: window.Pixelated['app/templates/mail_actions/actions_box.hbs'],
-      trashActionsBox: window.Pixelated['app/templates/mail_actions/trash_actions_box.hbs'],
-      composeTrigger: window.Pixelated['app/templates/mail_actions/compose_trigger.hbs'],
-      refreshTrigger: window.Pixelated['app/templates/mail_actions/refresh_trigger.hbs'],
-      paginationTrigger: window.Pixelated['app/templates/mail_actions/pagination_trigger.hbs']
-    },
-    noMessageSelected: window.Pixelated['app/templates/compose/no_message_selected.hbs'],
-    noMailsAvailable: window.Pixelated['app/templates/compose/no_mails_available.hbs'],
-    search: {
-      trigger: window.Pixelated['app/templates/search/search_trigger.hbs']
-    },
-    page: {
-      userSettingsIcon: window.Pixelated['app/templates/page/user_settings_icon.hbs'],
-      userSettingsBox: window.Pixelated['app/templates/page/user_settings_box.hbs'],
-      logout: window.Pixelated['app/templates/page/logout.hbs'],
-      logoutShortcut: window.Pixelated['app/templates/page/logout_shortcut.hbs'],
-      version: window.Pixelated['app/templates/page/version.hbs']
-    },
-    feedback: {
-      feedback: window.Pixelated['app/templates/feedback/feedback_trigger.hbs']
-    }
-  };
-
-  Handlebars.registerPartial('tag_inner', Templates.tags.tagInner);
-  Handlebars.registerPartial('recipients', Templates.compose.recipients);
-  Handlebars.registerPartial('attachments_list', Templates.compose.attachmentsList);
-  Handlebars.registerPartial('attachments_upload', Templates.compose.attachmentsList);
-  Handlebars.registerPartial('attachment_item', Templates.compose.attachmentItem);
-  Handlebars.registerPartial('attachment_upload_item', Templates.compose.attachmentUploadItem);
-  Handlebars.registerPartial('uploadAttachmentFailed', Templates.compose.uploadAttachmentFailed);
-
-  return Templates;
-});
diff --git a/web-ui/config/add_git_version.sh b/web-ui/config/add_git_version.sh
index a0abefc0..abda150a 100755
--- a/web-ui/config/add_git_version.sh
+++ b/web-ui/config/add_git_version.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-TEMPLATE_FILE="app/js/generated/hbs/templates.js"
+TEMPLATE_FILE="public/js/generated/hbs/templates.js"
 
 COMMITISH=$(git rev-parse --short HEAD)
 COMMITDATE=$(git show -s --format=%cd)
diff --git a/web-ui/config/buildoptions.js b/web-ui/config/buildoptions.js
index 63c91653..2e7ba028 100644
--- a/web-ui/config/buildoptions.js
+++ b/web-ui/config/buildoptions.js
@@ -16,11 +16,11 @@
  */
 
 ({
-  baseUrl: '../app',
+  baseUrl: '../public',
   wrap: true,
   almond: true,
   optimize: 'none',
-  mainConfigFile: '../app/js/main.js',
+  mainConfigFile: '../public/js/main.js',
   out: '../.tmp/app.concatenated.js',
   include: ['js/main'],
   name: 'bower_components/almond/almond'
diff --git a/web-ui/config/compass.rb b/web-ui/config/compass.rb
index 9c52a04e..bc0301a3 100644
--- a/web-ui/config/compass.rb
+++ b/web-ui/config/compass.rb
@@ -17,14 +17,14 @@
 
 # Set this to the root of your project when deployed:
 
-target_dir = ENV['PIXELATED_BUILD'] == 'package' ? 'dist' : 'app'
+target_dir = ENV['PIXELATED_BUILD'] == 'package' ? 'dist' : 'public'
 
 
 http_path = "/"
 css_dir = "#{target_dir}/css"
-sass_dir = "app/scss"
-images_dir = "app/images"
-javascripts_dir = "app/js"
+sass_dir = "public/scss"
+images_dir = "public/images"
+javascripts_dir = "public/js"
 
 # You can select your preferred output style here (can be overridden via the command line):
 # output_style = :expanded or :nested or :compact or :compressed
diff --git a/web-ui/config/control-tower.yml b/web-ui/config/control-tower.yml
index 874e1b64..2d4d5865 100644
--- a/web-ui/config/control-tower.yml
+++ b/web-ui/config/control-tower.yml
@@ -1,3 +1,3 @@
 ---
-include_pattern: 'app/js/**/*.js'
+include_pattern: 'public/js/**/*.js'
 exclude_pattern: ''
diff --git a/web-ui/config/imagemin.js b/web-ui/config/imagemin.js
index 2b2c87e0..bbc589a8 100644
--- a/web-ui/config/imagemin.js
+++ b/web-ui/config/imagemin.js
@@ -17,7 +17,7 @@
 
 const imagemin = require('imagemin');
 
-imagemin(['app/images/*.{gif,jpg,png,svg}'],
+imagemin(['public/images/*.{gif,jpg,png,svg}'],
          'dist/images'
 ).then(files => {
   console.log('Images list:')
diff --git a/web-ui/config/package.sh b/web-ui/config/package.sh
index 165eeff3..d4208ecb 100644
--- a/web-ui/config/package.sh
+++ b/web-ui/config/package.sh
@@ -34,7 +34,7 @@ mkdir -p dist
 
 
 # copy files
-cd app
+cd public
 cp --parents \
 404.html \
 fonts/* \
@@ -47,19 +47,19 @@ cd -
 
 # concat js files and minify for app.min.js
 cat \
-app/bower_components/modernizr/modernizr.js \
-app/bower_components/lodash/dist/lodash.js \
-app/bower_components/jquery/dist/jquery.js \
-app/bower_components/jquery-ui/jquery-ui.js \
-app/bower_components/jquery-file-upload/js/jquery.fileupload.js \
-app/js/lib/highlightRegex.js \
-app/bower_components/handlebars/handlebars.js \
-app/bower_components/typeahead.js/dist/typeahead.bundle.js \
-app/bower_components/foundation/js/foundation.js \
-app/bower_components/foundation/js/foundation/foundation.reveal.js \
-app/bower_components/foundation/js/foundation/foundation.offcanvas.js \
-app/js/foundation/initialize_foundation.js \
-app/bower_components/iframe-resizer/js/iframeResizer.js \
+public/bower_components/modernizr/modernizr.js \
+public/bower_components/lodash/dist/lodash.js \
+public/bower_components/jquery/dist/jquery.js \
+public/bower_components/jquery-ui/jquery-ui.js \
+public/bower_components/jquery-file-upload/js/jquery.fileupload.js \
+public/js/lib/highlightRegex.js \
+public/bower_components/handlebars/handlebars.js \
+public/bower_components/typeahead.js/dist/typeahead.bundle.js \
+public/bower_components/foundation/js/foundation.js \
+public/bower_components/foundation/js/foundation/foundation.reveal.js \
+public/bower_components/foundation/js/foundation/foundation.offcanvas.js \
+public/js/foundation/initialize_foundation.js \
+public/bower_components/iframe-resizer/js/iframeResizer.js \
 .tmp/app.concatenated.js > dist/app.js
 node_modules/.bin/minify dist/app.js > dist/app.min.js
 rm dist/app.js
@@ -72,7 +72,7 @@ fi
 
 # concat js files and minify for sandbox.min.js
 cat \
-app/js/sandbox.js \
-app/bower_components/iframe-resizer/js/iframeResizer.contentWindow.js > dist/sandbox.js
+public/js/sandbox.js \
+public/bower_components/iframe-resizer/js/iframeResizer.contentWindow.js > dist/sandbox.js
 node_modules/.bin/minify dist/sandbox.js > dist/sandbox.min.js
 rm dist/sandbox.js
diff --git a/web-ui/karma.conf.js b/web-ui/karma.conf.js
index 52b54f57..93628052 100644
--- a/web-ui/karma.conf.js
+++ b/web-ui/karma.conf.js
@@ -17,51 +17,51 @@ module.exports = function (config) {
     // list of files / patterns to load in the browser
     files: [
       // loaded without require
-      'app/bower_components/lodash/dist/lodash.js',
-      'app/bower_components/jquery/dist/jquery.js',
-      'app/bower_components/jquery-ui/jquery-ui.min.js',
-      'app/bower_components/jquery-file-upload/js/jquery.fileupload.js',
-      'app/bower_components/jasmine-jquery/lib/jasmine-jquery.js',
-      'app/bower_components/jasmine-flight/lib/jasmine-flight.js',
-      'app/bower_components/jasmine-jquery/lib/jasmine-jquery.js',
-      'app/bower_components/handlebars/handlebars.min.js',
-      'app/bower_components/modernizr/modernizr.js',
-      'app/bower_components/foundation/js/foundation.js',
-      'app/bower_components/foundation/js/foundation/foundation.reveal.js',
-      'app/bower_components/foundation/js/foundation/foundation.offcanvas.js',
-      'app/js/lib/highlightRegex.js',
+      'public/bower_components/lodash/dist/lodash.js',
+      'public/bower_components/jquery/dist/jquery.js',
+      'public/bower_components/jquery-ui/jquery-ui.min.js',
+      'public/bower_components/jquery-file-upload/js/jquery.fileupload.js',
+      'public/bower_components/jasmine-jquery/lib/jasmine-jquery.js',
+      'public/bower_components/jasmine-flight/lib/jasmine-flight.js',
+      'public/bower_components/jasmine-jquery/lib/jasmine-jquery.js',
+      'public/bower_components/handlebars/handlebars.min.js',
+      'public/bower_components/modernizr/modernizr.js',
+      'public/bower_components/foundation/js/foundation.js',
+      'public/bower_components/foundation/js/foundation/foundation.reveal.js',
+      'public/bower_components/foundation/js/foundation/foundation.offcanvas.js',
+      'public/js/lib/highlightRegex.js',
 
       // hack to load RequireJS after the shim libs
       'node_modules/requirejs/require.js',
       'node_modules/karma-requirejs/lib/adapter.js',
 
       // loaded with require
-      {pattern: 'app/bower_components/DOMPurify/dist/purify.min.js', included: false},
-      {pattern: 'app/bower_components/he/he.js', included: false},
-      {pattern: 'app/bower_components/flight/**/*.js', included: false},
-      {pattern: 'app/bower_components/i18next/**/*.js', included: false},
-      {pattern: 'app/bower_components/i18next-xhr-backend/**/*.js', included: false},
-      {pattern: 'app/bower_components/i18next-browser-languagedetector/**/*.js', included: false},
-      {pattern: 'app/bower_components/quoted-printable/*.js', included: false},
-      {pattern: 'app/bower_components/utf8/utf8.js', included: false},
-      {pattern: 'app/locales/**/*.json', included: false},
-      {pattern: 'app/js/**/*.js', included: false},
+      {pattern: 'public/bower_components/DOMPurify/dist/purify.min.js', included: false},
+      {pattern: 'public/bower_components/he/he.js', included: false},
+      {pattern: 'public/bower_components/flight/**/*.js', included: false},
+      {pattern: 'public/bower_components/i18next/**/*.js', included: false},
+      {pattern: 'public/bower_components/i18next-xhr-backend/**/*.js', included: false},
+      {pattern: 'public/bower_components/i18next-browser-languagedetector/**/*.js', included: false},
+      {pattern: 'public/bower_components/quoted-printable/*.js', included: false},
+      {pattern: 'public/bower_components/utf8/utf8.js', included: false},
+      {pattern: 'public/locales/**/*.json', included: false},
+      {pattern: 'public/js/**/*.js', included: false},
       {pattern: 'test/test_data.js', included: false},
       {pattern: 'test/custom_matchers.js', included: false},
       {pattern: 'test/features.js', included: false},
       {pattern: 'test/spec/**/*.spec.js', included: false},
-      {pattern: 'app/sandbox.html', included: true, served: true},
+      {pattern: 'public/sandbox.html', included: true, served: true},
 
       'test/test-main.js'
     ],
 
     proxies: {
-        '/sandbox/sandbox.html': '/base/app/sandbox.html',
+        '/sandbox/sandbox.html': '/base/public/sandbox.html',
     },
 
     // list of files to exclude
     exclude: [
-      'app/js/main.js'
+      'public/js/main.js'
     ],
 
     // test results reporter to use
@@ -69,7 +69,7 @@ module.exports = function (config) {
     reporters: ['dots', 'junit', 'coverage'],
 
     preprocessors: {
-        'app/js/!(lib)/**/*.js': ['coverage']
+        'public/js/!(lib)/**/*.js': ['coverage']
     },
 
     // enable / disable watching file and executing tests whenever any file changes
diff --git a/web-ui/package.json b/web-ui/package.json
index b937502f..3fa1d294 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -31,19 +31,19 @@
     "debug": "npm run build && node_modules/karma/bin/karma start --browsers Chrome $GRUNT_OPTS",
     "watch": "npm run compass-watch & npm run handlebars-watch",
     "watch-test": "node_modules/karma/bin/karma start",
-    "handlebars": "mkdir -p app/js/generated/hbs/ && node_modules/handlebars/bin/handlebars app/templates/**/*.hbs > app/js/generated/hbs/templates.js --namespace=window.Pixelated --root .",
-    "handlebars-watch": "node_modules/.bin/watch 'npm run handlebars' app/templates",
+    "handlebars": "mkdir -p public/js/generated/hbs/ && node_modules/handlebars/bin/handlebars public/templates/**/*.hbs > public/js/generated/hbs/templates.js --namespace=window.Pixelated --root .",
+    "handlebars-watch": "node_modules/.bin/watch 'npm run handlebars' public/templates",
     "compass": "compass compile",
     "compass-watch": "compass watch",
     "build": "npm run clean && npm run handlebars && npm run add_git_version && npm run compass && npm run build-signup",
     "build-signup": "babel src/js -d lib/js && browserify lib/js/index.js >public/signup.js",
-    "jshint": "node_modules/jshint/bin/jshint --config=.jshintrc app test",
-    "clean": "rm -rf .tmp/ 'dist/*' app/js/generated/hbs/* app/css/*",
+    "jshint": "node_modules/jshint/bin/jshint --config=.jshintrc public test",
+    "clean": "rm -rf .tmp/ 'dist/*' public/js/generated/hbs/* public/css/*",
     "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js",
     "package": "/bin/bash config/package.sh",
     "imagemin": "node config/imagemin.js",
-    "minify_html": "node_modules/.bin/html-minifier app/index.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"assets/app.min.js\" type=\"text/javascript\"></script>|' > dist/index.html",
-    "minify_sandbox": "node_modules/.bin/html-minifier app/sandbox.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"sandbox.min.js\" type=\"text/javascript\"></script>|' > dist/sandbox.html",
+    "minify_html": "node_modules/.bin/html-minifier public/index.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"assets/app.min.js\" type=\"text/javascript\"></script>|' > dist/index.html",
+    "minify_sandbox": "node_modules/.bin/html-minifier public/sandbox.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"sandbox.min.js\" type=\"text/javascript\"></script>|' > dist/sandbox.html",
     "add_git_version": "/bin/bash config/add_git_version.sh"
   },
   "dependencies": {
diff --git a/web-ui/app/404.html b/web-ui/public/404.html
index fdace4ab..fdace4ab 100644
--- a/web-ui/app/404.html
+++ b/web-ui/public/404.html
diff --git a/web-ui/app/favicon.ico b/web-ui/public/favicon.ico
index e69de29b..e69de29b 100644
--- a/web-ui/app/favicon.ico
+++ b/web-ui/public/favicon.ico
diff --git a/web-ui/app/fonts/OpenSans-Bold.woff b/web-ui/public/fonts/OpenSans-Bold.woff
index dacf3c9c..dacf3c9c 100644
--- a/web-ui/app/fonts/OpenSans-Bold.woff
+++ b/web-ui/public/fonts/OpenSans-Bold.woff
diff --git a/web-ui/app/fonts/OpenSans-BoldItalic.woff b/web-ui/public/fonts/OpenSans-BoldItalic.woff
index a4e29c0f..a4e29c0f 100644
--- a/web-ui/app/fonts/OpenSans-BoldItalic.woff
+++ b/web-ui/public/fonts/OpenSans-BoldItalic.woff
diff --git a/web-ui/app/fonts/OpenSans-Extrabold.woff b/web-ui/public/fonts/OpenSans-Extrabold.woff
index 7a2e352b..7a2e352b 100644
--- a/web-ui/app/fonts/OpenSans-Extrabold.woff
+++ b/web-ui/public/fonts/OpenSans-Extrabold.woff
diff --git a/web-ui/app/fonts/OpenSans-ExtraboldItalic.woff b/web-ui/public/fonts/OpenSans-ExtraboldItalic.woff
index ce3ab2e7..ce3ab2e7 100644
--- a/web-ui/app/fonts/OpenSans-ExtraboldItalic.woff
+++ b/web-ui/public/fonts/OpenSans-ExtraboldItalic.woff
diff --git a/web-ui/app/fonts/OpenSans-Italic.woff b/web-ui/public/fonts/OpenSans-Italic.woff
index c5f6bac1..c5f6bac1 100644
--- a/web-ui/app/fonts/OpenSans-Italic.woff
+++ b/web-ui/public/fonts/OpenSans-Italic.woff
diff --git a/web-ui/app/fonts/OpenSans-Light.woff b/web-ui/public/fonts/OpenSans-Light.woff
index eb601d70..eb601d70 100644
--- a/web-ui/app/fonts/OpenSans-Light.woff
+++ b/web-ui/public/fonts/OpenSans-Light.woff
diff --git a/web-ui/app/fonts/OpenSans-Semibold.woff b/web-ui/public/fonts/OpenSans-Semibold.woff
index 56c44944..56c44944 100644
--- a/web-ui/app/fonts/OpenSans-Semibold.woff
+++ b/web-ui/public/fonts/OpenSans-Semibold.woff
diff --git a/web-ui/app/fonts/OpenSans-SemiboldItalic.woff b/web-ui/public/fonts/OpenSans-SemiboldItalic.woff
index 3a439fc3..3a439fc3 100644
--- a/web-ui/app/fonts/OpenSans-SemiboldItalic.woff
+++ b/web-ui/public/fonts/OpenSans-SemiboldItalic.woff
diff --git a/web-ui/app/fonts/OpenSans.woff b/web-ui/public/fonts/OpenSans.woff
index 77706fa6..77706fa6 100644
--- a/web-ui/app/fonts/OpenSans.woff
+++ b/web-ui/public/fonts/OpenSans.woff
diff --git a/web-ui/app/fonts/OpenSansLight-Italic.woff b/web-ui/public/fonts/OpenSansLight-Italic.woff
index 3f9f088f..3f9f088f 100644
--- a/web-ui/app/fonts/OpenSansLight-Italic.woff
+++ b/web-ui/public/fonts/OpenSansLight-Italic.woff
diff --git a/web-ui/app/fonts/icomoon.ttf b/web-ui/public/fonts/icomoon.ttf
index 61315d04..61315d04 100644
--- a/web-ui/app/fonts/icomoon.ttf
+++ b/web-ui/public/fonts/icomoon.ttf
diff --git a/web-ui/app/fonts/icomoon.woff b/web-ui/public/fonts/icomoon.woff
index 82f11748..82f11748 100644
--- a/web-ui/app/fonts/icomoon.woff
+++ b/web-ui/public/fonts/icomoon.woff
diff --git a/web-ui/app/images/LOADING-transparent.gif b/web-ui/public/images/LOADING-transparent.gif
index ac9abcde..ac9abcde 100644
--- a/web-ui/app/images/LOADING-transparent.gif
+++ b/web-ui/public/images/LOADING-transparent.gif
diff --git a/web-ui/app/images/fa-sent.svg b/web-ui/public/images/fa-sent.svg
index a4b4bea4..a4b4bea4 100644
--- a/web-ui/app/images/fa-sent.svg
+++ b/web-ui/public/images/fa-sent.svg
diff --git a/web-ui/app/images/favicon.png b/web-ui/public/images/favicon.png
index e14841c7..e14841c7 100644
--- a/web-ui/app/images/favicon.png
+++ b/web-ui/public/images/favicon.png
diff --git a/web-ui/app/images/logo.svg b/web-ui/public/images/logo.svg
index 6c2d8989..6c2d8989 100644
--- a/web-ui/app/images/logo.svg
+++ b/web-ui/public/images/logo.svg
diff --git a/web-ui/app/images/pixelated-symbol-blue-transparent-01.png b/web-ui/public/images/pixelated-symbol-blue-transparent-01.png
index 96b92155..96b92155 100644
--- a/web-ui/app/images/pixelated-symbol-blue-transparent-01.png
+++ b/web-ui/public/images/pixelated-symbol-blue-transparent-01.png
diff --git a/web-ui/app/index.html b/web-ui/public/index.html
index 4b6a81a0..4b6a81a0 100644
--- a/web-ui/app/index.html
+++ b/web-ui/public/index.html
diff --git a/web-ui/app/js/dispatchers/left_pane_dispatcher.js b/web-ui/public/js/dispatchers/left_pane_dispatcher.js
index 0037a88f..0037a88f 100644
--- a/web-ui/app/js/dispatchers/left_pane_dispatcher.js
+++ b/web-ui/public/js/dispatchers/left_pane_dispatcher.js
diff --git a/web-ui/app/js/dispatchers/middle_pane_dispatcher.js b/web-ui/public/js/dispatchers/middle_pane_dispatcher.js
index 12222aec..12222aec 100644
--- a/web-ui/app/js/dispatchers/middle_pane_dispatcher.js
+++ b/web-ui/public/js/dispatchers/middle_pane_dispatcher.js
diff --git a/web-ui/app/js/dispatchers/right_pane_dispatcher.js b/web-ui/public/js/dispatchers/right_pane_dispatcher.js
index 870bcd92..870bcd92 100644
--- a/web-ui/app/js/dispatchers/right_pane_dispatcher.js
+++ b/web-ui/public/js/dispatchers/right_pane_dispatcher.js
diff --git a/web-ui/app/js/features/features.js b/web-ui/public/js/features/features.js
index f71d56ea..f71d56ea 100644
--- a/web-ui/app/js/features/features.js
+++ b/web-ui/public/js/features/features.js
diff --git a/web-ui/app/js/feedback/feedback_cache.js b/web-ui/public/js/feedback/feedback_cache.js
index a5d92266..a5d92266 100644
--- a/web-ui/app/js/feedback/feedback_cache.js
+++ b/web-ui/public/js/feedback/feedback_cache.js
diff --git a/web-ui/app/js/feedback/feedback_trigger.js b/web-ui/public/js/feedback/feedback_trigger.js
index 598f9060..598f9060 100644
--- a/web-ui/app/js/feedback/feedback_trigger.js
+++ b/web-ui/public/js/feedback/feedback_trigger.js
diff --git a/web-ui/app/js/foundation/initialize_foundation.js b/web-ui/public/js/foundation/initialize_foundation.js
index 42405dfe..42405dfe 100644
--- a/web-ui/app/js/foundation/initialize_foundation.js
+++ b/web-ui/public/js/foundation/initialize_foundation.js
diff --git a/web-ui/app/js/foundation/off_canvas.js b/web-ui/public/js/foundation/off_canvas.js
index 66334470..66334470 100644
--- a/web-ui/app/js/foundation/off_canvas.js
+++ b/web-ui/public/js/foundation/off_canvas.js
diff --git a/web-ui/app/js/helpers/browser.js b/web-ui/public/js/helpers/browser.js
index dacf2263..dacf2263 100644
--- a/web-ui/app/js/helpers/browser.js
+++ b/web-ui/public/js/helpers/browser.js
diff --git a/web-ui/app/js/helpers/contenttype.js b/web-ui/public/js/helpers/contenttype.js
index a1e5361a..a1e5361a 100644
--- a/web-ui/app/js/helpers/contenttype.js
+++ b/web-ui/public/js/helpers/contenttype.js
diff --git a/web-ui/app/js/helpers/iterator.js b/web-ui/public/js/helpers/iterator.js
index 236c7a40..236c7a40 100644
--- a/web-ui/app/js/helpers/iterator.js
+++ b/web-ui/public/js/helpers/iterator.js
diff --git a/web-ui/app/js/helpers/monitored_ajax.js b/web-ui/public/js/helpers/monitored_ajax.js
index bbf85c45..bbf85c45 100644
--- a/web-ui/app/js/helpers/monitored_ajax.js
+++ b/web-ui/public/js/helpers/monitored_ajax.js
diff --git a/web-ui/app/js/helpers/sanitizer.js b/web-ui/public/js/helpers/sanitizer.js
index 443e8602..443e8602 100644
--- a/web-ui/app/js/helpers/sanitizer.js
+++ b/web-ui/public/js/helpers/sanitizer.js
diff --git a/web-ui/app/js/helpers/triggering.js b/web-ui/public/js/helpers/triggering.js
index d26d9fc6..d26d9fc6 100644
--- a/web-ui/app/js/helpers/triggering.js
+++ b/web-ui/public/js/helpers/triggering.js
diff --git a/web-ui/app/js/helpers/view_helper.js b/web-ui/public/js/helpers/view_helper.js
index ed9e0559..ed9e0559 100644
--- a/web-ui/app/js/helpers/view_helper.js
+++ b/web-ui/public/js/helpers/view_helper.js
diff --git a/web-ui/app/js/lib/highlightRegex.js b/web-ui/public/js/lib/highlightRegex.js
index 17caaa23..17caaa23 100644
--- a/web-ui/app/js/lib/highlightRegex.js
+++ b/web-ui/public/js/lib/highlightRegex.js
diff --git a/web-ui/app/js/lib/html4-defs.js b/web-ui/public/js/lib/html4-defs.js
index 1ec575da..1ec575da 100644
--- a/web-ui/app/js/lib/html4-defs.js
+++ b/web-ui/public/js/lib/html4-defs.js
diff --git a/web-ui/app/js/mail_list/domain/refresher.js b/web-ui/public/js/mail_list/domain/refresher.js
index 38c9cde5..38c9cde5 100644
--- a/web-ui/app/js/mail_list/domain/refresher.js
+++ b/web-ui/public/js/mail_list/domain/refresher.js
diff --git a/web-ui/app/js/mail_list/ui/mail_item_factory.js b/web-ui/public/js/mail_list/ui/mail_item_factory.js
index 7205d35c..7205d35c 100644
--- a/web-ui/app/js/mail_list/ui/mail_item_factory.js
+++ b/web-ui/public/js/mail_list/ui/mail_item_factory.js
diff --git a/web-ui/app/js/mail_list/ui/mail_items/draft_item.js b/web-ui/public/js/mail_list/ui/mail_items/draft_item.js
index 57fbafd5..57fbafd5 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/draft_item.js
+++ b/web-ui/public/js/mail_list/ui/mail_items/draft_item.js
diff --git a/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js b/web-ui/public/js/mail_list/ui/mail_items/generic_mail_item.js
index 939f7e1b..939f7e1b 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js
+++ b/web-ui/public/js/mail_list/ui/mail_items/generic_mail_item.js
diff --git a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js b/web-ui/public/js/mail_list/ui/mail_items/mail_item.js
index be664289..be664289 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
+++ b/web-ui/public/js/mail_list/ui/mail_items/mail_item.js
diff --git a/web-ui/app/js/mail_list/ui/mail_items/sent_item.js b/web-ui/public/js/mail_list/ui/mail_items/sent_item.js
index 9e511068..9e511068 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/sent_item.js
+++ b/web-ui/public/js/mail_list/ui/mail_items/sent_item.js
diff --git a/web-ui/app/js/mail_list/ui/mail_list.js b/web-ui/public/js/mail_list/ui/mail_list.js
index af4821a8..af4821a8 100644
--- a/web-ui/app/js/mail_list/ui/mail_list.js
+++ b/web-ui/public/js/mail_list/ui/mail_list.js
diff --git a/web-ui/app/js/mail_list_actions/ui/archive_many_trigger.js b/web-ui/public/js/mail_list_actions/ui/archive_many_trigger.js
index b148cdce..b148cdce 100644
--- a/web-ui/app/js/mail_list_actions/ui/archive_many_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/archive_many_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/compose_trigger.js b/web-ui/public/js/mail_list_actions/ui/compose_trigger.js
index ec79cb26..ec79cb26 100644
--- a/web-ui/app/js/mail_list_actions/ui/compose_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/compose_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/delete_many_trigger.js b/web-ui/public/js/mail_list_actions/ui/delete_many_trigger.js
index dd2f67a5..dd2f67a5 100644
--- a/web-ui/app/js/mail_list_actions/ui/delete_many_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/delete_many_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js b/web-ui/public/js/mail_list_actions/ui/mail_list_actions.js
index 69e5fde4..69e5fde4 100644
--- a/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js
+++ b/web-ui/public/js/mail_list_actions/ui/mail_list_actions.js
diff --git a/web-ui/app/js/mail_list_actions/ui/mark_as_unread_trigger.js b/web-ui/public/js/mail_list_actions/ui/mark_as_unread_trigger.js
index 2584e453..2584e453 100644
--- a/web-ui/app/js/mail_list_actions/ui/mark_as_unread_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/mark_as_unread_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/mark_many_as_read_trigger.js b/web-ui/public/js/mail_list_actions/ui/mark_many_as_read_trigger.js
index c16a2229..c16a2229 100644
--- a/web-ui/app/js/mail_list_actions/ui/mark_many_as_read_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/mark_many_as_read_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/pagination_trigger.js b/web-ui/public/js/mail_list_actions/ui/pagination_trigger.js
index 3bc13d40..3bc13d40 100644
--- a/web-ui/app/js/mail_list_actions/ui/pagination_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/pagination_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/recover_many_trigger.js b/web-ui/public/js/mail_list_actions/ui/recover_many_trigger.js
index e0a32094..e0a32094 100644
--- a/web-ui/app/js/mail_list_actions/ui/recover_many_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/recover_many_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/refresh_trigger.js b/web-ui/public/js/mail_list_actions/ui/refresh_trigger.js
index a16270d2..a16270d2 100644
--- a/web-ui/app/js/mail_list_actions/ui/refresh_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/refresh_trigger.js
diff --git a/web-ui/app/js/mail_list_actions/ui/toggle_check_all_trigger.js b/web-ui/public/js/mail_list_actions/ui/toggle_check_all_trigger.js
index 71c65346..71c65346 100644
--- a/web-ui/app/js/mail_list_actions/ui/toggle_check_all_trigger.js
+++ b/web-ui/public/js/mail_list_actions/ui/toggle_check_all_trigger.js
diff --git a/web-ui/app/js/mail_view/data/feedback_sender.js b/web-ui/public/js/mail_view/data/feedback_sender.js
index 2232dbe4..2232dbe4 100644
--- a/web-ui/app/js/mail_view/data/feedback_sender.js
+++ b/web-ui/public/js/mail_view/data/feedback_sender.js
diff --git a/web-ui/app/js/mail_view/data/mail_builder.js b/web-ui/public/js/mail_view/data/mail_builder.js
index 7a478dd8..7a478dd8 100644
--- a/web-ui/app/js/mail_view/data/mail_builder.js
+++ b/web-ui/public/js/mail_view/data/mail_builder.js
diff --git a/web-ui/app/js/mail_view/data/mail_sender.js b/web-ui/public/js/mail_view/data/mail_sender.js
index 8bb01f70..8bb01f70 100644
--- a/web-ui/app/js/mail_view/data/mail_sender.js
+++ b/web-ui/public/js/mail_view/data/mail_sender.js
diff --git a/web-ui/app/js/mail_view/ui/attachment_icon.js b/web-ui/public/js/mail_view/ui/attachment_icon.js
index e04fc02a..e04fc02a 100644
--- a/web-ui/app/js/mail_view/ui/attachment_icon.js
+++ b/web-ui/public/js/mail_view/ui/attachment_icon.js
diff --git a/web-ui/app/js/mail_view/ui/attachment_list.js b/web-ui/public/js/mail_view/ui/attachment_list.js
index 4ef64960..4ef64960 100644
--- a/web-ui/app/js/mail_view/ui/attachment_list.js
+++ b/web-ui/public/js/mail_view/ui/attachment_list.js
diff --git a/web-ui/app/js/mail_view/ui/compose_box.js b/web-ui/public/js/mail_view/ui/compose_box.js
index 101dc939..101dc939 100644
--- a/web-ui/app/js/mail_view/ui/compose_box.js
+++ b/web-ui/public/js/mail_view/ui/compose_box.js
diff --git a/web-ui/app/js/mail_view/ui/draft_box.js b/web-ui/public/js/mail_view/ui/draft_box.js
index afe31914..afe31914 100644
--- a/web-ui/app/js/mail_view/ui/draft_box.js
+++ b/web-ui/public/js/mail_view/ui/draft_box.js
diff --git a/web-ui/app/js/mail_view/ui/draft_save_status.js b/web-ui/public/js/mail_view/ui/draft_save_status.js
index 47751d91..47751d91 100644
--- a/web-ui/app/js/mail_view/ui/draft_save_status.js
+++ b/web-ui/public/js/mail_view/ui/draft_save_status.js
diff --git a/web-ui/app/js/mail_view/ui/feedback_box.js b/web-ui/public/js/mail_view/ui/feedback_box.js
index 4e00ece8..4e00ece8 100644
--- a/web-ui/app/js/mail_view/ui/feedback_box.js
+++ b/web-ui/public/js/mail_view/ui/feedback_box.js
diff --git a/web-ui/app/js/mail_view/ui/forward_box.js b/web-ui/public/js/mail_view/ui/forward_box.js
index a34bd55d..a34bd55d 100644
--- a/web-ui/app/js/mail_view/ui/forward_box.js
+++ b/web-ui/public/js/mail_view/ui/forward_box.js
diff --git a/web-ui/app/js/mail_view/ui/mail_actions.js b/web-ui/public/js/mail_view/ui/mail_actions.js
index 65cd0aaa..65cd0aaa 100644
--- a/web-ui/app/js/mail_view/ui/mail_actions.js
+++ b/web-ui/public/js/mail_view/ui/mail_actions.js
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/public/js/mail_view/ui/mail_view.js
index 3408c8af..3408c8af 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/public/js/mail_view/ui/mail_view.js
diff --git a/web-ui/app/js/mail_view/ui/no_mails_available_pane.js b/web-ui/public/js/mail_view/ui/no_mails_available_pane.js
index c62c6b30..c62c6b30 100644
--- a/web-ui/app/js/mail_view/ui/no_mails_available_pane.js
+++ b/web-ui/public/js/mail_view/ui/no_mails_available_pane.js
diff --git a/web-ui/app/js/mail_view/ui/no_message_selected_pane.js b/web-ui/public/js/mail_view/ui/no_message_selected_pane.js
index a5fc2393..a5fc2393 100644
--- a/web-ui/app/js/mail_view/ui/no_message_selected_pane.js
+++ b/web-ui/public/js/mail_view/ui/no_message_selected_pane.js
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipient.js b/web-ui/public/js/mail_view/ui/recipients/recipient.js
index c13a52b1..c13a52b1 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipient.js
+++ b/web-ui/public/js/mail_view/ui/recipients/recipient.js
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipients.js b/web-ui/public/js/mail_view/ui/recipients/recipients.js
index 2caa8d14..2caa8d14 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipients.js
+++ b/web-ui/public/js/mail_view/ui/recipients/recipients.js
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipients_input.js b/web-ui/public/js/mail_view/ui/recipients/recipients_input.js
index 8a9c4eaf..8a9c4eaf 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipients_input.js
+++ b/web-ui/public/js/mail_view/ui/recipients/recipients_input.js
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipients_iterator.js b/web-ui/public/js/mail_view/ui/recipients/recipients_iterator.js
index 624ac4f5..624ac4f5 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipients_iterator.js
+++ b/web-ui/public/js/mail_view/ui/recipients/recipients_iterator.js
diff --git a/web-ui/app/js/mail_view/ui/reply_box.js b/web-ui/public/js/mail_view/ui/reply_box.js
index a174d185..a174d185 100644
--- a/web-ui/app/js/mail_view/ui/reply_box.js
+++ b/web-ui/public/js/mail_view/ui/reply_box.js
diff --git a/web-ui/app/js/mail_view/ui/reply_section.js b/web-ui/public/js/mail_view/ui/reply_section.js
index cbe64205..cbe64205 100644
--- a/web-ui/app/js/mail_view/ui/reply_section.js
+++ b/web-ui/public/js/mail_view/ui/reply_section.js
diff --git a/web-ui/app/js/mail_view/ui/send_button.js b/web-ui/public/js/mail_view/ui/send_button.js
index 66fe1233..66fe1233 100644
--- a/web-ui/app/js/mail_view/ui/send_button.js
+++ b/web-ui/public/js/mail_view/ui/send_button.js
diff --git a/web-ui/app/js/main.js b/web-ui/public/js/main.js
index b8836a6b..b8836a6b 100644
--- a/web-ui/app/js/main.js
+++ b/web-ui/public/js/main.js
diff --git a/web-ui/app/js/mixins/with_auto_refresh.js b/web-ui/public/js/mixins/with_auto_refresh.js
index c75fda45..c75fda45 100644
--- a/web-ui/app/js/mixins/with_auto_refresh.js
+++ b/web-ui/public/js/mixins/with_auto_refresh.js
diff --git a/web-ui/app/js/mixins/with_compose_inline.js b/web-ui/public/js/mixins/with_compose_inline.js
index b8266f28..b8266f28 100644
--- a/web-ui/app/js/mixins/with_compose_inline.js
+++ b/web-ui/public/js/mixins/with_compose_inline.js
diff --git a/web-ui/app/js/mixins/with_enable_disable_on_event.js b/web-ui/public/js/mixins/with_enable_disable_on_event.js
index 5b28a67b..5b28a67b 100644
--- a/web-ui/app/js/mixins/with_enable_disable_on_event.js
+++ b/web-ui/public/js/mixins/with_enable_disable_on_event.js
diff --git a/web-ui/app/js/mixins/with_feature_toggle.js b/web-ui/public/js/mixins/with_feature_toggle.js
index 195b08bc..195b08bc 100644
--- a/web-ui/app/js/mixins/with_feature_toggle.js
+++ b/web-ui/public/js/mixins/with_feature_toggle.js
diff --git a/web-ui/app/js/mixins/with_hide_and_show.js b/web-ui/public/js/mixins/with_hide_and_show.js
index c8902f61..c8902f61 100644
--- a/web-ui/app/js/mixins/with_hide_and_show.js
+++ b/web-ui/public/js/mixins/with_hide_and_show.js
diff --git a/web-ui/app/js/mixins/with_mail_edit_base.js b/web-ui/public/js/mixins/with_mail_edit_base.js
index a088080e..a088080e 100644
--- a/web-ui/app/js/mixins/with_mail_edit_base.js
+++ b/web-ui/public/js/mixins/with_mail_edit_base.js
diff --git a/web-ui/app/js/mixins/with_mail_sandbox.js b/web-ui/public/js/mixins/with_mail_sandbox.js
index 1a51840d..1a51840d 100644
--- a/web-ui/app/js/mixins/with_mail_sandbox.js
+++ b/web-ui/public/js/mixins/with_mail_sandbox.js
diff --git a/web-ui/app/js/mixins/with_mail_tagging.js b/web-ui/public/js/mixins/with_mail_tagging.js
index 1fc1c3bd..1fc1c3bd 100644
--- a/web-ui/app/js/mixins/with_mail_tagging.js
+++ b/web-ui/public/js/mixins/with_mail_tagging.js
diff --git a/web-ui/app/js/monkey_patching/all.js b/web-ui/public/js/monkey_patching/all.js
index 2c29c9a1..2c29c9a1 100644
--- a/web-ui/app/js/monkey_patching/all.js
+++ b/web-ui/public/js/monkey_patching/all.js
diff --git a/web-ui/app/js/monkey_patching/array.js b/web-ui/public/js/monkey_patching/array.js
index d0ccc4b8..d0ccc4b8 100644
--- a/web-ui/app/js/monkey_patching/array.js
+++ b/web-ui/public/js/monkey_patching/array.js
diff --git a/web-ui/app/js/monkey_patching/post_message.js b/web-ui/public/js/monkey_patching/post_message.js
index 363ce581..363ce581 100644
--- a/web-ui/app/js/monkey_patching/post_message.js
+++ b/web-ui/public/js/monkey_patching/post_message.js
diff --git a/web-ui/app/js/page/default.js b/web-ui/public/js/page/default.js
index ecaedfd8..ecaedfd8 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/public/js/page/default.js
diff --git a/web-ui/app/js/page/events.js b/web-ui/public/js/page/events.js
index 68a6aad1..68a6aad1 100644
--- a/web-ui/app/js/page/events.js
+++ b/web-ui/public/js/page/events.js
diff --git a/web-ui/app/js/page/logout.js b/web-ui/public/js/page/logout.js
index 81b57db2..81b57db2 100644
--- a/web-ui/app/js/page/logout.js
+++ b/web-ui/public/js/page/logout.js
diff --git a/web-ui/app/js/page/logout_shortcut.js b/web-ui/public/js/page/logout_shortcut.js
index 10a69c7d..10a69c7d 100644
--- a/web-ui/app/js/page/logout_shortcut.js
+++ b/web-ui/public/js/page/logout_shortcut.js
diff --git a/web-ui/app/js/page/pane_contract_expand.js b/web-ui/public/js/page/pane_contract_expand.js
index 9bb435c4..9bb435c4 100644
--- a/web-ui/app/js/page/pane_contract_expand.js
+++ b/web-ui/public/js/page/pane_contract_expand.js
diff --git a/web-ui/app/js/page/pix_logo.js b/web-ui/public/js/page/pix_logo.js
index ad17f3be..ad17f3be 100644
--- a/web-ui/app/js/page/pix_logo.js
+++ b/web-ui/public/js/page/pix_logo.js
diff --git a/web-ui/app/js/page/router.js b/web-ui/public/js/page/router.js
index ce0d7d04..ce0d7d04 100644
--- a/web-ui/app/js/page/router.js
+++ b/web-ui/public/js/page/router.js
diff --git a/web-ui/app/js/page/router/url_params.js b/web-ui/public/js/page/router/url_params.js
index 4fa11c6d..4fa11c6d 100644
--- a/web-ui/app/js/page/router/url_params.js
+++ b/web-ui/public/js/page/router/url_params.js
diff --git a/web-ui/app/js/page/unread_count_title.js b/web-ui/public/js/page/unread_count_title.js
index 89dcd47d..89dcd47d 100644
--- a/web-ui/app/js/page/unread_count_title.js
+++ b/web-ui/public/js/page/unread_count_title.js
diff --git a/web-ui/app/js/page/version.js b/web-ui/public/js/page/version.js
index 9fd5e629..9fd5e629 100644
--- a/web-ui/app/js/page/version.js
+++ b/web-ui/public/js/page/version.js
diff --git a/web-ui/app/js/sandbox.js b/web-ui/public/js/sandbox.js
index 33b16ea4..33b16ea4 100644
--- a/web-ui/app/js/sandbox.js
+++ b/web-ui/public/js/sandbox.js
diff --git a/web-ui/app/js/search/results_highlighter.js b/web-ui/public/js/search/results_highlighter.js
index 831be0cd..831be0cd 100644
--- a/web-ui/app/js/search/results_highlighter.js
+++ b/web-ui/public/js/search/results_highlighter.js
diff --git a/web-ui/app/js/search/search_trigger.js b/web-ui/public/js/search/search_trigger.js
index 2aff027c..2aff027c 100644
--- a/web-ui/app/js/search/search_trigger.js
+++ b/web-ui/public/js/search/search_trigger.js
diff --git a/web-ui/app/js/services/delete_service.js b/web-ui/public/js/services/delete_service.js
index 0dfc1bdb..0dfc1bdb 100644
--- a/web-ui/app/js/services/delete_service.js
+++ b/web-ui/public/js/services/delete_service.js
diff --git a/web-ui/app/js/services/mail_service.js b/web-ui/public/js/services/mail_service.js
index 5e4bd4f3..5e4bd4f3 100644
--- a/web-ui/app/js/services/mail_service.js
+++ b/web-ui/public/js/services/mail_service.js
diff --git a/web-ui/app/js/services/model/mail.js b/web-ui/public/js/services/model/mail.js
index 64a10c1c..64a10c1c 100644
--- a/web-ui/app/js/services/model/mail.js
+++ b/web-ui/public/js/services/model/mail.js
diff --git a/web-ui/app/js/services/recover_service.js b/web-ui/public/js/services/recover_service.js
index d7d9cdc9..d7d9cdc9 100644
--- a/web-ui/app/js/services/recover_service.js
+++ b/web-ui/public/js/services/recover_service.js
diff --git a/web-ui/app/js/style_guide/main.js b/web-ui/public/js/style_guide/main.js
index 32c213cf..32c213cf 100644
--- a/web-ui/app/js/style_guide/main.js
+++ b/web-ui/public/js/style_guide/main.js
diff --git a/web-ui/app/js/tags/data/tags.js b/web-ui/public/js/tags/data/tags.js
index 31703b2a..31703b2a 100644
--- a/web-ui/app/js/tags/data/tags.js
+++ b/web-ui/public/js/tags/data/tags.js
diff --git a/web-ui/app/js/tags/ui/tag.js b/web-ui/public/js/tags/ui/tag.js
index 37814cfc..37814cfc 100644
--- a/web-ui/app/js/tags/ui/tag.js
+++ b/web-ui/public/js/tags/ui/tag.js
diff --git a/web-ui/app/js/tags/ui/tag_base.js b/web-ui/public/js/tags/ui/tag_base.js
index 9dc1ccbb..9dc1ccbb 100644
--- a/web-ui/app/js/tags/ui/tag_base.js
+++ b/web-ui/public/js/tags/ui/tag_base.js
diff --git a/web-ui/app/js/tags/ui/tag_list.js b/web-ui/public/js/tags/ui/tag_list.js
index a2172c6d..a2172c6d 100644
--- a/web-ui/app/js/tags/ui/tag_list.js
+++ b/web-ui/public/js/tags/ui/tag_list.js
diff --git a/web-ui/app/js/user_alerts/ui/user_alerts.js b/web-ui/public/js/user_alerts/ui/user_alerts.js
index e944a7a5..e944a7a5 100644
--- a/web-ui/app/js/user_alerts/ui/user_alerts.js
+++ b/web-ui/public/js/user_alerts/ui/user_alerts.js
diff --git a/web-ui/app/js/user_settings/data/user_settings.js b/web-ui/public/js/user_settings/data/user_settings.js
index dac29cec..dac29cec 100644
--- a/web-ui/app/js/user_settings/data/user_settings.js
+++ b/web-ui/public/js/user_settings/data/user_settings.js
diff --git a/web-ui/app/js/user_settings/ui/user_settings_box.js b/web-ui/public/js/user_settings/ui/user_settings_box.js
index d3de23ed..d3de23ed 100644
--- a/web-ui/app/js/user_settings/ui/user_settings_box.js
+++ b/web-ui/public/js/user_settings/ui/user_settings_box.js
diff --git a/web-ui/app/js/user_settings/ui/user_settings_icon.js b/web-ui/public/js/user_settings/ui/user_settings_icon.js
index a6385dc1..a6385dc1 100644
--- a/web-ui/app/js/user_settings/ui/user_settings_icon.js
+++ b/web-ui/public/js/user_settings/ui/user_settings_icon.js
diff --git a/web-ui/app/js/views/i18n.js b/web-ui/public/js/views/i18n.js
index 29a1beca..29a1beca 100644
--- a/web-ui/app/js/views/i18n.js
+++ b/web-ui/public/js/views/i18n.js
diff --git a/web-ui/app/js/views/recipientListFormatter.js b/web-ui/public/js/views/recipientListFormatter.js
index 0b887142..0b887142 100644
--- a/web-ui/app/js/views/recipientListFormatter.js
+++ b/web-ui/public/js/views/recipientListFormatter.js
diff --git a/web-ui/public/js/views/templates.js b/web-ui/public/js/views/templates.js
new file mode 100644
index 00000000..8792f8cb
--- /dev/null
+++ b/web-ui/public/js/views/templates.js
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2014 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define(['hbs/templates'], function (templates) {
+  'use strict';
+
+  var Templates = {
+    compose: {
+      box: window.Pixelated['public/templates/compose/compose_box.hbs'],
+      inlineBox: window.Pixelated['public/templates/compose/inline_box.hbs'],
+      replySection: window.Pixelated['public/templates/compose/reply_section.hbs'],
+      recipientInput: window.Pixelated['public/templates/compose/recipient_input.hbs'],
+      fixedRecipient: window.Pixelated['public/templates/compose/fixed_recipient.hbs'],
+      recipients: window.Pixelated['public/templates/compose/recipients.hbs'],
+      feedback: window.Pixelated['public/templates/compose/feedback_box.hbs'],
+      attachmentsList: window.Pixelated['public/templates/compose/attachments_list.hbs'],
+      attachmentItem: window.Pixelated['public/templates/compose/attachment_item.hbs'],
+      attachmentUploadItem: window.Pixelated['public/templates/compose/attachment_upload_item.hbs'],
+      uploadAttachmentFailed: window.Pixelated['public/templates/compose/upload_attachment_failed.hbs']
+    },
+    tags: {
+      tagList: window.Pixelated['public/templates/tags/tag_list.hbs'],
+      tag: window.Pixelated['public/templates/tags/tag.hbs'],
+      tagInner: window.Pixelated['public/templates/tags/tag_inner.hbs'],
+      shortcut: window.Pixelated['public/templates/tags/shortcut.hbs']
+    },
+    userAlerts: {
+      message: window.Pixelated['public/templates/user_alerts/message.hbs']
+    },
+    mails: {
+      single: window.Pixelated['public/templates/mails/single.hbs'],
+      fullView: window.Pixelated['public/templates/mails/full_view.hbs'],
+      mailActions: window.Pixelated['public/templates/mails/mail_actions.hbs'],
+      draft: window.Pixelated['public/templates/mails/draft.hbs'],
+      sent: window.Pixelated['public/templates/mails/sent.hbs'],
+      trash: window.Pixelated['public/templates/mails/trash.hbs']
+    },
+    mailActions: {
+      actionsBox: window.Pixelated['public/templates/mail_actions/actions_box.hbs'],
+      trashActionsBox: window.Pixelated['public/templates/mail_actions/trash_actions_box.hbs'],
+      composeTrigger: window.Pixelated['public/templates/mail_actions/compose_trigger.hbs'],
+      refreshTrigger: window.Pixelated['public/templates/mail_actions/refresh_trigger.hbs'],
+      paginationTrigger: window.Pixelated['public/templates/mail_actions/pagination_trigger.hbs']
+    },
+    noMessageSelected: window.Pixelated['public/templates/compose/no_message_selected.hbs'],
+    noMailsAvailable: window.Pixelated['public/templates/compose/no_mails_available.hbs'],
+    search: {
+      trigger: window.Pixelated['public/templates/search/search_trigger.hbs']
+    },
+    page: {
+      userSettingsIcon: window.Pixelated['public/templates/page/user_settings_icon.hbs'],
+      userSettingsBox: window.Pixelated['public/templates/page/user_settings_box.hbs'],
+      logout: window.Pixelated['public/templates/page/logout.hbs'],
+      logoutShortcut: window.Pixelated['public/templates/page/logout_shortcut.hbs'],
+      version: window.Pixelated['public/templates/page/version.hbs']
+    },
+    feedback: {
+      feedback: window.Pixelated['public/templates/feedback/feedback_trigger.hbs']
+    }
+  };
+
+  Handlebars.registerPartial('tag_inner', Templates.tags.tagInner);
+  Handlebars.registerPartial('recipients', Templates.compose.recipients);
+  Handlebars.registerPartial('attachments_list', Templates.compose.attachmentsList);
+  Handlebars.registerPartial('attachments_upload', Templates.compose.attachmentsList);
+  Handlebars.registerPartial('attachment_item', Templates.compose.attachmentItem);
+  Handlebars.registerPartial('attachment_upload_item', Templates.compose.attachmentUploadItem);
+  Handlebars.registerPartial('uploadAttachmentFailed', Templates.compose.uploadAttachmentFailed);
+
+  return Templates;
+});
diff --git a/web-ui/app/locales/en_US/translation.json b/web-ui/public/locales/en_US/translation.json
index 3e006156..3e006156 100644
--- a/web-ui/app/locales/en_US/translation.json
+++ b/web-ui/public/locales/en_US/translation.json
diff --git a/web-ui/app/locales/pt_BR/translation.json b/web-ui/public/locales/pt_BR/translation.json
index ff766a2b..ff766a2b 100644
--- a/web-ui/app/locales/pt_BR/translation.json
+++ b/web-ui/public/locales/pt_BR/translation.json
diff --git a/web-ui/app/locales/sv_SE/translation.json b/web-ui/public/locales/sv_SE/translation.json
index d4da0711..d4da0711 100644
--- a/web-ui/app/locales/sv_SE/translation.json
+++ b/web-ui/public/locales/sv_SE/translation.json
diff --git a/web-ui/app/robots.txt b/web-ui/public/robots.txt
index 6b0157e2..6b0157e2 100644
--- a/web-ui/app/robots.txt
+++ b/web-ui/public/robots.txt
diff --git a/web-ui/app/sandbox.html b/web-ui/public/sandbox.html
index 8325b0da..8325b0da 100644
--- a/web-ui/app/sandbox.html
+++ b/web-ui/public/sandbox.html
diff --git a/web-ui/app/scss/_mixins.scss b/web-ui/public/scss/_mixins.scss
index d3aa0220..d3aa0220 100644
--- a/web-ui/app/scss/_mixins.scss
+++ b/web-ui/public/scss/_mixins.scss
diff --git a/web-ui/app/scss/_others.scss b/web-ui/public/scss/_others.scss
index 039d94bd..039d94bd 100644
--- a/web-ui/app/scss/_others.scss
+++ b/web-ui/public/scss/_others.scss
diff --git a/web-ui/app/scss/base/_colors.scss b/web-ui/public/scss/base/_colors.scss
index 17333ff9..17333ff9 100644
--- a/web-ui/app/scss/base/_colors.scss
+++ b/web-ui/public/scss/base/_colors.scss
diff --git a/web-ui/app/scss/base/_fonts.scss b/web-ui/public/scss/base/_fonts.scss
index dfc56dd8..dfc56dd8 100644
--- a/web-ui/app/scss/base/_fonts.scss
+++ b/web-ui/public/scss/base/_fonts.scss
diff --git a/web-ui/app/scss/base/_scaffolding.scss b/web-ui/public/scss/base/_scaffolding.scss
index b8b5fa3b..b8b5fa3b 100644
--- a/web-ui/app/scss/base/_scaffolding.scss
+++ b/web-ui/public/scss/base/_scaffolding.scss
diff --git a/web-ui/app/scss/mixins/_position-helpers.scss b/web-ui/public/scss/mixins/_position-helpers.scss
index 254bfc6c..254bfc6c 100644
--- a/web-ui/app/scss/mixins/_position-helpers.scss
+++ b/web-ui/public/scss/mixins/_position-helpers.scss
diff --git a/web-ui/app/scss/mixins/_tags.scss b/web-ui/public/scss/mixins/_tags.scss
index 9bb287ea..9bb287ea 100644
--- a/web-ui/app/scss/mixins/_tags.scss
+++ b/web-ui/public/scss/mixins/_tags.scss
diff --git a/web-ui/app/scss/sandbox.scss b/web-ui/public/scss/sandbox.scss
index 3c1be358..3c1be358 100644
--- a/web-ui/app/scss/sandbox.scss
+++ b/web-ui/public/scss/sandbox.scss
diff --git a/web-ui/app/scss/style.scss b/web-ui/public/scss/style.scss
index e99ab194..e99ab194 100644
--- a/web-ui/app/scss/style.scss
+++ b/web-ui/public/scss/style.scss
diff --git a/web-ui/app/scss/templates/_no-content-placeholder.scss b/web-ui/public/scss/templates/_no-content-placeholder.scss
index c6807011..c6807011 100644
--- a/web-ui/app/scss/templates/_no-content-placeholder.scss
+++ b/web-ui/public/scss/templates/_no-content-placeholder.scss
diff --git a/web-ui/app/scss/templates/_unread-count.scss b/web-ui/public/scss/templates/_unread-count.scss
index f7852227..f7852227 100644
--- a/web-ui/app/scss/templates/_unread-count.scss
+++ b/web-ui/public/scss/templates/_unread-count.scss
diff --git a/web-ui/app/scss/vendor/_customfont.scss b/web-ui/public/scss/vendor/_customfont.scss
index d72cca0f..d72cca0f 100644
--- a/web-ui/app/scss/vendor/_customfont.scss
+++ b/web-ui/public/scss/vendor/_customfont.scss
diff --git a/web-ui/app/scss/vendor/_foundation.scss b/web-ui/public/scss/vendor/_foundation.scss
index 7918cf26..7918cf26 100644
--- a/web-ui/app/scss/vendor/_foundation.scss
+++ b/web-ui/public/scss/vendor/_foundation.scss
diff --git a/web-ui/app/scss/vendor/_reset.scss b/web-ui/public/scss/vendor/_reset.scss
index 55f8d054..55f8d054 100644
--- a/web-ui/app/scss/vendor/_reset.scss
+++ b/web-ui/public/scss/vendor/_reset.scss
diff --git a/web-ui/app/scss/vendor/_scut.scss b/web-ui/public/scss/vendor/_scut.scss
index 3e16fa65..3e16fa65 100644
--- a/web-ui/app/scss/vendor/_scut.scss
+++ b/web-ui/public/scss/vendor/_scut.scss
diff --git a/web-ui/app/scss/views/_action-bar.scss b/web-ui/public/scss/views/_action-bar.scss
index 40e677b0..40e677b0 100644
--- a/web-ui/app/scss/views/_action-bar.scss
+++ b/web-ui/public/scss/views/_action-bar.scss
diff --git a/web-ui/app/scss/views/_close-button.scss b/web-ui/public/scss/views/_close-button.scss
index 37171c18..37171c18 100644
--- a/web-ui/app/scss/views/_close-button.scss
+++ b/web-ui/public/scss/views/_close-button.scss
diff --git a/web-ui/app/scss/views/_compose-button.scss b/web-ui/public/scss/views/_compose-button.scss
index 81e0bb33..81e0bb33 100644
--- a/web-ui/app/scss/views/_compose-button.scss
+++ b/web-ui/public/scss/views/_compose-button.scss
diff --git a/web-ui/app/scss/views/_compose-view.scss b/web-ui/public/scss/views/_compose-view.scss
index 9e120357..9e120357 100644
--- a/web-ui/app/scss/views/_compose-view.scss
+++ b/web-ui/public/scss/views/_compose-view.scss
diff --git a/web-ui/app/scss/views/_mail-list.scss b/web-ui/public/scss/views/_mail-list.scss
index f5c4c60f..f5c4c60f 100644
--- a/web-ui/app/scss/views/_mail-list.scss
+++ b/web-ui/public/scss/views/_mail-list.scss
diff --git a/web-ui/app/scss/views/_message-panel.scss b/web-ui/public/scss/views/_message-panel.scss
index 4a0a7a6b..4a0a7a6b 100644
--- a/web-ui/app/scss/views/_message-panel.scss
+++ b/web-ui/public/scss/views/_message-panel.scss
diff --git a/web-ui/app/scss/views/_navigation.scss b/web-ui/public/scss/views/_navigation.scss
index 2c33a791..2c33a791 100644
--- a/web-ui/app/scss/views/_navigation.scss
+++ b/web-ui/public/scss/views/_navigation.scss
diff --git a/web-ui/app/scss/views/_no-mails-available.scss b/web-ui/public/scss/views/_no-mails-available.scss
index bf5d256a..bf5d256a 100644
--- a/web-ui/app/scss/views/_no-mails-available.scss
+++ b/web-ui/public/scss/views/_no-mails-available.scss
diff --git a/web-ui/app/scss/views/_no-message-selected.scss b/web-ui/public/scss/views/_no-message-selected.scss
index 0e367bf2..0e367bf2 100644
--- a/web-ui/app/scss/views/_no-message-selected.scss
+++ b/web-ui/public/scss/views/_no-message-selected.scss
diff --git a/web-ui/app/scss/views/_read-view.scss b/web-ui/public/scss/views/_read-view.scss
index f69d51a5..f69d51a5 100644
--- a/web-ui/app/scss/views/_read-view.scss
+++ b/web-ui/public/scss/views/_read-view.scss
diff --git a/web-ui/app/scss/views/_security-labels.scss b/web-ui/public/scss/views/_security-labels.scss
index ac966ded..ac966ded 100644
--- a/web-ui/app/scss/views/_security-labels.scss
+++ b/web-ui/public/scss/views/_security-labels.scss
diff --git a/web-ui/app/templates/compose/attachment_item.hbs b/web-ui/public/templates/compose/attachment_item.hbs
index 7a64f6f5..7a64f6f5 100644
--- a/web-ui/app/templates/compose/attachment_item.hbs
+++ b/web-ui/public/templates/compose/attachment_item.hbs
diff --git a/web-ui/app/templates/compose/attachment_upload_item.hbs b/web-ui/public/templates/compose/attachment_upload_item.hbs
index eb6c4ba6..eb6c4ba6 100644
--- a/web-ui/app/templates/compose/attachment_upload_item.hbs
+++ b/web-ui/public/templates/compose/attachment_upload_item.hbs
diff --git a/web-ui/app/templates/compose/attachments_list.hbs b/web-ui/public/templates/compose/attachments_list.hbs
index 6f34df9e..6f34df9e 100644
--- a/web-ui/app/templates/compose/attachments_list.hbs
+++ b/web-ui/public/templates/compose/attachments_list.hbs
diff --git a/web-ui/app/templates/compose/compose_box.hbs b/web-ui/public/templates/compose/compose_box.hbs
index fcfbeaaf..fcfbeaaf 100644
--- a/web-ui/app/templates/compose/compose_box.hbs
+++ b/web-ui/public/templates/compose/compose_box.hbs
diff --git a/web-ui/app/templates/compose/feedback_box.hbs b/web-ui/public/templates/compose/feedback_box.hbs
index 346a6192..346a6192 100644
--- a/web-ui/app/templates/compose/feedback_box.hbs
+++ b/web-ui/public/templates/compose/feedback_box.hbs
diff --git a/web-ui/app/templates/compose/fixed_recipient.hbs b/web-ui/public/templates/compose/fixed_recipient.hbs
index 8b01717c..8b01717c 100644
--- a/web-ui/app/templates/compose/fixed_recipient.hbs
+++ b/web-ui/public/templates/compose/fixed_recipient.hbs
diff --git a/web-ui/app/templates/compose/inline_box.hbs b/web-ui/public/templates/compose/inline_box.hbs
index c9c114ec..c9c114ec 100644
--- a/web-ui/app/templates/compose/inline_box.hbs
+++ b/web-ui/public/templates/compose/inline_box.hbs
diff --git a/web-ui/app/templates/compose/no_mails_available.hbs b/web-ui/public/templates/compose/no_mails_available.hbs
index c61152a4..c61152a4 100644
--- a/web-ui/app/templates/compose/no_mails_available.hbs
+++ b/web-ui/public/templates/compose/no_mails_available.hbs
diff --git a/web-ui/app/templates/compose/no_message_selected.hbs b/web-ui/public/templates/compose/no_message_selected.hbs
index 0b9beaf8..0b9beaf8 100644
--- a/web-ui/app/templates/compose/no_message_selected.hbs
+++ b/web-ui/public/templates/compose/no_message_selected.hbs
diff --git a/web-ui/app/templates/compose/recipient_input.hbs b/web-ui/public/templates/compose/recipient_input.hbs
index 9416f11f..9416f11f 100644
--- a/web-ui/app/templates/compose/recipient_input.hbs
+++ b/web-ui/public/templates/compose/recipient_input.hbs
diff --git a/web-ui/app/templates/compose/recipients.hbs b/web-ui/public/templates/compose/recipients.hbs
index 43aced1c..43aced1c 100644
--- a/web-ui/app/templates/compose/recipients.hbs
+++ b/web-ui/public/templates/compose/recipients.hbs
diff --git a/web-ui/app/templates/compose/reply_section.hbs b/web-ui/public/templates/compose/reply_section.hbs
index 45203d87..45203d87 100644
--- a/web-ui/app/templates/compose/reply_section.hbs
+++ b/web-ui/public/templates/compose/reply_section.hbs
diff --git a/web-ui/app/templates/compose/upload_attachment_failed.hbs b/web-ui/public/templates/compose/upload_attachment_failed.hbs
index dbb1437b..dbb1437b 100644
--- a/web-ui/app/templates/compose/upload_attachment_failed.hbs
+++ b/web-ui/public/templates/compose/upload_attachment_failed.hbs
diff --git a/web-ui/app/templates/feedback/feedback_trigger.hbs b/web-ui/public/templates/feedback/feedback_trigger.hbs
index 7f3f8ef1..7f3f8ef1 100644
--- a/web-ui/app/templates/feedback/feedback_trigger.hbs
+++ b/web-ui/public/templates/feedback/feedback_trigger.hbs
diff --git a/web-ui/app/templates/mail_actions/actions_box.hbs b/web-ui/public/templates/mail_actions/actions_box.hbs
index 68a8d0bf..68a8d0bf 100644
--- a/web-ui/app/templates/mail_actions/actions_box.hbs
+++ b/web-ui/public/templates/mail_actions/actions_box.hbs
diff --git a/web-ui/app/templates/mail_actions/compose_trigger.hbs b/web-ui/public/templates/mail_actions/compose_trigger.hbs
index 06f05fca..06f05fca 100644
--- a/web-ui/app/templates/mail_actions/compose_trigger.hbs
+++ b/web-ui/public/templates/mail_actions/compose_trigger.hbs
diff --git a/web-ui/app/templates/mail_actions/pagination_trigger.hbs b/web-ui/public/templates/mail_actions/pagination_trigger.hbs
index cbd8a089..cbd8a089 100644
--- a/web-ui/app/templates/mail_actions/pagination_trigger.hbs
+++ b/web-ui/public/templates/mail_actions/pagination_trigger.hbs
diff --git a/web-ui/app/templates/mail_actions/refresh_trigger.hbs b/web-ui/public/templates/mail_actions/refresh_trigger.hbs
index dffc7090..dffc7090 100644
--- a/web-ui/app/templates/mail_actions/refresh_trigger.hbs
+++ b/web-ui/public/templates/mail_actions/refresh_trigger.hbs
diff --git a/web-ui/app/templates/mail_actions/trash_actions_box.hbs b/web-ui/public/templates/mail_actions/trash_actions_box.hbs
index 4e0ec332..4e0ec332 100644
--- a/web-ui/app/templates/mail_actions/trash_actions_box.hbs
+++ b/web-ui/public/templates/mail_actions/trash_actions_box.hbs
diff --git a/web-ui/app/templates/mails/draft.hbs b/web-ui/public/templates/mails/draft.hbs
index 808ce3ff..808ce3ff 100644
--- a/web-ui/app/templates/mails/draft.hbs
+++ b/web-ui/public/templates/mails/draft.hbs
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/public/templates/mails/full_view.hbs
index 40bfd4a2..40bfd4a2 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/public/templates/mails/full_view.hbs
diff --git a/web-ui/app/templates/mails/mail_actions.hbs b/web-ui/public/templates/mails/mail_actions.hbs
index 0adfe853..0adfe853 100644
--- a/web-ui/app/templates/mails/mail_actions.hbs
+++ b/web-ui/public/templates/mails/mail_actions.hbs
diff --git a/web-ui/app/templates/mails/sent.hbs b/web-ui/public/templates/mails/sent.hbs
index 158b20c8..158b20c8 100644
--- a/web-ui/app/templates/mails/sent.hbs
+++ b/web-ui/public/templates/mails/sent.hbs
diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/public/templates/mails/single.hbs
index aaede844..aaede844 100644
--- a/web-ui/app/templates/mails/single.hbs
+++ b/web-ui/public/templates/mails/single.hbs
diff --git a/web-ui/app/templates/mails/trash.hbs b/web-ui/public/templates/mails/trash.hbs
index f8947b15..f8947b15 100644
--- a/web-ui/app/templates/mails/trash.hbs
+++ b/web-ui/public/templates/mails/trash.hbs
diff --git a/web-ui/app/templates/page/logout.hbs b/web-ui/public/templates/page/logout.hbs
index 0cc079bc..0cc079bc 100644
--- a/web-ui/app/templates/page/logout.hbs
+++ b/web-ui/public/templates/page/logout.hbs
diff --git a/web-ui/app/templates/page/logout_shortcut.hbs b/web-ui/public/templates/page/logout_shortcut.hbs
index 043ab0dc..043ab0dc 100644
--- a/web-ui/app/templates/page/logout_shortcut.hbs
+++ b/web-ui/public/templates/page/logout_shortcut.hbs
diff --git a/web-ui/app/templates/page/user_settings_box.hbs b/web-ui/public/templates/page/user_settings_box.hbs
index 2152b779..2152b779 100644
--- a/web-ui/app/templates/page/user_settings_box.hbs
+++ b/web-ui/public/templates/page/user_settings_box.hbs
diff --git a/web-ui/app/templates/page/user_settings_icon.hbs b/web-ui/public/templates/page/user_settings_icon.hbs
index 8f2f9215..8f2f9215 100644
--- a/web-ui/app/templates/page/user_settings_icon.hbs
+++ b/web-ui/public/templates/page/user_settings_icon.hbs
diff --git a/web-ui/app/templates/page/version.hbs b/web-ui/public/templates/page/version.hbs
index 5f43f78a..5f43f78a 100644
--- a/web-ui/app/templates/page/version.hbs
+++ b/web-ui/public/templates/page/version.hbs
diff --git a/web-ui/app/templates/search/search_trigger.hbs b/web-ui/public/templates/search/search_trigger.hbs
index 2261d154..2261d154 100644
--- a/web-ui/app/templates/search/search_trigger.hbs
+++ b/web-ui/public/templates/search/search_trigger.hbs
diff --git a/web-ui/app/templates/tags/shortcut.hbs b/web-ui/public/templates/tags/shortcut.hbs
index 1e82d6a9..1e82d6a9 100644
--- a/web-ui/app/templates/tags/shortcut.hbs
+++ b/web-ui/public/templates/tags/shortcut.hbs
diff --git a/web-ui/app/templates/tags/tag.hbs b/web-ui/public/templates/tags/tag.hbs
index ca397b9a..ca397b9a 100644
--- a/web-ui/app/templates/tags/tag.hbs
+++ b/web-ui/public/templates/tags/tag.hbs
diff --git a/web-ui/app/templates/tags/tag_inner.hbs b/web-ui/public/templates/tags/tag_inner.hbs
index 2e0958cb..2e0958cb 100644
--- a/web-ui/app/templates/tags/tag_inner.hbs
+++ b/web-ui/public/templates/tags/tag_inner.hbs
diff --git a/web-ui/app/templates/tags/tag_list.hbs b/web-ui/public/templates/tags/tag_list.hbs
index 92a73283..92a73283 100644
--- a/web-ui/app/templates/tags/tag_list.hbs
+++ b/web-ui/public/templates/tags/tag_list.hbs
diff --git a/web-ui/app/templates/user_alerts/message.hbs b/web-ui/public/templates/user_alerts/message.hbs
index abba1f91..abba1f91 100644
--- a/web-ui/app/templates/user_alerts/message.hbs
+++ b/web-ui/public/templates/user_alerts/message.hbs
diff --git a/web-ui/test/test-main.js b/web-ui/test/test-main.js
index 4396993f..ce76be9b 100644
--- a/web-ui/test/test-main.js
+++ b/web-ui/test/test-main.js
@@ -19,34 +19,34 @@ requirejs.config({
   baseUrl: '/base',
 
   paths: {
-    'page': 'app/js/page',
-    'js': 'app/js',
-    'lib': 'app/js/lib',
-    'hbs': 'app/js/generated/hbs',
-    'flight': 'app/bower_components/flight',
-    'DOMPurify': 'app/bower_components/DOMPurify/dist/purify.min',
-    'he': 'app/bower_components/he/he',
-    'views': 'app/js/views',
-    'helpers': 'app/js/helpers',
-    'feedback': 'app/js/feedback',
-    'tags': 'app/js/tags',
-    'mail_list': 'app/js/mail_list',
-    'mail_list_actions': 'app/js/mail_list_actions',
-    'user_alerts': 'app/js/user_alerts',
-    'mail_view': 'app/js/mail_view',
-    'dispatchers': 'app/js/dispatchers',
-    'mixins': 'app/js/mixins',
-    'services': 'app/js/services',
-    'search': 'app/js/search',
-    'monkey_patching': 'app/js/monkey_patching',
-    'i18next': 'app/bower_components/i18next/i18next',
-    'i18nextXHRBackend': 'app/bower_components/i18next-xhr-backend/i18nextXHRBackend',
-    'i18nextBrowserLanguageDetector': 'app/bower_components/i18next-browser-languagedetector/i18nextBrowserLanguageDetector',
-    'quoted-printable': 'app/bower_components/quoted-printable',
-    'utf8': 'app/bower_components/utf8',
+    'page': 'public/js/page',
+    'js': 'public/js',
+    'lib': 'public/js/lib',
+    'hbs': 'public/js/generated/hbs',
+    'flight': 'public/bower_components/flight',
+    'DOMPurify': 'public/bower_components/DOMPurify/dist/purify.min',
+    'he': 'public/bower_components/he/he',
+    'views': 'public/js/views',
+    'helpers': 'public/js/helpers',
+    'feedback': 'public/js/feedback',
+    'tags': 'public/js/tags',
+    'mail_list': 'public/js/mail_list',
+    'mail_list_actions': 'public/js/mail_list_actions',
+    'user_alerts': 'public/js/user_alerts',
+    'mail_view': 'public/js/mail_view',
+    'dispatchers': 'public/js/dispatchers',
+    'mixins': 'public/js/mixins',
+    'services': 'public/js/services',
+    'search': 'public/js/search',
+    'monkey_patching': 'public/js/monkey_patching',
+    'i18next': 'public/bower_components/i18next/i18next',
+    'i18nextXHRBackend': 'public/bower_components/i18next-xhr-backend/i18nextXHRBackend',
+    'i18nextBrowserLanguageDetector': 'public/bower_components/i18next-browser-languagedetector/i18nextBrowserLanguageDetector',
+    'quoted-printable': 'public/bower_components/quoted-printable',
+    'utf8': 'public/bower_components/utf8',
     'test': 'test',
     'features': 'test/features',
-    'user_settings': 'app/js/user_settings'
+    'user_settings': 'public/js/user_settings'
   },
 
   deps: tests,
@@ -73,7 +73,7 @@ requirejs.config({
       .init({
         lng: 'en_US',
         backend: {
-          loadPath: '/base/app/locales/en_US/translation.json'
+          loadPath: '/base/public/locales/en_US/translation.json'
         }
       });
       Handlebars.registerHelper('t', i18n.t);