diff --git a/packages/actionsheet/index.js b/packages/actionsheet/index.js
deleted file mode 100644
index 40c4a8d78..000000000
--- a/packages/actionsheet/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import ActionSheet from './src/actionsheet';
-
-export default ActionSheet;
diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/index.vue
similarity index 94%
rename from packages/actionsheet/src/actionsheet.vue
rename to packages/actionsheet/index.vue
index 852c821f8..175d00245 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/index.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script>
-import Popup from '../../mixins/popup';
-import VanIcon from '../../icon';
-import VanLoading from '../../loading';
+import Popup from '../mixins/popup';
+import VanIcon from '../icon';
+import VanLoading from '../loading';
 
 export default {
   name: 'van-actionsheet',
diff --git a/packages/badge-group/index.js b/packages/badge-group/index.js
deleted file mode 100644
index 2bff2f50d..000000000
--- a/packages/badge-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import BadgeGroup from '../badge/src/badge-group';
-
-export default BadgeGroup;
diff --git a/packages/badge/src/badge-group.vue b/packages/badge-group/index.vue
similarity index 100%
rename from packages/badge/src/badge-group.vue
rename to packages/badge-group/index.vue
diff --git a/packages/badge/index.js b/packages/badge/index.js
deleted file mode 100644
index dc8381205..000000000
--- a/packages/badge/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Badge from './src/badge';
-
-export default Badge;
diff --git a/packages/badge/src/badge.vue b/packages/badge/index.vue
similarity index 100%
rename from packages/badge/src/badge.vue
rename to packages/badge/index.vue
diff --git a/packages/button/index.js b/packages/button/index.js
index 5e17857e6..1961b6e9f 100644
--- a/packages/button/index.js
+++ b/packages/button/index.js
@@ -1,3 +1,76 @@
-import Button from './src/button';
+import Loading from '../loading';
 
-export default Button;
+const ALLOWED_SIZE = ['mini', 'small', 'normal', 'large'];
+const ALLOWED_TYPE = ['default', 'danger', 'primary'];
+
+export default {
+  name: 'van-button',
+
+  components: {
+    [Loading.name]: Loading
+  },
+
+  props: {
+    block: Boolean,
+    loading: Boolean,
+    disabled: Boolean,
+    nativeType: String,
+    bottomAction: Boolean,
+    tag: {
+      type: String,
+      default: 'button'
+    },
+    type: {
+      type: String,
+      default: 'default',
+      validator: value => ALLOWED_TYPE.indexOf(value) > -1
+    },
+    size: {
+      type: String,
+      default: 'normal',
+      validator: value => ALLOWED_SIZE.indexOf(value) > -1
+    }
+  },
+
+  methods: {
+    onClick(event) {
+      if (!this.loading && !this.disabled) {
+        this.$emit('click', event);
+      }
+    }
+  },
+
+  render(h) {
+    const { type, loading, disabled, tag: Tag } = this;
+
+    return (
+      <Tag
+        type={this.nativeType}
+        disabled={disabled}
+        class={[
+          'van-button',
+          'van-button--' + type,
+          'van-button--' + this.size,
+          {
+            'van-button--disabled': disabled,
+            'van-button--loading': loading,
+            'van-button--block': this.block,
+            'van-button--bottom-action': this.bottomAction
+          }
+        ]}
+        onClick={this.onClick}
+      >
+        {loading
+          ? <van-loading
+              class="van-button__icon-loading"
+              type="circle"
+              color={type === 'default' ? 'black' : 'white'}
+            />
+          : null}
+        <span class="van-button__text">
+          {this.$slots.default}
+        </span>
+      </Tag>
+    );
+  }
+};
diff --git a/packages/button/src/button.js b/packages/button/src/button.js
deleted file mode 100644
index a7bbe476e..000000000
--- a/packages/button/src/button.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import Loading from '../../loading';
-
-const ALLOWED_SIZE = ['mini', 'small', 'normal', 'large'];
-const ALLOWED_TYPE = ['default', 'danger', 'primary'];
-
-export default {
-  name: 'van-button',
-
-  components: {
-    [Loading.name]: Loading
-  },
-
-  props: {
-    block: Boolean,
-    loading: Boolean,
-    disabled: Boolean,
-    nativeType: String,
-    bottomAction: Boolean,
-    tag: {
-      type: String,
-      default: 'button'
-    },
-    type: {
-      type: String,
-      default: 'default',
-      validator: value => ALLOWED_TYPE.indexOf(value) > -1
-    },
-    size: {
-      type: String,
-      default: 'normal',
-      validator: value => ALLOWED_SIZE.indexOf(value) > -1
-    }
-  },
-
-  methods: {
-    onClick(event) {
-      if (!this.loading && !this.disabled) {
-        this.$emit('click', event);
-      }
-    }
-  },
-
-  render(h) {
-    const { type, loading, disabled, tag: Tag } = this;
-
-    return (
-      <Tag
-        type={this.nativeType}
-        disabled={disabled}
-        class={[
-          'van-button',
-          'van-button--' + type,
-          'van-button--' + this.size,
-          {
-            'van-button--disabled': disabled,
-            'van-button--loading': loading,
-            'van-button--block': this.block,
-            'van-button--bottom-action': this.bottomAction
-          }
-        ]}
-        onClick={this.onClick}
-      >
-        {loading
-          ? <van-loading
-              class="van-button__icon-loading"
-              type="circle"
-              color={type === 'default' ? 'black' : 'white'}
-            />
-          : null}
-        <span class="van-button__text">
-          {this.$slots.default}
-        </span>
-      </Tag>
-    );
-  }
-};
diff --git a/packages/card/index.js b/packages/card/index.js
deleted file mode 100644
index 84dfc6611..000000000
--- a/packages/card/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Card from './src/card';
-
-export default Card;
diff --git a/packages/card/src/card.vue b/packages/card/index.vue
similarity index 100%
rename from packages/card/src/card.vue
rename to packages/card/index.vue
diff --git a/packages/cell-group/index.js b/packages/cell-group/index.js
deleted file mode 100644
index ccbfd514e..000000000
--- a/packages/cell-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CellGroup from '../cell/src/cell-group';
-
-export default CellGroup;
diff --git a/packages/cell/src/cell-group.vue b/packages/cell-group/index.vue
similarity index 100%
rename from packages/cell/src/cell-group.vue
rename to packages/cell-group/index.vue
diff --git a/packages/cell-swipe/index.js b/packages/cell-swipe/index.js
deleted file mode 100644
index 075cbb40d..000000000
--- a/packages/cell-swipe/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CellSwipe from './src/cell-swipe';
-
-export default CellSwipe;
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
new file mode 100644
index 000000000..fd99f533d
--- /dev/null
+++ b/packages/cell-swipe/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <div v-clickoutside:touchstart="swipeMove" @click="swipeMove()" @touchstart="startDrag" @touchmove="onDrag" @touchend="endDrag" class="van-cell-swipe" ref="cell">
+    <div class="van-cell-wrapper">
+      <slot>单元格内容</slot>
+    </div>
+    <div class="van-cell-left">
+      <div ref="left">
+        <slot name="left"></slot>
+      </div>
+    </div>
+    <div class="van-cell-right">
+      <div ref="right">
+        <slot name="right"></slot>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { once } from '../utils/dom';
+import Clickoutside from '../utils/clickoutside';
+
+export default {
+  name: 'van-cell-swipe',
+  props: {
+    'leftWidth': { type: Number, default: 0 },
+    'rightWidth': { type: Number, default: 0 }
+  },
+  directives: { Clickoutside },
+  data() {
+    return {
+      start: { x: 0, y: 0 }
+    };
+  },
+  computed: {
+    leftDefaultTransform() {
+      return this.translate3d(-this.leftWidth - 1);
+    },
+    rightDefaultTransform() {
+      return this.translate3d(this.rightWidth);
+    }
+  },
+  mounted() {
+    this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
+    this.leftElm = this.$refs.left;
+    this.leftWrapElm = this.leftElm.parentNode;
+    this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
+
+    this.rightElm = this.$refs.right;
+    this.rightWrapElm = this.rightElm.parentNode;
+    this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
+  },
+  methods: {
+    resetSwipeStatus() {
+      this.swiping = false; // 是否正在拖动
+      this.opened = true; // 记录是否滑动左右 或者 注册
+      this.offsetLeft = 0; // 记录单次拖动的拖动距离
+    },
+    translate3d(offset) {
+      return `translate3d(${offset}px, 0, 0)`;
+    },
+    swipeMove(offset = 0) {
+      this.wrap.style.webkitTransform = this.translate3d(offset);
+      this.rightWrapElm.style.webkitTransform = this.translate3d(this.rightWidth + offset);
+      this.leftWrapElm.style.webkitTransform = this.translate3d(-this.leftWidth + offset);
+      offset && (this.swiping = true);
+    },
+    swipeLeaveTransition(direction) {
+      setTimeout(() => {
+        this.swipeLeave = true;
+        // left
+        if (direction > 0 && -this.offsetLeft > this.rightWidth * 0.4 && this.rightWidth > 0) {
+          this.swipeMove(-this.rightWidth);
+          this.resetSwipeStatus();
+          return;
+          // right
+        } else if (direction < 0 && this.offsetLeft > this.leftWidth * 0.4 && this.leftWidth > 0) {
+          this.swipeMove(this.leftWidth);
+          this.resetSwipeStatus();
+          return;
+        } else {
+          this.swipeMove(0);
+          once(this.wrap, 'webkitTransitionEnd', _ => {
+            this.wrap.style.webkitTransform = '';
+            this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
+            this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
+            this.swipeLeave = false;
+            this.swiping = false;
+          });
+        }
+      }, 0);
+    },
+    startDrag(evt) {
+      evt = evt.changedTouches ? evt.changedTouches[0] : evt;
+      this.dragging = true;
+      this.start.x = evt.pageX;
+      this.start.y = evt.pageY;
+    },
+    onDrag(evt) {
+      if (this.opened) {
+        !this.swiping && this.swipeMove(0);
+        this.opened = false;
+        return;
+      }
+      if (!this.dragging) return;
+      let swiping;
+      const e = evt.changedTouches ? evt.changedTouches[0] : evt;
+      const offsetTop = e.pageY - this.start.y;
+      const offsetLeft = this.offsetLeft = e.pageX - this.start.x;
+      if ((offsetLeft < 0 && -offsetLeft > this.rightWidth) ||
+        (offsetLeft > 0 && offsetLeft > this.leftWidth) ||
+        (offsetLeft > 0 && !this.leftWidth) ||
+        (offsetLeft < 0 && !this.rightWidth)) {
+        return;
+      }
+      const y = Math.abs(offsetTop);
+      const x = Math.abs(offsetLeft);
+      swiping = !(x < 5 || (x >= 5 && y >= x * 1.73));
+      if (!swiping) return;
+      evt.preventDefault();
+      this.swipeMove(offsetLeft);
+    },
+    endDrag() {
+      if (!this.swiping) return;
+      this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
+    }
+  }
+};
+</script>
diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue
deleted file mode 100644
index 00acbfe11..000000000
--- a/packages/cell-swipe/src/cell-swipe.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div
-    v-clickoutside:touchstart="swipeMove"
-    @click="swipeMove()"
-    @touchstart="startDrag"
-    @touchmove="onDrag"
-    @touchend="endDrag"
-    class="van-cell-swipe"
-    ref="cell">
-    <div class="van-cell-wrapper">
-      <slot>单元格内容</slot>
-    </div>
-    <div class="van-cell-left">
-      <div ref="left">
-        <slot name="left"></slot>
-      </div>
-    </div>
-    <div class="van-cell-right">
-      <div ref="right">
-        <slot name="right"></slot>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {once} from '../../utils/dom';
-  import Clickoutside from '../../utils/clickoutside';
-  
-  export default {
-    name: 'van-cell-swipe',
-    props: {
-      'leftWidth': {type: Number, default: 0},
-      'rightWidth': {type: Number, default: 0}
-    },
-    directives: {Clickoutside},
-    data() {
-      return {
-        start: {x: 0, y: 0}
-      };
-    },
-    computed: {
-      leftDefaultTransform(){
-        return this.translate3d(-this.leftWidth - 1);
-      },
-      rightDefaultTransform(){
-        return this.translate3d(this.rightWidth);
-      }
-    },
-    mounted() {
-      this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
-      this.leftElm = this.$refs.left;
-      this.leftWrapElm = this.leftElm.parentNode;
-      this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
-
-      this.rightElm = this.$refs.right;
-      this.rightWrapElm = this.rightElm.parentNode;
-      this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
-    },
-    methods: {
-      resetSwipeStatus() {
-        this.swiping = false; // 是否正在拖动
-        this.opened = true; // 记录是否滑动左右 或者 注册
-        this.offsetLeft = 0; // 记录单次拖动的拖动距离
-      },
-      translate3d(offset) {
-        return `translate3d(${offset}px, 0, 0)`;
-      },
-      swipeMove(offset = 0) {
-        this.wrap.style.webkitTransform = this.translate3d(offset);
-        this.rightWrapElm.style.webkitTransform = this.translate3d(this.rightWidth + offset);
-        this.leftWrapElm.style.webkitTransform = this.translate3d(-this.leftWidth + offset);
-        offset && (this.swiping = true);
-      },
-      swipeLeaveTransition(direction) {
-        setTimeout(() => {
-          this.swipeLeave = true;
-          // left
-          if (direction > 0 && -this.offsetLeft > this.rightWidth * 0.4 && this.rightWidth > 0) {
-            this.swipeMove(-this.rightWidth);
-            this.resetSwipeStatus();
-            return;
-            // right
-          } else if (direction < 0 && this.offsetLeft > this.leftWidth * 0.4 && this.leftWidth > 0) {
-            this.swipeMove(this.leftWidth);
-            this.resetSwipeStatus();
-            return;
-          } else {
-            this.swipeMove(0);
-            once(this.wrap, 'webkitTransitionEnd', _ => {
-              this.wrap.style.webkitTransform = '';
-              this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
-              this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
-              this.swipeLeave = false;
-              this.swiping = false;
-            });
-          }
-        }, 0);
-      },
-      startDrag(evt) {
-        evt = evt.changedTouches ? evt.changedTouches[0] : evt;
-        this.dragging = true;
-        this.start.x = evt.pageX;
-        this.start.y = evt.pageY;
-      },
-      onDrag(evt) {
-        if (this.opened) {
-          !this.swiping && this.swipeMove(0);
-          this.opened = false;
-          return;
-        }
-        if (!this.dragging) return;
-        let swiping;
-        const e = evt.changedTouches ? evt.changedTouches[0] : evt;
-        const offsetTop = e.pageY - this.start.y;
-        const offsetLeft = this.offsetLeft = e.pageX - this.start.x;
-        if ((offsetLeft < 0 && -offsetLeft > this.rightWidth) ||
-          (offsetLeft > 0 && offsetLeft > this.leftWidth) ||
-          (offsetLeft > 0 && !this.leftWidth) ||
-          (offsetLeft < 0 && !this.rightWidth)) {
-          return;
-        }
-        const y = Math.abs(offsetTop);
-        const x = Math.abs(offsetLeft);
-        swiping = !(x < 5 || (x >= 5 && y >= x * 1.73));
-        if (!swiping) return;
-        evt.preventDefault();
-        this.swipeMove(offsetLeft);
-      },
-      endDrag() {
-        if (!this.swiping) return;
-        this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
-      }
-    }
-  };
-</script>
-
diff --git a/packages/cell/index.js b/packages/cell/index.js
deleted file mode 100644
index aa54ff040..000000000
--- a/packages/cell/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Cell from './src/cell';
-
-export default Cell;
diff --git a/packages/cell/src/cell.vue b/packages/cell/index.vue
similarity index 91%
rename from packages/cell/src/cell.vue
rename to packages/cell/index.vue
index afd997c80..f356c8aa9 100644
--- a/packages/cell/src/cell.vue
+++ b/packages/cell/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <a :class="['van-cell', { 'van-cell--required': required }]" :href="url" @click="handleClick">
+  <a :class="['van-cell', { 'van-cell--required': required }]" :href="url" @click="$emit('click')">
     <div
       class="van-cell__title"
       v-if="this.$slots.title || title"
@@ -42,12 +42,6 @@ export default {
     label: String,
     isLink: Boolean,
     required: Boolean
-  },
-
-  methods: {
-    handleClick() {
-      this.$emit('click');
-    }
   }
 };
 </script>
