diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index cc0fb44..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,42 +0,0 @@
-#Change log
-
-##3.1.15 - 2017-04-24
-- Add static blocks
-- Refactor shortcode
-
-##3.1.13 - 2017-04-23
-- Fix bugs
-- Improve layouts
-- Show language bar on login page
-- Show form actions fixed top on pages, blog.
-
-##3.1.12 - 2017-04-20
-- Fix bugs
-- Done the default theme.
-- Refactor 
-
-##3.1.9
-- Fix bugs
-- Make default theme.
-- Move custom fields as core dependency.
-
-##3.0.10 - 2017-03-13
-- Fix bugs
-- Add command theme:make:action, command, controller, criteria, datatable, facade, middleware, models, provider, repository, request, service, support, view
-- Group the cache key
-- Refactor
-
-##3.0.8 - 2017-02-24
-- Fix bugs
-- Refactor criterias
-- Refactor repository caching
-
-##3.0.2 - 2017-02-11
-- Set auth configs globally
-- Use '--force' publish data when install themes
-- Refactor the menu renderer
-
-##3.0 - 2017-01-28
-- Remove query builder in repository. For the complex queries, use **Criteria** instead.
-- Fix bugs core
-- Refactor
\ No newline at end of file
diff --git a/README.md b/README.md
index 56e2342..a58c8c9 100644
--- a/README.md
+++ b/README.md
@@ -35,22 +35,10 @@ Please go to [laravel documentation page](https://laravel.com/docs/5.4/installat
 
 ## WebEd installation guide
 
-#### Method 1: Install directly
 ```
 composer create-project --prefer-dist sgsoft-studio/webed webed
 ```
 
-#### Method 2: Add WebEd to your Laravel project
-```
-composer require sgsoft-studio/base:3.1.*
-```
-- Register the WebEd provider to **config/app.php**
-```
-WebEd\Base\Providers\ModuleProvider::class,
-```
-- After that, remove the default Laravel migrations (create_users_table, create_password_resets_table)
-- Modify the database information in **.env**
-
 ### Then
 ```
 composer dump-autoload
@@ -90,14 +78,12 @@ helper. Try to run **composer dump-autoload** by yourself.
 ## Plugins
 Download the plugins and places it at **/plugins** folder.
 
-[Plugins list](https://github.com/webed-plugins/readme)
-These plugins still not compatible with WebEd 3.1. I'm working on them.
+[Plugins list](https://github.com/webed-plugins)
+All plugins with released version is `3.1.*` will stable with WebEd 3.1.
 
 ## Themes
 Download the themes and places it at **/themes** folder.
 
-[Themes list](https://github.com/webed-themes/readme)
-
 ## Table of contents
 - [WebEd module commands](./documentation/console/module.md)
 - [WebEd theme commands](./documentation/console/theme.md)
diff --git a/gulpfile.js b/gulpfile.js
index 743f715..41094c9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,17 +18,17 @@ const publicPath = 'public/';
 
 elixir((mix) => {
     mix
-        /*Core stylesheets*/
-        .sass('./core/assets-management/resources/assets/sass/style.scss', publicPath + 'admin/css')
-        .sass('./core/assets-management/resources/assets/sass/admin-bar.scss', publicPath + 'admin/css')
+    /*Core stylesheets*/
+        .sass('./core/base/resources/assets/sass/style.scss', publicPath + 'admin/css')
+        .sass('./core/base/resources/assets/sass/admin-bar.scss', publicPath + 'admin/css')
 
         /*Core scripts*/
-        .rollup('./core/assets-management/resources/assets/js/webed-core.js', publicPath + 'admin/js')
-        .rollup('./core/assets-management/resources/assets/js/script.js', publicPath + 'admin/js')
+        .rollup('./core/base/resources/assets/js/webed-core.js', publicPath + 'admin/js')
+        .rollup('./core/base/resources/assets/js/script.js', publicPath + 'admin/js')
 
         /*Datatables*/
-        .rollup('./core/assets-management/resources/assets/js/Components/DataTables/DataTable.js', publicPath + 'admin/modules/datatables/webed.datatable.js')
-        .rollup('./core/assets-management/resources/assets/js/Components/DataTables/DataTableAjax.js', publicPath + 'admin/modules/datatables/webed.datatable.ajax.js')
+        .rollup('./core/base/resources/assets/js/Components/DataTables/DataTable.js', publicPath + 'admin/modules/datatables/webed.datatable.js')
+        .rollup('./core/base/resources/assets/js/Components/DataTables/DataTableAjax.js', publicPath + 'admin/modules/datatables/webed.datatable.ajax.js')
 
         .copy('./' + publicPath + 'admin/modules/auth', 'core/base/resources/public/admin/modules/auth')
         .copy('./' + publicPath + 'admin/modules/datatables', 'core/base/resources/public/admin/modules/datatables')
@@ -43,6 +43,7 @@ elixir((mix) => {
         /*Custom fields*/
         .sass('./core/custom-fields/resources/assets/sass/admin/modules/custom-fields/edit-field-group.scss', publicPath + 'admin/modules/custom-fields')
         .rollup('./core/custom-fields/resources/assets/js/admin/modules/custom-fields/edit-field-group.js', publicPath + 'admin/modules/custom-fields')
+        .rollup('./core/custom-fields/resources/assets/js/admin/modules/custom-fields/import-field-group.js', publicPath + 'admin/modules/custom-fields')
         .rollup('./core/custom-fields/resources/assets/js/admin/modules/custom-fields/use-custom-fields.js', publicPath + 'admin/modules/custom-fields')
         .copy('./' + publicPath + 'admin/modules/custom-fields', 'core/custom-fields/resources/public/admin/modules/custom-fields')
     ;