diff --git a/modules/angular2/forms.js b/modules/angular2/forms.js
index 0b49600a6a..d33e0458ec 100644
--- a/modules/angular2/forms.js
+++ b/modules/angular2/forms.js
@@ -1,2 +1,2 @@
-export * from './src/model';
-export * from './src/decorators';
+export * from './src/forms/model';
+export * from './src/forms/decorators';
diff --git a/modules/angular2/test/forms/model_spec.js b/modules/angular2/test/forms/model_spec.js
index ae283347e7..d0d858704b 100644
--- a/modules/angular2/test/forms/model_spec.js
+++ b/modules/angular2/test/forms/model_spec.js
@@ -1,5 +1,5 @@
-import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach, el} from 'test_lib/test_lib';
-import {ControlGroup, Control} from 'forms/forms';
+import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach, el} from 'angular2/test_lib';
+import {ControlGroup, Control} from 'angular2/forms';
 
 export function main() {
   describe("ControlGroup", () => {