diff --git a/demo/pages/events.html b/demo/pages/events.html
index c5eb830..8df15f9 100644
--- a/demo/pages/events.html
+++ b/demo/pages/events.html
@@ -140,7 +140,7 @@
         { name: 'node:dblclick', args: ['Node'] },
         { name: 'node:selected', args: ['Node'] },
         { name: 'node:unselected', args: ['Node'] },
-        { name: 'node:checked', args: ['Node'] },
+        { name: 'node:checked', args: ['Node', 'Target Node'] },
         { name: 'node:unchecked', args: ['Node'] },
         { name: 'node:expanded', args: ['Node'] },
         { name: 'node:collapsed',  args: ['Node'] },
@@ -228,6 +228,7 @@
               )
 
               console.log(arguments)
+              console.log(node.text, newNode ? newNode.text : null)
             }
           }
         }
diff --git a/package.json b/package.json
index ec30ca2..c72f4f5 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "liquor-tree",
   "description": "A Vue.js tree component.",
-  "version": "0.2.68",
+  "version": "0.2.69",
   "author": "Kostiantyn <phlyze@gmail.com>",
   "library": "LiquorTree",
   "homepage": "https://amsik.github.io/liquor-tree/",
   "scripts": {
     "dev": "cross-env NODE_ENV=development rollup -w -c rollup.config.js",
-    "build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
+    "build": "cross-env NODE_ENV=production rollup -c rollup.config.js -- --environment BUILD:production",
     "lint": "eslint --fix src test",
     "test": "npm run lint && npm run unit",
     "unit": "jest",
@@ -26,12 +26,13 @@
     "vue-tree",
     "treeview"
   ],
