diff --git a/bin/javascript-es6-petstore.sh b/bin/javascript-es6-petstore.sh
index 939e51b9446..a68f2c5b5ca 100755
--- a/bin/javascript-es6-petstore.sh
+++ b/bin/javascript-es6-petstore.sh
@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript-es6 \
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \
 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \
 -o samples/client/petstore/javascript-es6 \
 --additional-properties useEs6=true"
diff --git a/bin/javascript-promise-es6-petstore.sh b/bin/javascript-promise-es6-petstore.sh
index 410d1c8e4d8..e88788ddde5 100755
--- a/bin/javascript-promise-es6-petstore.sh
+++ b/bin/javascript-promise-es6-petstore.sh
@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript-es6 \
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \
 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \
 -o samples/client/petstore/javascript-promise-es6 \
 --additional-properties useEs6=true \
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
index 854f0838925..88d8ef0e550 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
@@ -105,7 +105,8 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         modelTestTemplateFiles.put("model_test.mustache", ".js");
         apiTemplateFiles.put("api.mustache", ".js");
         apiTestTemplateFiles.put("api_test.mustache", ".js");
-        embeddedTemplateDir = templateDir = "Javascript";
+        // subfolder Javascript/es6
+        embeddedTemplateDir = templateDir = "Javascript" + File.separator + "es6";
         apiPackage = "api";
         modelPackage = "model";
         modelDocTemplateFiles.put("model_doc.mustache", ".md");
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/.babelrc.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/.babelrc.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/.babelrc.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/.babelrc.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/ApiClient.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/ApiClient.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/README.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/README.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/README.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/README.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/api.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/api.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/api.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/api.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/api_doc.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/api_doc.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/api_doc.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/api_doc.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/api_test.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/api_test.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/api_test.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/api_test.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/enumClass.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/enumClass.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/enumClass.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/git_push.sh.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/git_push.sh.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/git_push.sh.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/gitignore.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/gitignore.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/gitignore.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/gitignore.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/index.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/index.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/index.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/index.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/licenseInfo.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/licenseInfo.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/licenseInfo.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/mocha.opts b/modules/swagger-codegen/src/main/resources/Javascript/es6/mocha.opts
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/mocha.opts
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/mocha.opts
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/model.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/model.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/model.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/model.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/model_doc.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/model_doc.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/model_doc.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/model_doc.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/model_test.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/model_test.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/model_test.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/model_test.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/package.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/package.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/package.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/package.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_enum_class.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_enum_class.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_enum_class.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_enum_class.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_generic.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_generic.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_generic.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_generic.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_inner_enum.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_inner_enum.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_inner_enum.mustache
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_inner_enum.mustache
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/travis.yml b/modules/swagger-codegen/src/main/resources/Javascript/es6/travis.yml
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/Javascript-es6/travis.yml
rename to modules/swagger-codegen/src/main/resources/Javascript/es6/travis.yml