diff --git a/.bowerrc b/.bowerrc
index ce4030ae..3c5e8c33 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory" : "app/vendor"
+  "directory" : "vendor"
 }
diff --git a/.gitignore b/.gitignore
index e71e87b6..71b48a51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 dist/
 node_modules/
 app/vendor
+vendor/
 config/main.coffee
 bower_components
 app/coffee/modules/locales/locale*.coffee
diff --git a/app/styles/components/loading-spinner.scss b/app/styles/components/loading-spinner.scss
new file mode 100644
index 00000000..b035d515
--- /dev/null
+++ b/app/styles/components/loading-spinner.scss
@@ -0,0 +1,3 @@
+.loading-spinner {
+    @extend %loading-spinner;
+}
diff --git a/app/styles/layout/animation.scss b/app/styles/core/animation.scss
similarity index 100%
rename from app/styles/layout/animation.scss
rename to app/styles/core/animation.scss
diff --git a/app/styles/layout/base.scss b/app/styles/core/base.scss
similarity index 100%
rename from app/styles/layout/base.scss
rename to app/styles/core/base.scss
diff --git a/app/styles/layout/elements.scss b/app/styles/core/elements.scss
similarity index 100%
rename from app/styles/layout/elements.scss
rename to app/styles/core/elements.scss
diff --git a/app/styles/layout/forms.scss b/app/styles/core/forms.scss
similarity index 100%
rename from app/styles/layout/forms.scss
rename to app/styles/core/forms.scss
diff --git a/app/styles/layout/reset.scss b/app/styles/core/reset.scss
similarity index 100%
rename from app/styles/layout/reset.scss
rename to app/styles/core/reset.scss
diff --git a/app/styles/layout/typography.scss b/app/styles/core/typography.scss
similarity index 99%
rename from app/styles/layout/typography.scss
rename to app/styles/core/typography.scss
index 5dae2378..67e91155 100755
--- a/app/styles/layout/typography.scss
+++ b/app/styles/core/typography.scss
@@ -20,6 +20,7 @@ h5,
 h6 {
     color: $blackish;
     font-weight: normal;
+    line-height: 1.5;
     a {
         font-weight: inherit;
     }
diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss
index 9440bf64..e1d484f5 100644
--- a/app/styles/dependencies/helpers.scss
+++ b/app/styles/dependencies/helpers.scss
@@ -80,7 +80,3 @@
     max-width: 1rem;
     transform-origin: 32 32;
 }
-
-.loading-spinner {
-    @extend %loading-spinner;
-}
diff --git a/gulpfile.js b/gulpfile.js
index 149d5d1c..cd04413e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -24,15 +24,15 @@ var gulp = require("gulp"),
     runSequence = require("run-sequence"),
     order = require("gulp-order"),
     print = require('gulp-print'),
-    del = require("del");
-
-var mainSass = require("./main-sass").files;
+    del = require("del"),
+    coffeelint = require('gulp-coffeelint');
 
 var paths = {};
 paths.app = "app/";
 paths.dist = "dist/";
 paths.tmp = "tmp/";
 paths.extras = "extras/";