-  "dependencies": {},
+  "license": "MIT",
   "files": [
     "src",
     "dist/*.js"
   ],
   "devDependencies": {
+    "@rollup/plugin-alias": "^2.2.0",
     "@storybook/addon-notes": "^3.4.11",
     "@storybook/addon-options": "^3.4.11",
     "@storybook/vue": "^3.4.11",
@@ -45,19 +46,20 @@
     "eslint-plugin-jest": "^21.22.1",
     "eslint-plugin-vue-libs": "^2.1.0",
     "jest": "^22.4.4",
-    "rollup": "^0.66.2",
-    "rollup-plugin-alias": "^1.4.0",
-    "rollup-plugin-buble": "^0.19.2",
-    "rollup-plugin-serve": "^0.4.2",
-    "rollup-plugin-uglify": "^3.0.0",
-    "rollup-plugin-vue": "^3.0.0",
-    "vue": "^2.5.17",
-    "vue-jest": "^2.6.0",
-    "vue-loader": "^14.2.3",
-    "vue-template-compiler": "^2.5.17"
+    "rollup": "^0.66.6",
+    "rollup-plugin-buble": "^0.19.8",
+    "rollup-plugin-serve": "^1.0.1",
+    "rollup-plugin-vue": "^4.6.0",
+    "rollup-plugin-uglify": "^6.0.3",
+    "vue": "^2.6.10",
+    "vue-jest": "^3.0.5",
+    "vue-loader": "^15.7.2",
+    "vue-template-compiler": "^2.6.10"
   },
   "jest": {
-    "setupFiles": ["./test/setupTests.js"],
+    "setupFiles": [
+      "./tests/setupTests.js"
+    ],
     "moduleFileExtensions": [
       "js",
       "vue"
diff --git a/rollup.config.js b/rollup.config.js
index 6e3141e..9147219 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,12 +1,10 @@
 import pkg from './package.json'
 import vue from 'rollup-plugin-vue'
 import buble from 'rollup-plugin-buble'
-import uglify from 'rollup-plugin-uglify'
-import alias from 'rollup-plugin-alias'
+import { uglify } from 'rollup-plugin-uglify'
+import alias from '@rollup/plugin-alias'
 import serve from 'rollup-plugin-serve'
 
-const path = require('path')
-
 const version = pkg.version
 const banner = `
 /*!
@@ -16,50 +14,56 @@ const banner = `
  */
 `
 
-const config = {
-  input: 'src/main.js',
-  output: [
-    {
-      file: pkg.module,
-      format: 'es',
-      sourcemap: true,
-      banner
-    }, {
-      file: pkg.main,
-      format: 'umd',
-      name: 'LiquorTree',
-      sourcemap: true,
-      banner
-    }
-  ],
-  cache: false,
-  plugins: [
-    alias({
-      resolve: ['.vue', '.js'],
-      '@': path.resolve(__dirname, './src')
-    }),
-    vue({ css: true }),
-    buble({ objectAssign: 'Object.assign' })
-  ]
+const plugins = [
+  alias({
+    resolve: ['.vue', '.js'],
+  }),
+  vue({ css: true }),
+  buble({ objectAssign: 'Object.assign' })
+]
+
+const outputES = {
+  file: pkg.module,
+  format: 'es',
+  sourcemap: true,
+  banner
 }
 
-if ('production' == process.env.NODE_ENV) {
-  config.output.forEach(c => (c.sourcemap = false))
-  config.plugins.push(uglify({
-    output: {
-      comments: function(node, comment) {
-          var text = comment.value;
-          var type = comment.type;
-          if (type == "comment2") {
-              return /license/i.test(text);
-          }
-      }
-    }
-  }))
+const outputUMD = {
+  file: pkg.main,
+  format: 'umd',
+  name: 'LiquorTree',
+  sourcemap: true,
+  banner
 }
 
+const config = [
+  {
+    input: 'src/main.js',
+    output: outputES,
+    cache: false,
+    plugins
+  },
+  {
+    input: 'src/main.js',
+    output: outputUMD,
+    cache: false,
+    plugins: plugins.concat('production' !== process.env.NODE_ENV ? [] : uglify({
+      output: {
+        comments: function(node, comment) {
+            var text = comment.value;
+            var type = comment.type;
+            if (type == "comment2") {
+                return /license/i.test(text);
+            }
+        }
+      }
+    }))
+  },
+]
+
 if ('development' == process.env.NODE_ENV) {
-  config.plugins.push(serve({
+  config[0].plugins.push(serve({
     contentBase: ['dist', 'demo'],
     port: 8081,
     open: true
diff --git a/src/components/NodeContent.js b/src/components/NodeContent.js
deleted file mode 100644
index 3ca4b79..0000000
--- a/src/components/NodeContent.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const NodeContent = {
-  name: 'node-content',
-  props: ['node'],
-  render (h) {
-    const node = this.node
-    const vm = this.node.tree.vm
-
-    if (node.isEditing) {
-      let nodeText = node.text
-
-      this.$nextTick(_ => {
-        this.$refs.editCtrl.focus()
-      })
-
-      return h('input', {
-        domProps: {
-          value: node.text,
-          type: 'text'
-        },
-        class: 'tree-input',
-        on: {
-          input (e) {
-            nodeText = e.target.value
-          },
-          blur () {
-            node.stopEditing(nodeText)
-          },
-          keyup (e) {
-            if (e.keyCode === 13) {
-              node.stopEditing(nodeText)
-            }
-          },
-          mouseup (e) {
-            e.stopPropagation()
-          }
-        },
-        ref: 'editCtrl'
-      })
-    }
-
-    if (vm.$scopedSlots.default) {
-      return vm.$scopedSlots.default({ node: this.node })
-    }
-
-    return h('span', {
-      domProps: {
-        innerHTML: node.text
-      }
-    })
-  }
-}
-
-export default NodeContent
diff --git a/src/components/NodeContent.vue b/src/components/NodeContent.vue
new file mode 100644
index 0000000..6d3a94e
--- /dev/null
+++ b/src/components/NodeContent.vue
@@ -0,0 +1,55 @@
+<script>
+  const NodeContent = {
+    name: 'node-content',
+    props: ['node'],
+    render (h) {
+      const node = this.node
+      const vm = this.node.tree.vm
+
+      if (node.isEditing) {
+        let nodeText = node.text
+
+        this.$nextTick(_ => {
+          this.$refs.editCtrl.focus()
+        })
+
+        return h('input', {
+          domProps: {
+            value: node.text,
+            type: 'text'
+          },
+          class: 'tree-input',
+          on: {
+            input (e) {
+              nodeText = e.target.value
+            },
+            blur () {
+              node.stopEditing(nodeText)
+            },
+            keyup (e) {
+              if (e.keyCode === 13) {
+                node.stopEditing(nodeText)
+              }
+            },
+            mouseup (e) {
+              e.stopPropagation()
+            }
+          },
+          ref: 'editCtrl'
+        })
+      }
+
+      if (vm.$scopedSlots.default) {
+        return vm.$scopedSlots.default({ node: this.node })
+      }
+
+      return h('span', {
+        domProps: {
+          innerHTML: node.text
+        }
+      })
+    }
+  }
+
+  export default NodeContent
+</script>
\ No newline at end of file
diff --git a/src/components/TreeNode.vue b/src/components/TreeNode.vue
index 1d6e821..2c1c091 100644
--- a/src/components/TreeNode.vue
+++ b/src/components/TreeNode.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-  import NodeContent from '@/components/NodeContent'
+  import NodeContent from './NodeContent.vue'
 
   const TreeNode = {
     name: 'Node',
diff --git a/src/components/TreeRoot.vue b/src/components/TreeRoot.vue
index e0d9edc..b70d0aa 100644
--- a/src/components/TreeRoot.vue
+++ b/src/components/TreeRoot.vue
@@ -33,11 +33,11 @@
 </template>
 
 <script>
-  import TreeNode from '@/components/TreeNode'
-  import DraggableNode from '@/components/DraggableNode'
-  import TreeMixin from '@/mixins/TreeMixin'
-  import TreeDnd from '@/mixins/DndMixin'
-  import Tree from '@/lib/Tree'
+  import TreeNode from './TreeNode.vue'
+  import DraggableNode from './DraggableNode.vue'
+  import TreeMixin from '../mixins/TreeMixin.js'
+  import TreeDnd from '../mixins/DndMixin.js'
+  import Tree from '../lib/Tree.js'
 
   const defaults = {
     direction: 'ltr',
@@ -74,7 +74,7 @@
     },
     plainList: false,
     showChildren: true
-  }
+  };
 
   export default {
     name: 'Tree',
diff --git a/src/lib/Node.js b/src/lib/Node.js
index 00f2d10..fc0c99a 100644
--- a/src/lib/Node.js
+++ b/src/lib/Node.js
@@ -1,7 +1,7 @@
-import { recurseDown } from '@/utils/recurse'
-import find from '@/utils/find'
-import uuidV4 from '@/utils/uuidV4'
-import Selection from '@/lib/Selection'
+import { recurseDown } from '../utils/recurse'
+import find from '../utils/find'
+import uuidV4 from '../utils/uuidV4'
+import Selection from '../lib/Selection'
 
 export default class Node {
   constructor (tree, item) {
@@ -223,6 +223,7 @@ export default class Node {
     }
 
     const checkDisabledChildren = this.tree.options.checkDisabledChildren
+    const targetNode = this
 
     if (this.tree.options.autoCheckChildren) {
       this.recurseDown(node => {
@@ -236,7 +237,7 @@ export default class Node {
           this.tree.check(node)
 
           node.state('checked', true)
-          node.$emit('checked')
+          node.$emit('checked', node.id === targetNode.id ? undefined : targetNode)
         }
       })
 
@@ -258,6 +259,8 @@ export default class Node {
       return this
     }
 
+    const targetNode = this
+
     if (this.tree.options.autoCheckChildren) {
       this.recurseDown(node => {
         node.state('indeterminate', false)
@@ -266,7 +269,7 @@ export default class Node {
           this.tree.uncheck(node)
 
           node.state('checked', false)
-          node.$emit('unchecked')
+          node.$emit('unchecked', node.id === targetNode.id ? undefined : targetNode)
         }
       })
 
diff --git a/src/lib/Tree.js b/src/lib/Tree.js
index 51ab97b..5a36253 100644
--- a/src/lib/Tree.js
+++ b/src/lib/Tree.js
@@ -1,14 +1,14 @@
-import Node from '@/lib/Node'
-import Selection from '@/lib/Selection'
-
-import find from '@/utils/find'
-import objectToNode from '@/utils/objectToNode'
-import { List } from '@/utils/stack'
-import { TreeParser } from '@/utils/treeParser'
-import { recurseDown } from '@/utils/recurse'
-import { get, createTemplate } from '@/utils/request'
-import sort from '@/utils/sort'
-import fetchDelay from '@/utils/fetchDelay'
+import Node from '../lib/Node'
+import Selection from '../lib/Selection'
+
+import find from '../utils/find'
+import objectToNode from '../utils/objectToNode'
+import { List } from '../utils/stack'
+import { TreeParser } from '../utils/treeParser'
+import { recurseDown } from '../utils/recurse'
+import { get, createTemplate } from '../utils/request'
+import sort from '../utils/sort'
+import fetchDelay from '../utils/fetchDelay'
 
 export default class Tree {
   constructor (vm) {
diff --git a/src/main.js b/src/main.js
index 84fc0d6..d67c7fa 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,4 @@
-import TreeRoot from '@/components/TreeRoot'
+import TreeRoot from './components/TreeRoot.vue'
 
 const install = Vue => {
   Vue.component(TreeRoot.name, TreeRoot)
diff --git a/src/mixins/TreeMixin.js b/src/mixins/TreeMixin.js
index 5fea97f..8872ccc 100644
--- a/src/mixins/TreeMixin.js
+++ b/src/mixins/TreeMixin.js
@@ -1,6 +1,6 @@
-import Tree from '@/lib/Tree'
-import initKeyboardNavigation from '@/utils/keyboardNavigation'
-import assert from '@/utils/assert'
+import Tree from '../lib/Tree'
+import initKeyboardNavigation from '../utils/keyboardNavigation'
+import assert from '../utils/assert'
 
 function initEvents (vm) {
   const { multiple, checkbox } = vm.opts
diff --git a/src/utils/objectToNode.js b/src/utils/objectToNode.js
index 75584e1..af4d12b 100644
--- a/src/utils/objectToNode.js
+++ b/src/utils/objectToNode.js
@@ -1,5 +1,5 @@
-import Node from '@/lib/Node'
-import uuidV4 from '@/utils/uuidV4'
+import Node from '../lib/Node'
+import uuidV4 from '../utils/uuidV4'
 
 /**
 * Default Node's states
diff --git a/src/utils/treeParser.js b/src/utils/treeParser.js
index c41efbc..a5e4c92 100644
--- a/src/utils/treeParser.js
+++ b/src/utils/treeParser.js
@@ -1,4 +1,4 @@
-import objectToNode from '@/utils/objectToNode'
+import objectToNode from '../utils/objectToNode'
 
 /**
   Every Node has certain format:
diff --git a/test/lib/Node.spec.js b/tests/lib/Node.spec.js
similarity index 97%
rename from test/lib/Node.spec.js
rename to tests/lib/Node.spec.js
index 509a0ee..cb6d1f4 100644
--- a/test/lib/Node.spec.js
+++ b/tests/lib/Node.spec.js
@@ -1,9 +1,9 @@
 import Vue from 'vue'
 
-import Node from '@/lib/Node'
-import Tree from '@/lib/Tree'
+import Node from '../../src/lib/Node.js'
+import Tree from '../../src/lib/Tree.js'
 
-import objectToNode from '@/utils/objectToNode'
+import objectToNode from '../../src/utils/objectToNode.js'
 
 const vm = new Vue()
 vm.opts = {}
diff --git a/test/setupTests.js b/tests/setupTests.js
similarity index 100%
rename from test/setupTests.js
rename to tests/setupTests.js
diff --git a/test/utils/objectToNode.spec.js b/tests/utils/objectToNode.spec.js
similarity index 95%
rename from test/utils/objectToNode.spec.js
rename to tests/utils/objectToNode.spec.js
index 751d227..2c5227c 100644
--- a/test/utils/objectToNode.spec.js
+++ b/tests/utils/objectToNode.spec.js
@@ -1,5 +1,5 @@
-import objectToNode from '@/utils/objectToNode'
-import Node from '@/lib/Node'
+import objectToNode from '../../src/utils/objectToNode.js'
+import Node from '../../src/lib/Node.js'
 
 const nodeStates = {
   selected: false,
diff --git a/test/utils/stack.spec.js b/tests/utils/stack.spec.js
similarity index 92%
rename from test/utils/stack.spec.js
rename to tests/utils/stack.spec.js
index 4d2d031..5ae8b77 100644
--- a/test/utils/stack.spec.js
+++ b/tests/utils/stack.spec.js
@@ -1,4 +1,4 @@
-import { List } from '@/utils/stack'
+import { List } from '../../src/utils/stack.js'
 
 describe('utils: stack', () => {
   it('init', () => {