diff --git a/components/col/index.js b/components/col/index.js
new file mode 100644
index 0000000000..752938c58d
--- /dev/null
+++ b/components/col/index.js
@@ -0,0 +1,2 @@
+import { Col } from '../layout';
+export default Col;
diff --git a/components/form/index.jsx b/components/form/index.jsx
index 59220bd943..a21b5ac902 100644
--- a/components/form/index.jsx
+++ b/components/form/index.jsx
@@ -1,11 +1,15 @@
 import Form from './Form';
 import FormItem from './FormItem';
 import ValueMixin from './ValueMixin';
-import Input from './Input';
+import Input from '../input';
 
 Form.Item = FormItem;
 Form.ValueMixin = ValueMixin;
-export default {
-  Form,
-  Input
-};
+
+// 对于 import { Form, Input } from 'antd/lib/form/';
+// 的方式做向下兼容
+// https://github.com/ant-design/ant-design/pull/566
+Form.Form = Form;
+Form.Input = Input;
+
+export default Form;
diff --git a/components/form/Input.jsx b/components/input/index.jsx
similarity index 100%
rename from components/form/Input.jsx
rename to components/input/index.jsx
diff --git a/components/row/index.js b/components/row/index.js
new file mode 100644
index 0000000000..a17e1a2c22
--- /dev/null
+++ b/components/row/index.js
@@ -0,0 +1,2 @@
+import { Row } from '../layout';
+export default Row;
diff --git a/index.js b/index.js
index 61b54e3125..15568140ae 100644
--- a/index.js
+++ b/index.js
@@ -36,13 +36,12 @@ const antd = {
   Menu: require('./components/menu'),
   Timeline: require('./components/timeline'),
   Button: require('./components/button'),
-  ButtonGroup: require('./components/button').Group,
   Icon: require('./components/icon'),
-  Row: require('./components/layout').Row,
-  Col: require('./components/layout').Col,
+  Row: require('./components/row'),
+  Col: require('./components/col'),
   Spin: require('./components/spin'),
-  Form: require('./components/form').Form,
-  Input: require('./components/form').Input,
+  Form: require('./components/form'),
+  Input: require('./components/input'),
   Calendar: require('./components/calendar'),
   Timepicker: require('./components/timepicker'),
 };