diff --git a/packages/form/src/connect-array/connect-array.directive.ts b/packages/form/src/connect-array/connect-array.directive.ts
index 927452a7..0a6505ed 100644
--- a/packages/form/src/connect-array/connect-array.directive.ts
+++ b/packages/form/src/connect-array/connect-array.directive.ts
@@ -29,7 +29,7 @@ import {
 } from '@angular/forms';
 import { Unsubscribe } from 'redux';
 
-import { ConnectBase } from '../connect';
+import { ConnectBase } from '../connect/connect-base';
 import { FormStore } from '../form-store';
 import { controlPath } from '../shims';
 import { State } from '../state';
diff --git a/packages/form/src/connect-array/index.ts b/packages/form/src/connect-array/index.ts
deleted file mode 100644
index 5ceb3b6d..00000000
--- a/packages/form/src/connect-array/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './connect-array.module';
-export * from './connect-array.directive';
-export * from './connect-array-template';
diff --git a/packages/form/src/connect/index.ts b/packages/form/src/connect/index.ts
deleted file mode 100644
index fb8174c7..00000000
--- a/packages/form/src/connect/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './connect-base';
-export * from './connect-reactive';
-export * from './connect.module';
-export * from './connect.directive';
diff --git a/packages/form/src/index.ts b/packages/form/src/index.ts
index d942e12e..095733d6 100644
--- a/packages/form/src/index.ts
+++ b/packages/form/src/index.ts
@@ -3,6 +3,11 @@ export * from './form-reducer';
 export * from './form-exception';
 export * from './form-store';
 export * from './configure';
-export * from './connect';
-export * from './connect-array';
+export * from './connect/connect-base';
+export * from './connect/connect-reactive';
+export * from './connect/connect.directive';
+export * from './connect/connect.module';
+export * from './connect-array/connect-array-template';
+export * from './connect-array/connect-array.directive';
+export * from './connect-array/connect-array.module';
 export * from './module';
diff --git a/packages/form/src/module.ts b/packages/form/src/module.ts
index e6aae22b..0c6027cf 100644
--- a/packages/form/src/module.ts
+++ b/packages/form/src/module.ts
@@ -2,8 +2,8 @@ import { NgRedux } from '@angular-redux/store';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-import { NgReduxFormConnectModule } from './connect';
-import { NgReduxFormConnectArrayModule } from './connect-array';
+import { NgReduxFormConnectArrayModule } from './connect-array/connect-array.module';
+import { NgReduxFormConnectModule } from './connect/connect.module';
 import { FormStore } from './form-store';
 
 export function formStoreFactory(ngRedux: NgRedux<any>) {