diff --git a/grunt/aliases.js b/grunt/aliases.js
index df166d70c..5835eae0c 100644
--- a/grunt/aliases.js
+++ b/grunt/aliases.js
@@ -53,10 +53,10 @@ module.exports = function (grunt, options) {
   var currentTag = semver.clean( util.getCurrentTag() );
 
   if (currentTag) {
-    baseTasks['release'] = ['clean', 'build', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
+    baseTasks['release'] = ['cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
   }
   else {
-    baseTasks['release'] = ['clean', 'build', 'cut-release'];
+    baseTasks['release'] = ['cut-release'];
   }
 
   return baseTasks;
diff --git a/grunt/copy.js b/grunt/copy.js
index 1b020e8f2..c58fc955a 100644
--- a/grunt/copy.js
+++ b/grunt/copy.js
@@ -17,7 +17,7 @@ module.exports = function ( grunt ) {
 
     packages.forEach(function(feat) {
       let featModuleName = '.' + _.camelCase(feat);
-      let featMainPath = `./js/${package.name}.${feat}`;
+      let featMainPath = `./dist/${package.name}.${feat}`;
 
       switch(feat) {
         case 'cellnav':
@@ -185,7 +185,7 @@ module.exports = function ( grunt ) {
           expand: true,
           flatten: true,
           cwd: 'packages',
-          src: '*/js/*.js',
+          src: '*/dist/*.js',
           dest: '<%= dist %>/release',
           filter: function(filepath) {
             return !filepath.includes('packages/i18n')
@@ -195,7 +195,7 @@ module.exports = function ( grunt ) {
           expand: true,
           flatten: true,
           cwd: 'packages',
-          src: '*/js/*.js',
+          src: '*/i18n/dist/*.js',
           dest: '<%= dist %>/release/i18n',
           filter: 'isFile'
         },
@@ -203,7 +203,7 @@ module.exports = function ( grunt ) {
           expand: true,
           flatten: true,
           cwd: 'packages',
-          src: '*/css/*.css',
+          src: '*/dist/*.css',
           dest: '<%= dist %>/release/css',
           filter: 'isFile'
         }
diff --git a/lib/webpack/webpack.common.js b/lib/webpack/webpack.common.js
index 177f6d00a..cae3a3943 100644
--- a/lib/webpack/webpack.common.js
+++ b/lib/webpack/webpack.common.js
@@ -7,9 +7,9 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const {bannerLoader, terser} = require('./webpack.utils');
 
 module.exports = (dir, name, hasCss = false) => {
-  const packageName = name.replace('@ui-grid/', '')
+  const packageName = _.camelCase(name.replace('@ui-grid/', ''))
   const mainJs = './src/index.js';
-  const entry = hasCss ? [mainJs, `./less/${_.camelCase(packageName)}.less`] : [mainJs];
+  const entry = hasCss ? [mainJs, `./less/${packageName}.less`] : [mainJs];
   const htmlLoader = {
     test: /\.html$/i,
     include: path.resolve(dir, 'src'),
diff --git a/package.json b/package.json
index 4e390a245..18c6d9fb9 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,9 @@
   "main": "./index.js",
   "scripts": {
     "bootstrap": "lerna bootstrap",
-    "build": "grunt build",
     "pre-build": "grunt clean",
-    "build-dx": "npm run pre-build && webpack && npm run less && lerna run build",
+    "build": "npm run pre-build && webpack && npm run less && lerna run build && npm run post-build",
+    "post-build": "grunt uidocs-generator copy:site copy:font_dist copy:less_customizer copy:less_dist copy:packages_dist copy:packages_publish",
     "less": "npm run less-main && npm run less-min",
     "less-main": "lessc -rp=\"../\" ./lib/less/main.less dist/release/css/ui-grid.css",
     "less-min": "lessc -rp=\"../\" --compress -x ./lib/less/main.less dist/release/css/ui-grid.min.css",
@@ -23,6 +23,7 @@
     "lerna": "lerna",
     "lint": "eslint packages/*/src/**/*.js packages/*/test/**/*.spec.js test/**/*.spec.js",
     "postinstall": "bower install",
+    "pre-release": "grunt release",
     "release": "lerna publish from-package",
     "start": "grunt dev --fast",
     "test": "grunt test",