diff --git a/docs/src/pages/basics/guide-angular/index.md b/docs/src/pages/basics/guide-angular/index.md
index 7487e69bc5c1..cd65bca83277 100644
--- a/docs/src/pages/basics/guide-angular/index.md
+++ b/docs/src/pages/basics/guide-angular/index.md
@@ -63,19 +63,19 @@ To do that, simply create a file at `.storybook/config.js` with the following co
 import { configure } from '@storybook/angular';
 
 function loadStories() {
-  require('../stories/index.ts');
+  require('../src/stories/index.ts');
 }
 
 configure(loadStories, module);
 ```
 
-That'll load stories in `../stories/index.ts`.
+That'll load stories in `../src/stories/index.ts`.
 
 Just like that, you can load stories from wherever you want to.
 
 ## Write your stories
 
-Now you can write some stories inside the `../stories/index.ts` file, like this:
+Now you can write some stories inside the `../src/stories/index.ts` file, like this:
 
 ```js
 import { storiesOf } from '@storybook/angular';
diff --git a/lib/cli/generators/ANGULAR/template/.storybook/config.js b/lib/cli/generators/ANGULAR/template/.storybook/config.js
index 5d8908b90240..bc9d1d6cd9aa 100644
--- a/lib/cli/generators/ANGULAR/template/.storybook/config.js
+++ b/lib/cli/generators/ANGULAR/template/.storybook/config.js
@@ -3,7 +3,7 @@
 import { configure } from '@storybook/angular';
 
 // automatically import all files ending in *.stories.ts
-const req = require.context('../stories', true, /.stories.ts$/);
+const req = require.context('../src/stories', true, /.stories.ts$/);
 function loadStories() {
   req.keys().forEach((filename) => req(filename));
 }
diff --git a/lib/cli/generators/ANGULAR/template/stories/index.stories.ts b/lib/cli/generators/ANGULAR/template/src/stories/index.stories.ts
similarity index 100%
rename from lib/cli/generators/ANGULAR/template/stories/index.stories.ts
rename to lib/cli/generators/ANGULAR/template/src/stories/index.stories.ts
diff --git a/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json b/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json
new file mode 100644
index 000000000000..39ba8dbacbbe
--- /dev/null
+++ b/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "baseUrl": "./",
+    "module": "es2015",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/lib/cli/test/fixtures/angular-cli/src/tsconfig.json b/lib/cli/test/fixtures/angular-cli/src/tsconfig.json
deleted file mode 100644
index 3c43903cfdd1..000000000000
--- a/lib/cli/test/fixtures/angular-cli/src/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../tsconfig.json"
-}
diff --git a/lib/cli/test/fixtures/angular-cli/tsconfig.json b/lib/cli/test/fixtures/angular-cli/tsconfig.json
index 5d99906987d1..a6c016bf38ad 100644
--- a/lib/cli/test/fixtures/angular-cli/tsconfig.json
+++ b/lib/cli/test/fixtures/angular-cli/tsconfig.json
@@ -1,23 +1,19 @@
-
-
 {
+  "compileOnSave": false,
   "compilerOptions": {
-    "baseUrl": "",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
     "declaration": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "mapRoot": "./",
-    "module": "es6",
-    "moduleResolution": "node",
-    "outDir": "../dist/out-tsc",
-    "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "../node_modules/@types"
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
     ]
-  },
-  "exclude": [
-    "node_modules"
-  ]
+  }
 }
diff --git a/lib/cli/test/snapshots/angular-cli/.storybook/config.js b/lib/cli/test/snapshots/angular-cli/.storybook/config.js
index 5d8908b90240..bc9d1d6cd9aa 100644
--- a/lib/cli/test/snapshots/angular-cli/.storybook/config.js
+++ b/lib/cli/test/snapshots/angular-cli/.storybook/config.js
@@ -3,7 +3,7 @@
 import { configure } from '@storybook/angular';
 
 // automatically import all files ending in *.stories.ts
-const req = require.context('../stories', true, /.stories.ts$/);
+const req = require.context('../src/stories', true, /.stories.ts$/);
 function loadStories() {
   req.keys().forEach((filename) => req(filename));
 }
diff --git a/lib/cli/test/snapshots/angular-cli/stories/index.stories.ts b/lib/cli/test/snapshots/angular-cli/src/stories/index.stories.ts
similarity index 100%
rename from lib/cli/test/snapshots/angular-cli/stories/index.stories.ts
rename to lib/cli/test/snapshots/angular-cli/src/stories/index.stories.ts
diff --git a/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json b/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json
new file mode 100644
index 000000000000..39ba8dbacbbe
--- /dev/null
+++ b/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "baseUrl": "./",
+    "module": "es2015",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/lib/cli/test/snapshots/angular-cli/src/tsconfig.json b/lib/cli/test/snapshots/angular-cli/src/tsconfig.json
deleted file mode 100644
index 3c43903cfdd1..000000000000
--- a/lib/cli/test/snapshots/angular-cli/src/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../tsconfig.json"
-}
diff --git a/lib/cli/test/snapshots/angular-cli/tsconfig.json b/lib/cli/test/snapshots/angular-cli/tsconfig.json
index 5d99906987d1..a6c016bf38ad 100644
--- a/lib/cli/test/snapshots/angular-cli/tsconfig.json
+++ b/lib/cli/test/snapshots/angular-cli/tsconfig.json
@@ -1,23 +1,19 @@
-
-
 {
+  "compileOnSave": false,
   "compilerOptions": {
-    "baseUrl": "",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
     "declaration": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "mapRoot": "./",
-    "module": "es6",
-    "moduleResolution": "node",
-    "outDir": "../dist/out-tsc",
-    "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "../node_modules/@types"
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
     ]
-  },
-  "exclude": [
-    "node_modules"
-  ]
+  }
 }