diff --git a/.bowerrc b/.bowerrc
index 191ca7c920..2e479a15eb 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,5 +1,5 @@
 {
-  "directory": "public/system/lib",
+  "directory": "public/lib",
   "storage": {
           "packages": ".bower-cache",
           "registry": ".bower-registry"
diff --git a/.gitignore b/.gitignore
index e084bc5066..ea6507e3da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 .idea/
 nbproject/
 node_modules/
-public/system/lib
+public/lib
 mean.iml
 test/coverage/
 modules/public/
diff --git a/Gruntfile.js b/Gruntfile.js
index 18e379937d..cb2e5a84b1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,9 @@
 'use strict';
 
 var paths = {
-    js: ['*.js', 'server/**/*.js', 'public/**/*.js', 'test/**/*.js', '!test/coverage/**', '!public/system/lib/**', 'packages/**/*.js', '!packages/**/node_modules/**'],
+    js: ['*.js', 'server/**/*.js', 'public/**/*.js', 'test/**/*.js', '!test/coverage/**', '!public/lib/**', 'packages/**/*.js', '!packages/**/node_modules/**'],
     html: ['public/**/views/**', 'server/views/**', 'packages/**/public/**/views/**', 'packages/**/server/views/**'],
-    css: ['public/**/css/*.css', '!public/system/lib/**', 'packages/**/public/**/css/*.css']
+    css: ['public/**/css/*.css', '!public/lib/**', 'packages/**/public/**/css/*.css']
 };
 
 module.exports = function(grunt) {
diff --git a/config/assets.json b/config/assets.json
index cc6d252bc8..fe18cb4497 100644
--- a/config/assets.json
+++ b/config/assets.json
@@ -7,14 +7,14 @@
         },
         "js": {
             "public/build/js/dist.min.js": [
-                "public/system/lib/jquery/dist/jquery.min.js",
-                "public/system/lib/angular/angular.js",
-                "public/system/lib/angular-mocks/angular-mocks.js",
-                "public/system/lib/angular-cookies/angular-cookies.js",
-                "public/system/lib/angular-resource/angular-resource.js",
-                "public/system/lib/angular-ui-router/release/angular-ui-router.js",
-                "public/system/lib/angular-bootstrap/ui-bootstrap.js",
-                "public/system/lib/angular-bootstrap/ui-bootstrap-tpls.js",
+                "public/lib/jquery/dist/jquery.min.js",
+                "public/lib/angular/angular.js",
+                "public/lib/angular-mocks/angular-mocks.js",
+                "public/lib/angular-cookies/angular-cookies.js",
+                "public/lib/angular-resource/angular-resource.js",
+                "public/lib/angular-ui-router/release/angular-ui-router.js",
+                "public/lib/angular-bootstrap/ui-bootstrap.js",
+                "public/lib/angular-bootstrap/ui-bootstrap-tpls.js",
                 "public/init.js",
                 "public/*/*.js",
                 "public/*/{controllers,routes,services}/*.js"