diff --git a/assets/build/webpack.dev.conf.js b/assets/build/webpack.dev.conf.js
index 71269886..ce961a9f 100644
--- a/assets/build/webpack.dev.conf.js
+++ b/assets/build/webpack.dev.conf.js
@@ -20,7 +20,7 @@ module.exports = merge(baseWebpackConfig, {
   },
   devtool: '#cheap-module-eval-source-map',
   output: {
-    path: config.dev.assetsRoot,
+    path: config.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
     chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
   },
@@ -38,7 +38,7 @@ module.exports = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      filename: config.dev.index,
+      filename: config.index,
       template: 'assets/index.html',
       inject: true,
       // necessary to consistently work with multiple chunks via CommonsChunkPlugin
diff --git a/assets/src/components/Editor.vue b/assets/src/components/Editor.vue
index 36914a77..dcfbca19 100644
--- a/assets/src/components/Editor.vue
+++ b/assets/src/components/Editor.vue
@@ -10,7 +10,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import CodeMirror from '@/codemirror'
+import CodeMirror from '@/utils/codemirror'
 
 export default {
   name: 'editor',
diff --git a/assets/src/main.js b/assets/src/main.js
index a11959f7..47008899 100644
--- a/assets/src/main.js
+++ b/assets/src/main.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import App from './App'
-import store from './store/store'
+import store from './store'
 import router from './router'
 
 Vue.config.productionTip = true
diff --git a/assets/src/store/store.js b/assets/src/store/index.js
similarity index 100%
rename from assets/src/store/store.js
rename to assets/src/store/index.js
diff --git a/assets/src/utils/api.js b/assets/src/utils/api.js
index 3ce44856..b20c67b5 100644
--- a/assets/src/utils/api.js
+++ b/assets/src/utils/api.js
@@ -1,4 +1,4 @@
-import store from '../store/store'
+import store from '@/store'
 
 const ssl = (window.location.protocol === 'https:')
 
diff --git a/assets/src/utils/auth.js b/assets/src/utils/auth.js
index 9906e6ae..3fc6d0b7 100644
--- a/assets/src/utils/auth.js
+++ b/assets/src/utils/auth.js
@@ -1,5 +1,5 @@
 import cookie from './cookie'
-import store from '@/store/store'
+import store from '@/store'
 import router from '@/router'
 
 function parseToken (token) {
diff --git a/assets/src/codemirror/index.js b/assets/src/utils/codemirror.js
similarity index 98%
rename from assets/src/codemirror/index.js
rename to assets/src/utils/codemirror.js
index d7cb4901..e40ba58c 100644
--- a/assets/src/codemirror/index.js
+++ b/assets/src/utils/codemirror.js
@@ -1,7 +1,7 @@
 // Most of the code from this file comes from:
 // https://github.com/codemirror/CodeMirror/blob/master/addon/mode/loadmode.js
 import * as CodeMirror from 'codemirror'
-import store from '@/store/store'
+import store from '@/store'
 
 // Make CodeMirror available globally so the modes' can register themselves.
 window.CodeMirror = CodeMirror