+paths.vendor = "vendor/";
 
 paths.jade = [
     paths.app + "**/*.jade"
@@ -41,12 +41,13 @@ paths.jade = [
 paths.htmlPartials = [
     paths.tmp + "partials/**/*.html",
     paths.tmp + "plugins/**/*.html",
+    paths.tmp + "modules/**/*.html",
     "!" + paths.tmp + "partials/includes/**/*.html"
 ];
 
 paths.images = paths.app + "images/**/*";
 paths.svg = paths.app + "svg/**/*";
-paths.css = paths.app + "styles/vendor/*.css";
+paths.css_vendor = paths.app + "styles/vendor/*.css";
 paths.locales = paths.app + "locales/**/*.json";
 
 paths.sass = [
@@ -56,9 +57,30 @@ paths.sass = [
     "!" + paths.app + "/styles/extras/**/*.scss"
 ];
 
+paths.css = [
+    paths.tmp + "styles/**/*.css",
+    paths.tmp + "modules/**/*.css",
+    paths.tmp + "plugins/**/*.css"
+];
+
+paths.css_order = [
+    paths.tmp + "styles/vendor/*",
+    paths.tmp + "styles/core/reset.css",
+    paths.tmp + "styles/core/base.css",
+    paths.tmp + "styles/core/animation.css",
+    paths.tmp + "styles/core/typography.css",
+    paths.tmp + "styles/core/elements.css",
+    paths.tmp + "styles/core/forms.css",
+    paths.tmp + "styles/layout/*",
+    paths.tmp + "styles/components/*",
+    paths.tmp + "styles/modules/**/*.css",
+    paths.tmp + "modules/**/*.css",
+    paths.tmp + "styles/shame/*.css",
+    paths.tmp + "plugins/**/*.css"
+];
+
 paths.coffee = [
-    paths.app + "coffee/**/*.coffee",
-    paths.app + "plugins/**/*.coffee",
+    paths.app + "**/*.coffee",
     "!" + paths.app + "**/*.spec.coffee",
 ];
 
@@ -83,35 +105,37 @@ paths.coffee_order = [
     paths.app + "coffee/modules/resources/*.coffee",
     paths.app + "coffee/modules/user-settings/*.coffee",
     paths.app + "coffee/modules/integrations/*.coffee",
+    paths.app + "modules/**/*.module.coffee",
+    paths.app + "modules/**/*.coffee",
     paths.app + "plugins/*.coffee",
     paths.app + "plugins/**/*.coffee"
 ];
 
 paths.libs = [
-    paths.app + "vendor/jquery/dist/jquery.js",
-    paths.app + "vendor/lodash/dist/lodash.js",
-    paths.app + "vendor/emoticons/lib/emoticons.js",
-    paths.app + "vendor/underscore.string/lib/underscore.string.js",
-    paths.app + "vendor/angular/angular.js",
-    paths.app + "vendor/angular-route/angular-route.js",
-    paths.app + "vendor/angular-sanitize/angular-sanitize.js",
-    paths.app + "vendor/angular-animate/angular-animate.js",
-    paths.app + "vendor/angular-translate/angular-translate.js",
-    paths.app + "vendor/angular-translate-loader-static-files/angular-translate-loader-static-files.js",
-    paths.app + "vendor/i18next/i18next.js",
-    paths.app + "vendor/moment/min/moment-with-langs.js",
-    paths.app + "vendor/checksley/checksley.js",
-    paths.app + "vendor/pikaday/pikaday.js",
-    paths.app + "vendor/jquery-flot/jquery.flot.js",
-    paths.app + "vendor/jquery-flot/jquery.flot.pie.js",
-    paths.app + "vendor/jquery-flot/jquery.flot.time.js",
-    paths.app + "vendor/flot-axislabels/jquery.flot.axislabels.js",
-    paths.app + "vendor/flot.tooltip/js/jquery.flot.tooltip.js",
-    paths.app + "vendor/jquery-textcomplete/jquery.textcomplete.js",
-    paths.app + "vendor/markitup-1x/markitup/jquery.markitup.js",
-    paths.app + "vendor/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js",
-    paths.app + "vendor/raven-js/dist/raven.js",
-    paths.app + "vendor/l.js/l.js",
+    paths.vendor + "jquery/dist/jquery.js",
+    paths.vendor + "/lodash/dist/lodash.js",
+    paths.vendor + "emoticons/lib/emoticons.js",
+    paths.vendor + "underscore.string/lib/underscore.string.js",
+    paths.vendor + "angular/angular.js",
+    paths.vendor + "angular-route/angular-route.js",
+    paths.vendor + "angular-sanitize/angular-sanitize.js",
+    paths.vendor + "angular-animate/angular-animate.js",
+    paths.vendor + "angular-translate/angular-translate.js",
+    paths.vendor + "angular-translate-loader-static-files/angular-translate-loader-static-files.js",
+    paths.vendor + "i18next/i18next.js",
+    paths.vendor + "moment/min/moment-with-langs.js",
+    paths.vendor + "checksley/checksley.js",
+    paths.vendor + "pikaday/pikaday.js",
+    paths.vendor + "jquery-flot/jquery.flot.js",
+    paths.vendor + "jquery-flot/jquery.flot.pie.js",
+    paths.vendor + "jquery-flot/jquery.flot.time.js",
+    paths.vendor + "flot-axislabels/jquery.flot.axislabels.js",
+    paths.vendor + "flot.tooltip/js/jquery.flot.tooltip.js",
+    paths.vendor + "jquery-textcomplete/jquery.textcomplete.js",
+    paths.vendor + "markitup-1x/markitup/jquery.markitup.js",
+    paths.vendor + "malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js",
+    paths.vendor + "raven-js/dist/raven.js",
+    paths.vendor + "l.js/l.js",
     paths.app + "js/jquery.ui.git-custom.js",
     paths.app + "js/jquery-ui.drag-multiple-custom.js",
     paths.app + "js/jquery.ui.touch-punch.min.js",
@@ -205,7 +229,7 @@ gulp.task("sass-compile", ["scss-lint"], function() {
 });
 
 gulp.task("css-lint-app", function() {
-    return gulp.src(mainSass.concat([paths.tmp + "plugins/**/*.css"]))
+    return gulp.src(paths.css)
         .pipe(gulpif(!isDeploy, cache(csslint("csslintrc.json"), {
           success: function(csslintFile) {
             return csslintFile.csslint.success;
@@ -220,7 +244,8 @@ gulp.task("css-lint-app", function() {
 });
 
 gulp.task("css-join", ["css-lint-app"], function() {
-    return gulp.src(mainSass.concat([paths.tmp + "plugins/**/*.css"]))
+    return gulp.src(paths.css)
+        .pipe(order(paths.css_order, {base: '.'}))
         .pipe(concat("app.css"))
         .pipe(autoprefixer({
             cascade: false
@@ -233,7 +258,7 @@ gulp.task("css-app", function(cb) {
 });
 
 gulp.task("css-vendor", function() {
-    return gulp.src(paths.css)
+    return gulp.src(paths.css_vendor)
         .pipe(concat("vendor.css"))
         .pipe(gulp.dest(paths.tmp));
 });
@@ -272,7 +297,25 @@ gulp.task("locales", function() {
         .pipe(gulp.dest(paths.dist + "locales"));
 });
 
-gulp.task("coffee", function() {
+gulp.task("coffee-lint", function () {
+    gulp.src(paths.app + "modules/**/*.coffee")
+        .pipe(gulpif(!isDeploy, cache(coffeelint(), {
+            key: function(lintFile) {
+                return "coffee-lint" + lintFile.contents.toString('utf8');
+            },
+            success: function(lintFile) {
+                return lintFile.coffeelint.success;
+            },
+            value: function(lintFile) {
+                return {
+                    coffeelint: lintFile.coffeelint
+                };
+            }
+        })))
+        .pipe(coffeelint.reporter());
+});
+
+gulp.task("coffee", ["coffee-lint"], function() {
     return gulp.src(paths.coffee)
         .pipe(order(paths.coffee_order, {base: '.'}))
         .pipe(sourcemaps.init())
diff --git a/main-sass.js b/main-sass.js
deleted file mode 100644
index 7d46c751..00000000
--- a/main-sass.js
+++ /dev/null
@@ -1,163 +0,0 @@
-exports.files = function () {
-    var base = process.cwd() + "/tmp/styles/";
-
-    var files  = [
-        // Codehilite
-        'vendor/codehilite.github',
-
-        //#################################################
-        //             Layout
-        //#################################################
-
-        'layout/reset',
-        'layout/base',
-        'layout/animation',
-        'layout/typography',
-        'layout/login',
-        'layout/invitation',
-        'layout/elements',
-        'layout/forms',
-        'layout/not-found',
-        'layout/backlog',
-        'layout/taskboard',
-        'layout/us-detail',
-        'layout/admin-memberships',
-        'layout/admin-project-values',
-        'layout/project-colors',
-        'layout/kanban',
-        'layout/issues',
-        'layout/wiki',
-        'layout/wiki-edit',
-        'layout/team',
-
-        //#################################################
-        //             components
-        //#################################################
-
-        'components/buttons',
-        'components/avatar',
-        'components/summary',
-        'components/popover',
-        'components/tag',
-        'components/filter',
-        'components/taskboard-task',
-        'components/kanban-task',
-        'components/notification-message',
-        'components/basic-table',
-        'components/paginator',
-        'components/watchers',
-        'components/level',
-        'components/created-by',
-        'components/wysiwyg',
-        'components/select-color',
-        'components/loader',
-        'components/loading-bar',
-        'components/beta',
-        'components/markitup',
-        'components/markdown-help',
-        'components/popover-points',
-
-
-        //#################################################
-        //             Modules
-        //#################################################
-
-        //Common modules
-        'modules/common/assigned-to',
-        'modules/common/nav',
-        'modules/common/projects-nav',
-        'modules/common/lightbox',
-        'modules/common/colors-table',
-        'modules/common/category-config',
-        'modules/common/attachments',
-        'modules/common/related-tasks',
-        'modules/common/history',
-        'modules/common/wizard',
-        'modules/common/external-reference',
-        'modules/common/custom-fields',
-
-        //Project modules
-        'modules/home-projects-list',
-        'modules/home-project',
-        'modules/create-project',
-
-        //Issues modules
-        'modules/issues/issues-table',
-
-        //Kanban modules
-        'modules/kanban/kanban-table',
-
-        //Search modules
-        'modules/search/search-filter',
-        'modules/search/search-result-table',
-        'modules/search/search-in',
-
-        //Filters modules
-        'modules/filters/filters',
-        'modules/filters/list-filters',
-        'modules/filters/filter-tags',
-
-        //Backlog modules
-        'modules/backlog/sprints',
-        'modules/backlog/burndown',
-        'modules/backlog/backlog-table',
-        'modules/backlog/taskboard-table',
-
-        //Login modules
-        'modules/auth/login-form',
-        'modules/auth/register-form',
-        'modules/auth/forgot-form',
-        'modules/auth/change-password-from-recovery',
-        'modules/auth/cancel-account',
-        'modules/auth/change-email-form',
-
-        //Wiki modules
-        'modules/wiki/wiki-nav',
-        'modules/wiki/wiki-summary',
-
-        //modules admin
-        'modules/admin/admin-menu',
-        'modules/admin/admin-common',
-        'modules/admin/admin-submenu',
-        'modules/admin/admin-submenu-roles',
-        'modules/admin/admin-roles',
-        'modules/admin/admin-functionalities',
-        'modules/admin/admin-project-export',
-        'modules/admin/admin-membership-table',
-        'modules/admin/admin-project-profile',
-        'modules/admin/default-values',
-        'modules/admin/admin-custom-attributes',
-        'modules/admin/project-values',
-        'modules/admin/third-parties',
-        'modules/admin/admin-third-parties-webhooks',
-        'modules/admin/contrib',
-        'modules/admin/project-csv',
-
-        //Modules user Settings
-        'modules/user-settings/user-profile',
-        'modules/user-settings/user-change-password',
-        'modules/user-settings/mail-notifications-table',
-
-        //Team
-        'modules/team/team-filters',
-        'modules/team/team-table',
-
-        //#################################################
-        //             Help
-        //#################################################
-
-        'modules/help/lightbox-generic-notion',
-
-        //#################################################
-        //             Shame
-        //#################################################
-
-        'shame/shame',
-    ];
-
-    files = files.map(function (file) {
-        return base + file + ".css";
-    });
-
-    return files;
-}();
diff --git a/package.json b/package.json
index cf0b2529..46b73b46 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "gulp-cache": "^0.2.8",
     "gulp-cached": "1.0.2",
     "gulp-coffee": "^2.3.1",
-    "gulp-coffeelint": "~0.4.0",
+    "gulp-coffeelint": "^0.4.0",
     "gulp-concat": "^2.5.2",
     "gulp-csslint": "^0.1.5",
     "gulp-flatten": "0.0.4",