diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -19,7 +19,7 @@ module.exports = function(grunt) {
       },
       dist: {
         files: {
-          'main.scss': [{last: 'global/_global.scss', path: 'global/*'}, 'mixins/*']
+          'main.scss': ['base/*', {last: 'global/_global.scss', path: 'global/*'}, 'helpers/*', 'modules/*']
         }
       }
     },
diff --git a/tasks/sass-import.js b/tasks/sass-import.js
index <HASH>..<HASH> 100644
--- a/tasks/sass-import.js
+++ b/tasks/sass-import.js
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
         }
 
         resultFiles.forEach(function (file) {
-          output += buildOutputLine(file);
+          output += buildOutputLine(file.replace(options.basePath, ''));
         });
       });
Removed basePath from import statement