diff --git a/README.md b/README.md
index 76db975..0dec6ff 100644
--- a/README.md
+++ b/README.md
@@ -254,12 +254,13 @@ dist/
 	|  |  |- lib.service.d.ts             # Type definitions
 	|- CHANGELOG.md                       #
 	|- my-ngx-library.d.ts                # Type definitions
-	|- my-ngx-library.es5.js              # ESM+ES5 flat module (FESM5)
-	|- my-ngx-library.es5.js.map          # ESM+ES5 flat module (FESM5) sourcemap
-	|- my-ngx-library.metadata.json       # Metadata used by AOT compiler
-	|- my-ngx-library.js                  # ESM+ES2015 flat module (FESM15)
-	|- my-ngx-library.js.map              # ESM+ES2015 flat module (FESM15) sourcemap
 	|- my-ngx-library.metadata.json       # Metadata used by AOT compiler
+  |- [esm5]/                            # Optional Directory containing ESM5 files (for ng >=v5 only)
+	|  |- my-ngx-library.es5.js           # ESM+ES5 flat module (FESM5)
+	|  |- my-ngx-library.es5.js.map       # ESM+ES5 flat module (FESM5) sourcemap
+  |- [esm2015]/                         # Optional Directory containing ESM2015 files (for ng >=v5 only)
+	|  |- my-ngx-library.js              # ESM+ES2015 flat module (FESM15)
+	|  |- my-ngx-library.js.map          # ESM+ES2015 flat module (FESM15) sourcemap
 	|- LICENSE                            #
 	|- lib.module.d.ts                    # Type definitions
 	|- package.json                       # Package.json, with just the right dependencies & peerDependencies
diff --git a/app/templates/_gulpfile.js b/app/templates/_gulpfile.js
index 4625cae..f6a40a0 100644
--- a/app/templates/_gulpfile.js
+++ b/app/templates/_gulpfile.js
@@ -325,12 +325,12 @@ gulp.task('npm-package', (cb) => {
   //only copy needed properties from project's package json
   fieldsToCopy.forEach((field) => { targetPkgJson[field] = pkgJson[field]; });
 
-  targetPkgJson['main'] = `bundles/${config.unscopedLibraryName}.umd.js`;<% if(ngVersion === '2.0.0'){ %>
-  targetPkgJson['module'] = `index.js`;
-  targetPkgJson['typings'] = `index.d.ts`;<% } else {%>
-  targetPkgJson['module'] = `${config.libraryName}.es5.js`;
-  targetPkgJson['es2015'] = `${config.libraryName}.js`;
-  targetPkgJson['typings'] = `${config.unscopedLibraryName}.d.ts`;<% } %>
+  targetPkgJson['main'] = `./bundles/${config.unscopedLibraryName}.umd.js`;<% if(ngVersion === '2.0.0'){ %>
+  targetPkgJson['module'] = `./index.js`;
+  targetPkgJson['typings'] = `./index.d.ts`;<% } else {%>
+  targetPkgJson['module'] = `./<% if(ngVersionMin >= 5){ %>esm5/${config.unscopedLibraryName}.es5.js<% } else {%>${config.libraryName}.es5.js<% } %>`;
+  targetPkgJson['es2015'] = `./<% if(ngVersionMin >= 5){ %>esm2015/${config.unscopedLibraryName}.js<% } else {%>${config.libraryName}.js<% } %>`;
+  targetPkgJson['typings'] = `./${config.unscopedLibraryName}.d.ts`;<% } %>
 
   // defines project's dependencies as 'peerDependencies' for final users
   targetPkgJson.peerDependencies = {};
@@ -422,14 +422,14 @@ gulp.task('rollup-bundle', (cb) => {
     // ESM+ES5 flat module bundle.
     const fesm5config = Object.assign({}, rollupBaseConfig, {
       input: es5Input,
-      file: path.join(distFolder, `${config.libraryName}.es5.js`),
+      file: path.join(distFolder,<% if(ngVersionMin >= 5){ %> 'esm5', `${config.unscopedLibraryName}.es5.js`<% } else {%> `${config.libraryName}.es5.js`<% } %>),
       format: 'es'
     });
 
     // ESM+ES2015 flat module bundle.
     const fesm2015config = Object.assign({}, rollupBaseConfig, {
       input: es2015Input,
-      file: path.join(distFolder, `${config.libraryName}.js`),
+      file: path.join(distFolder,<% if(ngVersionMin >= 5){ %> 'esm2015', `${config.unscopedLibraryName}.js`<% } else {%> `${config.libraryName}.js`<% } %>),
       format: 'es'
     });<% } %>