diff --git a/packages/checkbox-group/index.js b/packages/checkbox-group/index.js
deleted file mode 100644
index 5688b4ee1..000000000
--- a/packages/checkbox-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CheckboxGroup from '../checkbox/src/checkbox-group';
-
-export default CheckboxGroup;
diff --git a/packages/checkbox/src/checkbox-group.vue b/packages/checkbox-group/index.vue
similarity index 100%
rename from packages/checkbox/src/checkbox-group.vue
rename to packages/checkbox-group/index.vue
diff --git a/packages/checkbox/index.js b/packages/checkbox/index.js
deleted file mode 100644
index d4bcea5a2..000000000
--- a/packages/checkbox/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Checkbox from './src/checkbox';
-
-export default Checkbox;
diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/index.vue
similarity index 98%
rename from packages/checkbox/src/checkbox.vue
rename to packages/checkbox/index.vue
index c2d46e349..1b31f0e1e 100644
--- a/packages/checkbox/src/checkbox.vue
+++ b/packages/checkbox/index.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import findParent from '../../mixins/findParent';
+import findParent from '../mixins/findParent';
 
 export default {
   name: 'van-checkbox',
diff --git a/packages/col/index.js b/packages/col/index.js
deleted file mode 100644
index b8728de40..000000000
--- a/packages/col/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Col from './src/col';
-
-export default Col;
diff --git a/packages/col/src/col.vue b/packages/col/index.vue
similarity index 100%
rename from packages/col/src/col.vue
rename to packages/col/index.vue
diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js
deleted file mode 100644
index ca80ede95..000000000
--- a/packages/datetime-picker/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import DatetimePicker from './src/datetime-picker';
-
-export default DatetimePicker;
diff --git a/packages/datetime-picker/src/datetime-picker.vue b/packages/datetime-picker/index.vue
similarity index 99%
rename from packages/datetime-picker/src/datetime-picker.vue
rename to packages/datetime-picker/index.vue
index 4b2429e5d..34edb6c8d 100644
--- a/packages/datetime-picker/src/datetime-picker.vue
+++ b/packages/datetime-picker/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import Picker from '../../picker';
+import Picker from '../picker';
 
 const allowedType = ['time', 'date', 'datetime'];
 
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/dialog.vue
similarity index 95%
rename from packages/dialog/src/dialog.vue
rename to packages/dialog/dialog.vue
index 35e21af78..aabc82ed8 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -14,8 +14,8 @@
 </template>
 
 <script>
-import Button from '../../button';
-import Popup from '../../mixins/popup';
+import Button from '../button';
+import Popup from '../mixins/popup';
 
 export default {
   name: 'van-dialog',
diff --git a/packages/dialog/index.js b/packages/dialog/index.js
index cb8dcd8d5..c5287b19c 100644
--- a/packages/dialog/index.js
+++ b/packages/dialog/index.js
@@ -1,3 +1,97 @@
-import Dialog from './src/dialog.js';
+import Vue from 'vue';
+import Dialog from './dialog';
 
-export default Dialog;
+const DialogConstructor = Vue.extend(Dialog);
+
+let currentDialog;
+let instance;
+let dialogQueue = [];
+
+const defaultCallback = action => {
+  /* istanbul ignore else */
+  if (currentDialog) {
+    if (currentDialog.resolve && action === 'confirm') {
+      currentDialog.resolve(action);
+    } else if (currentDialog.reject && action === 'cancel') {
+      currentDialog.reject(action);
+    }
+  }
+};
+
+const initInstance = () => {
+  instance = new DialogConstructor({
+    el: document.createElement('div')
+  });
+
+  instance.$on('input', value => {
+    instance.value = value;
+  })
+  instance.callback = defaultCallback;
+};
+
+const showNextDialog = () => {
+  if (!instance) {
+    initInstance();
+  }
+
+  /* istanbul ignore else */
+  if (!instance.value && dialogQueue.length > 0) {
+    currentDialog = dialogQueue.shift();
+
+    const { options } = currentDialog;
+
+    for (const prop in options) {
+      /* istanbul ignore else */
+      if (options.hasOwnProperty(prop)) {
+        instance[prop] = options[prop];
+      }
+    }
+
+    instance.callback = options.callback || defaultCallback;
+    instance.value = true;
+    document.body.appendChild(instance.$el);
+  }
+};
+
+const DialogBox = options => {
+  return new Promise((resolve, reject) => { // eslint-disable-line
+    dialogQueue.push({
+      options: { ...options },
+      callback: options.callback,
+      resolve: resolve,
+      reject: reject
+    });
+
+    showNextDialog();
+  });
+};
+
+DialogBox.alert = function(options) {
+  return DialogBox({
+    type: 'alert',
+    title: '',
+    message: '',
+    closeOnClickOverlay: false,
+    showCancelButton: false,
+    ...options
+  });
+};
+
+DialogBox.confirm = function(options) {
+  return DialogBox({
+    type: 'confirm',
+    title: '',
+    message: '',
+    closeOnClickOverlay: true,
+    showCancelButton: true,
+    ...options
+  });
+};
+
+DialogBox.close = function() {
+  instance.value = false;
+  dialogQueue = [];
+  currentDialog = null;
+};
+
+export default DialogBox;
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
deleted file mode 100644
index d82f3e9b2..000000000
--- a/packages/dialog/src/dialog.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import Vue from 'vue';
-import Dialog from './dialog.vue';
-
-const DialogConstructor = Vue.extend(Dialog);
-
-let currentDialog;
-let instance;
-let dialogQueue = [];
-
-const defaultCallback = action => {
-  /* istanbul ignore else */
-  if (currentDialog) {
-    if (currentDialog.resolve && action === 'confirm') {
-      currentDialog.resolve(action);
-    } else if (currentDialog.reject && action === 'cancel') {
-      currentDialog.reject(action);
-    }
-  }
-};
-
-const initInstance = () => {
-  instance = new DialogConstructor({
-    el: document.createElement('div')
-  });
-
-  instance.$on('input', value => {
-    instance.value = value;
-  })
-  instance.callback = defaultCallback;
-};
-
-const showNextDialog = () => {
-  if (!instance) {
-    initInstance();
-  }
-
-  /* istanbul ignore else */
-  if (!instance.value && dialogQueue.length > 0) {
-    currentDialog = dialogQueue.shift();
-
-    const { options } = currentDialog;
-
-    for (const prop in options) {
-      /* istanbul ignore else */
-      if (options.hasOwnProperty(prop)) {
-        instance[prop] = options[prop];
-      }
-    }
-
-    instance.callback = options.callback || defaultCallback;
-    instance.value = true;
-    document.body.appendChild(instance.$el);
-  }
-};
-
-var DialogBox = options => {
-  return new Promise((resolve, reject) => { // eslint-disable-line
-    dialogQueue.push({
-      options: { ...options },
-      callback: options.callback,
-      resolve: resolve,
-      reject: reject
-    });
-
-    showNextDialog();
-  });
-};
-
-DialogBox.alert = function(options) {
-  return DialogBox({
-    type: 'alert',
-    title: '',
-    message: '',
-    closeOnClickOverlay: false,
-    showCancelButton: false,
-    ...options
-  });
-};
-
-DialogBox.confirm = function(options) {
-  return DialogBox({
-    type: 'confirm',
-    title: '',
-    message: '',
-    closeOnClickOverlay: true,
-    showCancelButton: true,
-    ...options
-  });
-};
-
-DialogBox.close = function() {
-  instance.value = false;
-  dialogQueue = [];
-  currentDialog = null;
-};
-
-export default DialogBox;
diff --git a/packages/field/index.js b/packages/field/index.js
deleted file mode 100644
index 391f5272c..000000000
--- a/packages/field/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Field from './src/field';
-
-export default Field;
diff --git a/packages/field/src/field.vue b/packages/field/index.vue
similarity index 97%
rename from packages/field/src/field.vue
rename to packages/field/index.vue
index 011fdae8a..2f86df5b1 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/index.vue
@@ -48,8 +48,8 @@
 
 <script>
 const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
-import vanCell from '../../cell';
-import vanIcon from '../../icon';
+import vanCell from '../cell';
+import vanIcon from '../icon';
 
 export default {
   name: 'van-field',
diff --git a/packages/icon/index.js b/packages/icon/index.js
deleted file mode 100644
index cf234f6f0..000000000
--- a/packages/icon/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Icon from './src/icon';
-
-export default Icon;
diff --git a/packages/icon/src/icon.vue b/packages/icon/index.vue
similarity index 100%
rename from packages/icon/src/icon.vue
rename to packages/icon/index.vue
diff --git a/packages/image-preview/src/image-preview.vue b/packages/image-preview/image-preview.vue
similarity index 95%
rename from packages/image-preview/src/image-preview.vue
rename to packages/image-preview/image-preview.vue
index 26c2c62ad..1ff21be7b 100644
--- a/packages/image-preview/src/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -12,9 +12,9 @@
 
 <script>
 import Vue from 'vue';
-import Popup from '../../mixins/popup';
-import VanSwipe from '../../swipe';
-import VanSwipeItem from '../../swipe-item';
+import Popup from '../mixins/popup';
+import VanSwipe from '../swipe';
+import VanSwipeItem from '../swipe-item';
 
 export default {
   name: 'van-image-preview',
diff --git a/packages/image-preview/index.js b/packages/image-preview/index.js
index 6c0e89558..aed24c69b 100644
--- a/packages/image-preview/index.js
+++ b/packages/image-preview/index.js
@@ -1,3 +1,35 @@
-import ImagePreview from './src/image-preview.js';
+import Vue from 'vue';
+import ImagePreview from './image-preview';
 
-export default ImagePreview;
+let instance;
+
+const ImagePreviewConstructor = Vue.extend(ImagePreview);
+
+const initInstance = () => {
+  /* istanbul ignore if */
+  if (Vue.prototype.$isServer) return;
+  instance = new ImagePreviewConstructor({
+    el: document.createElement('div')
+  });
+};
+
+var ImagePreviewBox = images => {
+  /* istanbul ignore if */
+  if (Vue.prototype.$isServer) return;
+  if (!instance) {
+    initInstance();
+  }
+
+  /* istanbul ignore else */
+  if (!instance.value) {
+    instance.images = images;
+
+    document.body.appendChild(instance.$el);
+
+    Vue.nextTick(() => {
+      instance.value = true;
+    });
+  }
+};
+
+export default ImagePreviewBox;
diff --git a/packages/image-preview/src/image-preview.js b/packages/image-preview/src/image-preview.js
deleted file mode 100644
index 888693701..000000000
--- a/packages/image-preview/src/image-preview.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Vue from 'vue';
-import ImagePreview from './image-preview.vue';
-
-let instance;
-
-const ImagePreviewConstructor = Vue.extend(ImagePreview);
-
-const initInstance = () => {
-  /* istanbul ignore if */
-  if (Vue.prototype.$isServer) return;
-  instance = new ImagePreviewConstructor({
-    el: document.createElement('div')
-  });
-};
-
-var ImagePreviewBox = images => {
-  /* istanbul ignore if */
-  if (Vue.prototype.$isServer) return;
-  if (!instance) {
-    initInstance();
-  }
-
-  /* istanbul ignore else */
-  if (!instance.value) {
-    instance.images = images;
-
-    document.body.appendChild(instance.$el);
-
-    Vue.nextTick(() => {
-      instance.value = true;
-    });
-  }
-};
-
-export default ImagePreviewBox;
diff --git a/packages/loading/index.js b/packages/loading/index.js
deleted file mode 100644
index b145318b8..000000000
--- a/packages/loading/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Loading from './src/loading';
-
-export default Loading;
diff --git a/packages/loading/src/loading.vue b/packages/loading/index.vue
similarity index 100%
rename from packages/loading/src/loading.vue
rename to packages/loading/index.vue
diff --git a/packages/panel/index.js b/packages/panel/index.js
deleted file mode 100644
index 35f2b3d2c..000000000
--- a/packages/panel/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Panel from './src/panel';
-
-export default Panel;
diff --git a/packages/panel/src/panel.vue b/packages/panel/index.vue
similarity index 100%
rename from packages/panel/src/panel.vue
rename to packages/panel/index.vue
diff --git a/packages/picker/src/draggable.js b/packages/picker/draggable.js
similarity index 100%
rename from packages/picker/src/draggable.js
rename to packages/picker/draggable.js
diff --git a/packages/picker/index.js b/packages/picker/index.js
deleted file mode 100644
index a53cc99e4..000000000
--- a/packages/picker/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Picker from './src/picker';
-
-export default Picker;
diff --git a/packages/picker/src/picker.vue b/packages/picker/index.vue
similarity index 100%
rename from packages/picker/src/picker.vue
rename to packages/picker/index.vue
diff --git a/packages/picker/src/picker-column.vue b/packages/picker/picker-column.vue
similarity index 99%
rename from packages/picker/src/picker-column.vue
rename to packages/picker/picker-column.vue
index e69af8dc2..32a6db2bd 100644
--- a/packages/picker/src/picker-column.vue
+++ b/packages/picker/picker-column.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import translateUtil from '../../utils/transition';
+import translateUtil from '../utils/transition';
 import draggable from './draggable';
 
 const DEFAULT_ITEM_HEIGHT = 44;
diff --git a/packages/popup/index.js b/packages/popup/index.js
deleted file mode 100644
index 31857d9ef..000000000
--- a/packages/popup/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Popup from './src/popup';
-
-export default Popup;
diff --git a/packages/popup/src/popup.vue b/packages/popup/index.vue
similarity index 96%
rename from packages/popup/src/popup.vue
rename to packages/popup/index.vue
index 526036b82..7fe9dbf7a 100644
--- a/packages/popup/src/popup.vue
+++ b/packages/popup/index.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import Popup from '../../mixins/popup';
+import Popup from '../mixins/popup';
 export default {
   name: 'van-popup',
 
diff --git a/packages/progress/index.js b/packages/progress/index.js
deleted file mode 100644
index 7d480f5da..000000000
--- a/packages/progress/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Progress from './src/progress';
-
-export default Progress;
diff --git a/packages/progress/src/progress.vue b/packages/progress/index.vue
similarity index 100%
rename from packages/progress/src/progress.vue
rename to packages/progress/index.vue
diff --git a/packages/quantity/index.js b/packages/quantity/index.js
deleted file mode 100644
index 31f90beb3..000000000
--- a/packages/quantity/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Quantity from './src/quantity';
-
-export default Quantity;
diff --git a/packages/quantity/src/quantity.vue b/packages/quantity/index.vue
similarity index 100%
rename from packages/quantity/src/quantity.vue
rename to packages/quantity/index.vue
diff --git a/packages/radio-group/index.js b/packages/radio-group/index.js
deleted file mode 100644
index 7f39d43e7..000000000
--- a/packages/radio-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import RadioGroup from '../radio/src/radio-group';
-
-export default RadioGroup;
diff --git a/packages/radio/src/radio-group.vue b/packages/radio-group/index.vue
similarity index 100%
rename from packages/radio/src/radio-group.vue
rename to packages/radio-group/index.vue
diff --git a/packages/radio/index.js b/packages/radio/index.js
deleted file mode 100644
index 28c69693a..000000000
--- a/packages/radio/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Radio from './src/radio';
-
-export default Radio;
diff --git a/packages/radio/src/radio.vue b/packages/radio/index.vue
similarity index 96%
rename from packages/radio/src/radio.vue
rename to packages/radio/index.vue
index 1633bfc15..3e0fa987b 100644
--- a/packages/radio/src/radio.vue
+++ b/packages/radio/index.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import findParent from '../../mixins/findParent';
+import findParent from '../mixins/findParent';
 
 export default {
   name: 'van-radio',
diff --git a/packages/row/index.js b/packages/row/index.js
deleted file mode 100644
index 6549c1ffb..000000000
--- a/packages/row/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Row from './src/row';
-
-export default Row;
diff --git a/packages/row/src/row.vue b/packages/row/index.vue
similarity index 100%
rename from packages/row/src/row.vue
rename to packages/row/index.vue
diff --git a/packages/search/index.js b/packages/search/index.js
deleted file mode 100644
index 716a43c6e..000000000
--- a/packages/search/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Search from './src/search';
-
-export default Search;
diff --git a/packages/search/index.vue b/packages/search/index.vue
new file mode 100644
index 000000000..85fe31b38
--- /dev/null
+++ b/packages/search/index.vue
@@ -0,0 +1,105 @@
+<template>
+  <div
+    class="van-search"
+    v-clickoutside="handleClickoutside"
+    :class="{ 'van-search--focus': isFocus, 'van-search--showcase': type === 'showcase' }">
+    <div class="van-search__input-wrap">
+      <van-icon name="search"></van-icon>
+      <input
+        type="text"
+        :placeholder="placeholder"
+        class="van-search__input"
+        v-model="value"
+        v-refocus="focusStatus"
+        @focus="handleFocus"
+        @keyup.enter="handleSearch">
+      <van-icon name="clear" @click="handleClean" v-show="isFocus"></van-icon>
+    </div>
+    <div class="van-search__cancel" v-show="type !== 'showcase' && isFocus" @click="handleBack">取消</div>
+  </div>
+</template>
+
+<script>
+import VanIcon from '../icon';
+import Clickoutside from '../utils/clickoutside';
+
+export default {
+  name: 'van-search',
+
+  components: {
+    VanIcon
+  },
+
+  props: {
+    placeholder: String,
+    type: {
+      type: String,
+      default: 'normal'
+    }
+  },
+
+  watch: {
+    value(val) {
+      this.$emit('change', val);
+    }
+  },
+
+  data() {
+    return {
+      value: '',
+      focusStatus: false,
+      isFocus: false
+    };
+  },
+
+  directives: {
+    Clickoutside,
+    refocus: {
+      update: function(el, state) {
+        if (state.value) {
+          el.focus();
+        }
+      }
+    }
+  },
+
+  methods: {
+    /**
+     * 进入input焦点，出现close和取消
+     */
+    handleFocus() {
+      this.isFocus = true;
+    },
+
+    /**
+     * 点击close后清空vlaue后，再聚焦input框
+     */
+    handleClean() {
+      this.value = '';
+      this.focusStatus = true;
+    },
+
+    /**
+     * 点击取消后，清空所有回复最初状态
+     */
+    handleBack() {
+      this.value = '';
+      this.focusStatus = false;
+      this.isFocus = false;
+      this.$emit('cancel');
+    },
+
+    /**
+     * input输入回车后，发送回调
+     */
+    handleSearch() {
+      this.$emit('search', this.value);
+    },
+
+    handleClickoutside() {
+      this.isFocus = false;
+      this.focusStatus = false;
+    }
+  }
+};
+</script>
diff --git a/packages/search/src/search.vue b/packages/search/src/search.vue
deleted file mode 100644
index 7363a51f5..000000000
--- a/packages/search/src/search.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div
-    class="van-search"
-    v-clickoutside="handleClickoutside"
-    :class="{ 'van-search--focus': isFocus, 'van-search--showcase': type === 'showcase' }">
-    <div class="van-search__input-wrap">
-      <van-icon name="search"></van-icon>
-      <input
-        type="text"
-        :placeholder="placeholder"
-        class="van-search__input"
-        v-model="value"
-        v-refocus="focusStatus"
-        @focus="handleFocus"
-        @keyup.enter="handleSearch">
-      <van-icon name="clear" @click="handleClean" v-show="isFocus"></van-icon>
-    </div>
-    <div class="van-search__cancel" v-show="type !== 'showcase' && isFocus" @click="handleBack">取消</div>
-  </div>
-</template>
-
-<script>
-  import VanIcon from '../../icon';
-  import Clickoutside from '../../utils/clickoutside';
-
-  export default {
-    name: 'van-search',
-
-    components: {
-      VanIcon
-    },
-
-    props: {
-      placeholder: String,
-      type: {
-        type: String,
-        default: 'normal'
-      }
-    },
-
-    watch: {
-      value(val) {
-        this.$emit('change', val);
-      }
-    },
-
-    data() {
-      return {
-        value: '',
-        focusStatus: false,
-        isFocus: false
-      };
-    },
-
-    directives: {
-      Clickoutside,
-      refocus: {
-        update: function(el, state) {
-          if (state.value) {
-            el.focus();
-          }
-        }
-      }
-    },
-
-    methods: {
-      /**
-       * 进入input焦点，出现close和取消
-       */
-      handleFocus() {
-        this.isFocus = true;
-      },
-
-      /**
-       * 点击close后清空vlaue后，再聚焦input框
-       */
-      handleClean() {
-        this.value = '';
-        this.focusStatus = true;
-      },
-
-      /**
-       * 点击取消后，清空所有回复最初状态
-       */
-      handleBack() {
-        this.value = '';
-        this.focusStatus = false;
-        this.isFocus = false;
-        this.$emit('cancel');
-      },
-
-      /**
-       * input输入回车后，发送回调
-       */
-      handleSearch() {
-        this.$emit('search', this.value);
-      },
-
-      handleClickoutside() {
-        this.isFocus = false;
-        this.focusStatus = false;
-      }
-    }
-  };
-</script>
diff --git a/packages/step/index.js b/packages/step/index.js
deleted file mode 100644
index 5ec38e896..000000000
--- a/packages/step/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Step from '../steps/src/step';
-
-export default Step;
diff --git a/packages/steps/src/step.vue b/packages/step/index.vue
similarity index 100%
rename from packages/steps/src/step.vue
rename to packages/step/index.vue
diff --git a/packages/steps/index.js b/packages/steps/index.js
deleted file mode 100644
index aaf50e801..000000000
--- a/packages/steps/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Steps from './src/steps';
-
-export default Steps;
diff --git a/packages/steps/src/steps.vue b/packages/steps/index.vue
similarity index 97%
rename from packages/steps/src/steps.vue
rename to packages/steps/index.vue
index 7a533f938..91adf1efd 100644
--- a/packages/steps/src/steps.vue
+++ b/packages/steps/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import Icon from '../../icon';
+import Icon from '../icon';
 
 export default {
   name: 'van-steps',
diff --git a/packages/swipe-item/index.js b/packages/swipe-item/index.js
deleted file mode 100644
index 1fa974908..000000000
--- a/packages/swipe-item/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import SwipeItem from '../swipe/src/swipe-item';
-
-export default SwipeItem;
diff --git a/packages/swipe/src/swipe-item.vue b/packages/swipe-item/index.vue
similarity index 100%
rename from packages/swipe/src/swipe-item.vue
rename to packages/swipe-item/index.vue
diff --git a/packages/swipe/index.js b/packages/swipe/index.js
deleted file mode 100644
index be8c98896..000000000
--- a/packages/swipe/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Swipe from './src/swipe';
-
-export default Swipe;
diff --git a/packages/swipe/src/swipe.vue b/packages/swipe/index.vue
similarity index 100%
rename from packages/swipe/src/swipe.vue
rename to packages/swipe/index.vue
diff --git a/packages/swipe/src/input.js b/packages/swipe/input.js
similarity index 100%
rename from packages/swipe/src/input.js
rename to packages/swipe/input.js
diff --git a/packages/swipe/src/scroll.js b/packages/swipe/scroll.js
similarity index 100%
rename from packages/swipe/src/scroll.js
rename to packages/swipe/scroll.js
diff --git a/packages/swipe/src/spring_dummy.js b/packages/swipe/spring_dummy.js
similarity index 100%
rename from packages/swipe/src/spring_dummy.js
rename to packages/swipe/spring_dummy.js
diff --git a/packages/swipe/src/utils.js b/packages/swipe/utils.js
similarity index 100%
rename from packages/swipe/src/utils.js
rename to packages/swipe/utils.js
diff --git a/packages/switch/index.js b/packages/switch/index.js
deleted file mode 100644
index 0b5d5cf84..000000000
--- a/packages/switch/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Switch from './src/switch';
-
-export default Switch;
diff --git a/packages/switch/src/switch.vue b/packages/switch/index.vue
similarity index 97%
rename from packages/switch/src/switch.vue
rename to packages/switch/index.vue
index 4a4f4e6e6..3dde8ea05 100644
--- a/packages/switch/src/switch.vue
+++ b/packages/switch/index.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import VanLoading from '../../loading';
+import VanLoading from '../loading';
 /**
  * van-switch
  * @module components/switch
diff --git a/packages/tab/index.js b/packages/tab/index.js
deleted file mode 100644
index 551749afb..000000000
--- a/packages/tab/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Tab from './src/tab';
-export default Tab;
diff --git a/packages/tab/index.vue b/packages/tab/index.vue
new file mode 100644
index 000000000..232bd6b33
--- /dev/null
+++ b/packages/tab/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="van-tab__pane" :class="classNames">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'van-tab',
+  props: {
+    // 选项卡头显示文字
+    title: {
+      type: String,
+      required: true
+    },
+    disabled: Boolean
+  },
+  data() {
+    const nextIndex = this.$parent.tabs.length;
+    this.$parent.tabs.push({
+      title: this.title,
+      disabled: this.disabled,
+      index: nextIndex
+    });
+
+    return {
+      key: nextIndex
+    };
+  },
+  computed: {
+    classNames() {
+      return { 'van-tab__pane--select': this.key === this.$parent.curActive };
+    }
+  }
+};
+</script>
diff --git a/packages/tab/src/tab.vue b/packages/tab/src/tab.vue
deleted file mode 100644
index d0fa5627f..000000000
--- a/packages/tab/src/tab.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="van-tab__pane" :class="classNames">
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'van-tab',
-    props: {
-      // 选项卡头显示文字
-      title: {
-        type: String,
-        required: true
-      },
-      disabled: Boolean
-    },
-    data() {
-      const nextIndex = this.$parent.tabs.length;
-      this.$parent.tabs.push({
-        title: this.title,
-        disabled: this.disabled,
-        index: nextIndex
-      });
-
-      return {
-        key: nextIndex
-      };
-    },
-    computed: {
-      classNames() {
-        return { 'van-tab__pane--select': this.key === this.$parent.curActive };
-      }
-    }
-  };
-</script>
diff --git a/packages/tabs/index.js b/packages/tabs/index.js
deleted file mode 100644
index 5db150464..000000000
--- a/packages/tabs/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tabs from '../tab/src/tabs';
-
-export default Tabs;
diff --git a/packages/tab/src/tabs.vue b/packages/tabs/index.vue
similarity index 99%
rename from packages/tab/src/tabs.vue
rename to packages/tabs/index.vue
index e38628d46..0da594a6e 100644
--- a/packages/tab/src/tabs.vue
+++ b/packages/tabs/index.vue
@@ -42,7 +42,7 @@
 
 <script>
   import swipe from './swipe';
-  import translateUtil from '../../utils/transition';
+  import translateUtil from '../utils/transition';
 
   export default {
     name: 'van-tabs',
diff --git a/packages/tab/src/swipe.js b/packages/tabs/swipe.js
similarity index 100%
rename from packages/tab/src/swipe.js
rename to packages/tabs/swipe.js
diff --git a/packages/tag/index.js b/packages/tag/index.js
deleted file mode 100644
index a9efba2a4..000000000
--- a/packages/tag/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tag from './src/main';
-
-export default Tag;
diff --git a/packages/tag/src/main.vue b/packages/tag/index.vue
similarity index 100%
rename from packages/tag/src/main.vue
rename to packages/tag/index.vue
diff --git a/packages/toast/index.js b/packages/toast/index.js
index f521fe6ac..5c6b20de3 100644
--- a/packages/toast/index.js
+++ b/packages/toast/index.js
@@ -1,3 +1,79 @@
-import Toast from './src/toast';
+import Vue from 'vue';
+import merge from '../utils/merge';
+import ToastComponent from './toast';
+
+const ToastConstructor = Vue.extend(ToastComponent);
+let instance;
+
+const getInstance = () => {
+  if (instance) instance.clear();
+
+  instance = new ToastConstructor({
+    el: document.createElement('div')
+  });
+  return instance;
+};
+
+const removeDom = event => {
+  /* istanbul ignore else */
+  if (event.target.parentNode) {
+    event.target.parentNode.removeChild(event.target);
+  }
+};
+
+var Toast = (options = {}) => {
+  const duration = options.duration || 3000;
+
+  const instance = getInstance();
+
+  instance.closed = false;
+  clearTimeout(instance.timer);
+  instance.type = options.type ? options.type : 'text';
+  instance.message = typeof options === 'string' ? options : options.message;
+  instance.forbidClick = options.forbidClick ? options.forbidClick : false;
+  instance.clear = () => {
+    if (instance.closed) return;
+    instance.visible = false;
+    instance.$el.addEventListener('transitionend', removeDom);
+    instance.closed = true;
+  };
+
+  document.body.appendChild(instance.$el);
+  Vue.nextTick(function() {
+    instance.visible = true;
+    instance.$el.removeEventListener('transitionend', removeDom);
+    instance.timer = setTimeout(function() {
+      instance.clear();
+    }, duration);
+  });
+  return instance;
+};
+
+Toast.loading = (options) => {
+  return new Toast(merge({
+    type: 'loading'
+  }, options));
+};
+
+Toast.success = (options) => {
+  const message = typeof options === 'string' ? options : options.message;
+  return new Toast(merge({
+    type: 'success',
+    message: message
+  }, options));
+};
+
+Toast.fail = (options) => {
+  const message = typeof options === 'string' ? options : options.message;
+  return new Toast(merge({
+    type: 'fail',
+    message: message
+  }, options));
+};
+
+Toast.clear = () => {
+  /* istanbul ignore else */
+  if (instance) instance.clear();
+};
 
 export default Toast;
diff --git a/packages/toast/src/toast.js b/packages/toast/src/toast.js
deleted file mode 100644
index e0ef93b2b..000000000
--- a/packages/toast/src/toast.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import Vue from 'vue';
-import merge from '../../utils/merge';
-import ToastComponent from './toast.vue';
-
-const ToastConstructor = Vue.extend(ToastComponent);
-let instance;
-
-const getInstance = () => {
-  if (instance) instance.clear();
-
-  instance = new ToastConstructor({
-    el: document.createElement('div')
-  });
-  return instance;
-};
-
-const removeDom = event => {
-  /* istanbul ignore else */
-  if (event.target.parentNode) {
-    event.target.parentNode.removeChild(event.target);
-  }
-};
-
-var Toast = (options = {}) => {
-  const duration = options.duration || 3000;
-
-  const instance = getInstance();
-
-  instance.closed = false;
-  clearTimeout(instance.timer);
-  instance.type = options.type ? options.type : 'text';
-  instance.message = typeof options === 'string' ? options : options.message;
-  instance.forbidClick = options.forbidClick ? options.forbidClick : false;
-  instance.clear = () => {
-    if (instance.closed) return;
-    instance.visible = false;
-    instance.$el.addEventListener('transitionend', removeDom);
-    instance.closed = true;
-  };
-
-  document.body.appendChild(instance.$el);
-  Vue.nextTick(function() {
-    instance.visible = true;
-    instance.$el.removeEventListener('transitionend', removeDom);
-    instance.timer = setTimeout(function() {
-      instance.clear();
-    }, duration);
-  });
-  return instance;
-};
-
-Toast.loading = (options) => {
-  return new Toast(merge({
-    type: 'loading'
-  }, options));
-};
-
-Toast.success = (options) => {
-  const message = typeof options === 'string' ? options : options.message;
-  return new Toast(merge({
-    type: 'success',
-    message: message
-  }, options));
-};
-
-Toast.fail = (options) => {
-  const message = typeof options === 'string' ? options : options.message;
-  return new Toast(merge({
-    type: 'fail',
-    message: message
-  }, options));
-};
-
-Toast.clear = () => {
-  /* istanbul ignore else */
-  if (instance) instance.clear();
-};
-
-export default Toast;
diff --git a/packages/toast/src/toast.vue b/packages/toast/toast.vue
similarity index 96%
rename from packages/toast/src/toast.vue
rename to packages/toast/toast.vue
index b34ce4313..a147dd8a4 100644
--- a/packages/toast/src/toast.vue
+++ b/packages/toast/toast.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-import vanLoading from '../../loading';
-import vanIcon from '../../icon';
+import vanLoading from '../loading';
+import vanIcon from '../icon';
 
 const TOAST_TYPES = ['text', 'html', 'loading', 'success', 'fail'];
 const DEFAULT_STYLE_LIST = ['success', 'fail'];
diff --git a/packages/uploader/index.js b/packages/uploader/index.js
deleted file mode 100644
index 923a084e7..000000000
--- a/packages/uploader/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Uploader from './src/main';
-
-export default Uploader;
diff --git a/packages/uploader/src/main.vue b/packages/uploader/index.vue
similarity index 98%
rename from packages/uploader/src/main.vue
rename to packages/uploader/index.vue
index 882f8408e..b0b8d4ede 100644
--- a/packages/uploader/src/main.vue
+++ b/packages/uploader/index.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="van-uploader">
-    <slot>
-
-    </slot>
+    <slot></slot>
     <template v-if="disabled">
       <input type="file" @change="onValueChange" disabled="disabled" class="van-uploader__input" />
     </template>
diff --git a/packages/waterfall/src/directive.js b/packages/waterfall/directive.js
similarity index 98%
rename from packages/waterfall/src/directive.js
rename to packages/waterfall/directive.js
index 0ff4a4fd4..220479d40 100644
--- a/packages/waterfall/src/directive.js
+++ b/packages/waterfall/directive.js
@@ -1,4 +1,4 @@
-import Utils from '../../utils/scroll.js';
+import Utils from '../utils/scroll';
 
 const CONTEXT = '@@Waterfall';
 const OFFSET = 300;
diff --git a/packages/waterfall/index.js b/packages/waterfall/index.js
index d315e6f96..02665b9a1 100644
--- a/packages/waterfall/index.js
+++ b/packages/waterfall/index.js
@@ -1,3 +1,14 @@
-import Waterfall from './src/main.js';
+import Waterfall from './directive.js';
+import Vue from 'vue';
 
+const install = function(Vue) {
+  Vue.directive('WaterfallLower', Waterfall('lower'));
+  Vue.directive('WaterfallUpper', Waterfall('upper'));
+};
+
+if (!Vue.prototype.$isServer) {
+  Vue.use(install);
+}
+
+Waterfall.install = install;
 export default Waterfall;
diff --git a/packages/waterfall/src/main.js b/packages/waterfall/src/main.js
deleted file mode 100644
index 02665b9a1..000000000
--- a/packages/waterfall/src/main.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import Waterfall from './directive.js';
-import Vue from 'vue';
-
-const install = function(Vue) {
-  Vue.directive('WaterfallLower', Waterfall('lower'));
-  Vue.directive('WaterfallUpper', Waterfall('upper'));
-};
-
-if (!Vue.prototype.$isServer) {
-  Vue.use(install);
-}
-
-Waterfall.install = install;
-export default Waterfall;
diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 09fad3cbe..1c57dd658 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -74,23 +74,7 @@ const webpackConfig = {
         }]
       },
       {
-        test: /test\/unit\/components\/.*\.vue$|packages\/swipe\/.*\.vue$/,
-        use: [{
-          loader: 'vue-loader',
-          options: {
-            loaders: {
-              css: [
-                'style-loader',
-                'css-loader',
-                'postcss-loader'
-              ]
-            }
-          }
-        }]
-      },
-      {
-        test: /packages\/.*\.vue$/,
-        exclude: /packages\/swipe/,
+        test: /\.vue$/,
         use: [{
           loader: 'vue-loader',
           options: {
@@ -100,9 +84,7 @@ const webpackConfig = {
                 'css-loader',
                 'postcss-loader'
               ],
-              js: [
-                'isparta-loader'
-              ]
+              js: ['isparta-loader']
             }
           }
         }]
diff --git a/test/unit/specs/picker.spec.js b/test/unit/specs/picker.spec.js
index dd8e5770a..d3fe2184d 100644
--- a/test/unit/specs/picker.spec.js
+++ b/test/unit/specs/picker.spec.js
@@ -1,5 +1,5 @@
 import Picker from 'packages/picker';
-import PickerColumn from 'packages/picker/src/picker-column';
+import PickerColumn from 'packages/picker/picker-column';
 import { mount } from 'avoriaz';
 import Wrapper from 'avoriaz/dist/Wrapper';