diff --git a/appveyor.yml b/appveyor.yml
index ab63a1ed443..b69ac912f94 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,5 +38,5 @@ test_script:
   # generate all petstore clients
   - .\bin\windows\run-all-petstore.cmd
 cache:
-  - C:\maven\
-  - C:\Users\appveyor\.m2
+#  - C:\maven\
+#  - C:\Users\appveyor\.m2
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
index 71f7d32c5eb..e9fd3cfd23a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -3,10 +3,10 @@ package io.swagger.codegen.languages;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
-import java.util.List;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeSet;
 
@@ -42,7 +42,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
                 // Typescript reserved words
                 "abstract", "await", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield"));
 
-        languageSpecificPrimitives = new HashSet<String>(Arrays.asList(
+        languageSpecificPrimitives = new HashSet<>(Arrays.asList(
                 "string",
                 "String",
                 "boolean",
@@ -55,8 +55,11 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
                 "Array",
                 "Date",
                 "number",
-                "any"
-        ));
+                "any",
+                "File",
+                "Error",
+                "Map"
+                ));
         instantiationTypes.put("array", "Array");
 
         typeMapping = new HashMap<String, String>();
@@ -81,6 +84,8 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
         typeMapping.put("binary", "string");
         typeMapping.put("ByteArray", "string");
         typeMapping.put("UUID", "string");
+        typeMapping.put("File", "any");
+        typeMapping.put("Error", "Error");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase"));
         cliOptions.add(new CliOption(CodegenConstants.SUPPORTS_ES6, CodegenConstants.SUPPORTS_ES6_DESC).defaultValue("false"));
@@ -102,83 +107,83 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
     }
 
 
-	@Override
-	public CodegenType getTag() {
-	    return CodegenType.CLIENT;
-	}
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
 
-	@Override
-	public String escapeReservedWord(String name) {
-		return "_" + name;
-	}
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
 
-	@Override
-	public String apiFileFolder() {
-		return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
-	}
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
 
-	@Override
-	public String modelFileFolder() {
-		return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
-	}
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
 
-	@Override
-        public String toParamName(String name) {
-            // replace - with _ e.g. created-at => created_at
-            name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-
-            // if it's all uppper case, do nothing
-            if (name.matches("^[A-Z_]*$"))
-                return name;
-
-            // camelize the variable name
-            // pet_id => petId
-            name = camelize(name, true);
-
-            // for reserved word or word starting with number, append _
-            if (isReservedWord(name) || name.matches("^\\d.*"))
-                name = escapeReservedWord(name);
+    @Override
+    public String toParamName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$"))
             return name;
+
+        // camelize the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*"))
+            name = escapeReservedWord(name);
+
+        return name;
+    }
+
+    @Override
+    public String toVarName(String name) {
+            // should be the same as variable name
+            return getNameUsingModelPropertyNaming(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
         }
 
-	@Override
-	public String toVarName(String name) {
-		// should be the same as variable name
-		return getNameUsingModelPropertyNaming(name);
-	}
-
-	@Override
-        public String toModelName(String name) {
-            name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-
-            if (!StringUtils.isEmpty(modelNamePrefix)) {
-                name = modelNamePrefix + "_" + name;
-            }
-
-            if (!StringUtils.isEmpty(modelNameSuffix)) {
-                name = name + "_" + modelNameSuffix;
-            }
-
-            // model name cannot use reserved keyword, e.g. return
-            if (isReservedWord(name)) {
-                String modelName = camelize("model_" + name);
-                LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
-                return modelName;
-            }
-
-            // model name starts with number
-            if (name.matches("^\\d.*")) {
-                String modelName = camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
-                LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
-                return modelName;
-            }
-
-            // camelize the model name
-            // phone_number => PhoneNumber
-            return camelize(name);
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            name = name + "_" + modelNameSuffix;
         }
 
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            String modelName = camelize("model_" + name);
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            String modelName = camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
     @Override
     public String toModelFilename(String name) {
         // should be the same as the model name
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
index aeb5d774add..989d339ccdb 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
@@ -2,9 +2,12 @@ package io.swagger.codegen.languages;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenModel;
@@ -37,7 +40,7 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
 
         embeddedTemplateDir = templateDir = "typescript-angular2";
         modelTemplateFiles.put("model.mustache", ".ts");
-        apiTemplateFiles.put("api.mustache", ".ts");
+        apiTemplateFiles.put("api.service.mustache", ".ts");
         typeMapping.put("Date","Date");
         apiPackage = "api";
         modelPackage = "model";
@@ -71,6 +74,8 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
         supportingFiles.add(new SupportingFile("models.mustache", modelPackage().replace('.', File.separatorChar), "models.ts"));
         supportingFiles.add(new SupportingFile("apis.mustache", apiPackage().replace('.', File.separatorChar), "api.ts"));
         supportingFiles.add(new SupportingFile("index.mustache", getIndexDirectory(), "index.ts"));
+        supportingFiles.add(new SupportingFile("api.module.mustache", getIndexDirectory(), "api.module.ts"));
+        supportingFiles.add(new SupportingFile("rxjs-operators.mustache", getIndexDirectory(), "rxjs-operators.ts"));        
         supportingFiles.add(new SupportingFile("configuration.mustache", getIndexDirectory(), "configuration.ts"));
         supportingFiles.add(new SupportingFile("variables.mustache", getIndexDirectory(), "variables.ts"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
@@ -135,19 +140,13 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
         if(languageSpecificPrimitives.contains(swaggerType)) {
             return swaggerType;
         }
-        return addModelPrefix(swaggerType);
+        applyLocalTypeMapping(swaggerType);
+        return swaggerType;
     }
 
-    private String addModelPrefix(String swaggerType) {
-        String type = null;
-        if (typeMapping.containsKey(swaggerType)) {
-            type = typeMapping.get(swaggerType);
-        } else {
-            type = swaggerType;
-        }
-
-        if (!startsWithLanguageSpecificPrimitiv(type)) {
-            type = "models." + swaggerType;
+    private String applyLocalTypeMapping(String type) {
+         if (typeMapping.containsKey(type)) {
+            type = typeMapping.get(type);
         }
         return type;
     }
@@ -164,12 +163,16 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
     @Override
     public void postProcessParameter(CodegenParameter parameter) {
         super.postProcessParameter(parameter);
-        parameter.dataType = addModelPrefix(parameter.dataType);
+        parameter.dataType = applyLocalTypeMapping(parameter.dataType);
     }
 
     @Override
     public Map<String, Object> postProcessOperations(Map<String, Object> operations) {
         Map<String, Object> objs = (Map<String, Object>) operations.get("operations");
+
+        // Add filename information for api imports
+        objs.put("apiFilename", getApiFilenameFromClassname(objs.get("classname").toString()));
+
         List<CodegenOperation> ops = (List<CodegenOperation>) objs.get("operation");
         for (CodegenOperation op : ops) {
             // Convert httpMethod to Angular's RequestMethod enum
@@ -204,9 +207,73 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
             op.path = op.path.replaceAll("\\{(.*?)\\}", "\\$\\{$1\\}");
         }
 
+        // Add additional filename information for model imports in the services
+        List<Map<String, Object>> imports = (List<Map<String, Object>>) operations.get("imports");
+        for(Map<String, Object> im : imports) {
+            im.put("filename", im.get("import"));
+            im.put("classname", getModelnameFromModelFilename(im.get("filename").toString()));
+        }
+
         return operations;
     }
 
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        Map<String, Object> result = super.postProcessModels(objs);
+
+        // Add additional filename information for imports
+        List<Object> models = (List<Object>) postProcessModelsEnum(result).get("models");
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            mo.put("tsImports", toTsImports(cm.imports));
+        }
+        
+        return result;
+    }
+
+    private List<Map<String, String>> toTsImports(Set<String> imports) {
+            List<Map<String, String>> tsImports = new ArrayList<>();
+            for(String im : imports) {
+                    HashMap<String, String> tsImport = new HashMap<>();
+                    tsImport.put("classname", im);
+                    tsImport.put("filename", toModelFilename(im));
+                    tsImports.add(tsImport);
+            }
+            return tsImports;
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultService";
+        }
+        return initialCaps(name) + "Service";
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        if (name.length() == 0) {
+            return "default.service";
+        }
+        return camelize(name, true) + ".service";
+    }
+
+    @Override
+    public String toApiImport(String name) {
+        return apiPackage() + "/" + toApiFilename(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        return camelize(toModelName(name), true);
+    }
+
+    @Override
+    public String toModelImport(String name) {
+        return modelPackage() + "/" + toModelFilename(name);
+    }
+
     public String getNpmName() {
         return npmName;
     }
@@ -230,4 +297,14 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
     public void setNpmRepository(String npmRepository) {
         this.npmRepository = npmRepository;
     }
+
+    private String getApiFilenameFromClassname(String classname) {
+        String name = classname.substring(0, classname.length() - "Service".length());
+        return toApiFilename(name);
+    }
+
+    private String getModelnameFromModelFilename(String filename) {
+        String name = filename.substring((modelPackage() + "/").length());
+        return camelize(name);
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.module.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.module.mustache
new file mode 100644
index 00000000000..3bb4b8e7d01
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.module.mustache
@@ -0,0 +1,25 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
+
+{{#apiInfo}}
+{{#apis}}
+import { {{classname}} } from './{{importPath}}';
+{{/apis}}
+{{/apiInfo}}
+
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}}, {{/hasMore}}{{/apis}}{{/apiInfo}} ]
+})
+export class ApiModule {
+    public static forConfig(configuration: Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useValue: configuration}]
+        }
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.service.mustache
similarity index 97%
rename from modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache
rename to modules/swagger-codegen/src/main/resources/typescript-angular2/api.service.mustache
index 00a013f5675..775612c16a3 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/api.service.mustache
@@ -5,9 +5,12 @@ import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http
 import { Response, ResponseContentType }                     from '@angular/http';
 
 import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
+import '../rxjs-operators';
+
+{{#imports}}
+import { {{classname}} } from '../{{filename}}';
+{{/imports}}
 
-import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
 import { Configuration }                                     from '../configuration';
 
@@ -32,6 +35,7 @@ export class {{classname}} {
         }
         if (configuration) {
             this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
         }
     }
 	
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache
index 9a39b864538..09109130871 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache
@@ -1,7 +1,7 @@
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
-export * from './{{ classname }}';
+export * from './{{ apiFilename }}';
 {{/operations}}
 {{/apis}}
 {{/apiInfo}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
index 94989933b63..ec087d2b0c8 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
@@ -1,6 +1,24 @@
+export interface ConfigurationParameters {
+	apiKey?: string;
+	username?: string;
+	password?: string;
+	accessToken?: string;
+	basePath?: string;
+}
+
 export class Configuration {
-    apiKey: string;
-    username: string;
-    password: string;
-    accessToken: string;
-}
\ No newline at end of file
+	apiKey: string;
+	username: string;
+	password: string;
+	accessToken: string;
+	basePath: string;
+
+
+	constructor(configurationParameters: ConfigurationParameters = {}) {
+		this.apiKey = configurationParameters.apiKey;
+		this.username = configurationParameters.username;
+		this.password = configurationParameters.password;
+		this.accessToken = configurationParameters.accessToken;
+		this.basePath = configurationParameters.basePath;
+	}
+}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache
index d097c728017..c312b70fa3e 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/index.mustache
@@ -1,4 +1,5 @@
 export * from './api/api';
 export * from './model/models';
 export * from './variables';
-export * from './configuration';
\ No newline at end of file
+export * from './configuration';
+export * from './api.module';
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache
index d0e544c4e2f..303bf67d9aa 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache
@@ -1,7 +1,10 @@
 {{>licenseInfo}}
 {{#models}}
 {{#model}}
-import * as models from './models';
+{{#tsImports}}
+import { {{classname}} } from './{{filename}}';
+{{/tsImports}}
+
 
 {{#description}}
 /**
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache
index ace053bd55b..02a39c248c4 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache
@@ -1,5 +1,5 @@
 {{#models}}
 {{#model}}
-export * from './{{{ classname }}}';
+export * from './{{{ classFilename }}}';
 {{/model}}
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
index 5978cd38d32..8bb6cf8e80f 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
@@ -10,30 +10,29 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "typings install && tsc --outDir dist/",
-    "postinstall": "npm run build"
+    "build": "typings install && tsc --outDir dist/"
   },
   "peerDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
-    "@angular/http": "^2.0.0-rc.5",
-    "@angular/common": "^2.0.0-rc.5",
-    "@angular/compiler": "^2.0.0-rc.5",
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "5.0.0-beta.12",
     "zone.js": "^0.6.17"
   },
   "devDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
-    "@angular/http": "^2.0.0-rc.5",
-    "@angular/common": "^2.0.0-rc.5",
-    "@angular/compiler": "^2.0.0-rc.5",
-    "@angular/platform-browser": "^2.0.0-rc.5",
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "@angular/platform-browser": "^2.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.17",  
-    "typescript": "^1.8.10",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.17",
+    "typescript": "^2.0.0",
     "typings": "^1.3.2"
   }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/rxjs-operators.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/rxjs-operators.mustache
new file mode 100644
index 00000000000..5659cd0694f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/rxjs-operators.mustache
@@ -0,0 +1,11 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
index 07fbdf7e1b1..e1f949692b6 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
@@ -1,27 +1,28 @@
 {
-    "compilerOptions": {
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "noImplicitAny": false,
-        "suppressImplicitAnyIndexErrors": true,
-        "target": "es5",
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "removeComments": true,
-        "sourceMap": true,
-        "outDir": "./lib",
-        "noLib": false,
-        "declaration": true
-    },
-    "exclude": [
-        "node_modules",
-        "typings/main.d.ts",
-        "typings/main",
-        "lib"
-    ],
-    "filesGlob": [
-        "./model/*.ts",
-        "./api/*.ts",
-        "typings/browser.d.ts"
-    ]
+  "compilerOptions": {
+	"emitDecoratorMetadata": true,
+	"experimentalDecorators": true,
+	"noImplicitAny": false,
+	"suppressImplicitAnyIndexErrors": true,
+	"target": "es5",
+	"module": "commonjs",
+	"moduleResolution": "node",
+	"removeComments": true,
+	"sourceMap": true,
+	"outDir": "./lib",
+	"noLib": false,
+	"declaration": true
+  },
+  "exclude": [
+	"node_modules",
+	"typings/main.d.ts",
+	"typings/main",
+	"lib",
+	"dist"
+  ],
+  "filesGlob": [
+	"./model/*.ts",
+	"./api/*.ts",
+	"typings/browser.d.ts"
+  ]
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java
index 8aaa127c6d8..e65340b55bf 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java
@@ -1,17 +1,17 @@
 package io.swagger.codegen;
 
-import org.testng.annotations.Test;
-import org.testng.reporters.Files;
+import static io.swagger.codegen.testutils.AssertFile.assertPathEqualsRecursively;
 
 import java.io.IOException;
 import java.util.Map;
 
+import org.testng.annotations.Test;
+import org.testng.reporters.Files;
+
 import io.swagger.codegen.testutils.IntegrationTestPathsConfig;
 import io.swagger.models.Swagger;
 import io.swagger.parser.SwaggerParser;
 
-import static io.swagger.codegen.testutils.AssertFile.assertPathEqualsRecursively;
-
 public abstract class AbstractIntegrationTest {
 
     protected abstract IntegrationTestPathsConfig getIntegrationTestPathsConfig();
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
index 685495f03c2..90bb6c343ba 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
@@ -1,10 +1,10 @@
 package io.swagger.codegen.typescript.typescriptangular2;
 
-import com.google.common.collect.Sets;
-
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.google.common.collect.Sets;
+
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.DefaultCodegen;
@@ -119,10 +119,10 @@ public class TypeScriptAngular2ModelTest {
 
         final CodegenProperty property1 = cm.vars.get(0);
         Assert.assertEquals(property1.baseName, "children");
-        Assert.assertEquals(property1.datatype, "models.Children");
+        Assert.assertEquals(property1.datatype, "Children");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.defaultValue, "null");
-        Assert.assertEquals(property1.baseType, "models.Children");
+        Assert.assertEquals(property1.baseType, "Children");
         Assert.assertNull(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
@@ -143,8 +143,8 @@ public class TypeScriptAngular2ModelTest {
 
         final CodegenProperty property1 = cm.vars.get(0);
         Assert.assertEquals(property1.baseName, "children");
-        Assert.assertEquals(property1.complexType, "models.Children");
-        Assert.assertEquals(property1.datatype, "Array<models.Children>");
+        Assert.assertEquals(property1.complexType, "Children");
+        Assert.assertEquals(property1.datatype, "Array<Children>");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Array");
         Assert.assertNull(property1.required);
@@ -178,7 +178,7 @@ public class TypeScriptAngular2ModelTest {
         Assert.assertEquals(cm.description, "a map model");
         Assert.assertEquals(cm.vars.size(), 0);
         Assert.assertEquals(cm.imports.size(), 1);
-        Assert.assertEquals(cm.additionalPropertiesType, "models.Children");
-        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("models.Children")).size(), 1);
+        Assert.assertEquals(cm.additionalPropertiesType, "Children");
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2ArrayAndObjectTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2ArrayAndObjectIntegrationTest.java
similarity index 90%
rename from modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2ArrayAndObjectTest.java
rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2ArrayAndObjectIntegrationTest.java
index e60f06ca57d..6f0c861866e 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2ArrayAndObjectTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2ArrayAndObjectIntegrationTest.java
@@ -8,7 +8,7 @@ import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen;
 import io.swagger.codegen.testutils.IntegrationTestPathsConfig;
 
-public class TypescriptAngular2ArrayAndObjectTest extends AbstractIntegrationTest {
+public class TypescriptAngular2ArrayAndObjectIntegrationTest extends AbstractIntegrationTest {
 
     @Override
     protected CodegenConfig getCodegenConfig() {
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2PestoreIntegrationTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2PestoreIntegrationTest.java
new file mode 100644
index 00000000000..19461664c37
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypescriptAngular2PestoreIntegrationTest.java
@@ -0,0 +1,32 @@
+package io.swagger.codegen.typescript.typescriptangular2;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.swagger.codegen.AbstractIntegrationTest;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.languages.TypeScriptAngular2ClientCodegen;
+import io.swagger.codegen.testutils.IntegrationTestPathsConfig;
+
+public class TypescriptAngular2PestoreIntegrationTest extends AbstractIntegrationTest {
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return new TypeScriptAngular2ClientCodegen();
+    }
+
+    @Override
+    protected Map<String, String> configProperties() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("npmName", "petstore-integration-test");
+        properties.put("npmVersion", "1.0.3");
+        properties.put("snapshot", "false");
+
+        return properties;
+    }
+
+    @Override
+    protected IntegrationTestPathsConfig getIntegrationTestPathsConfig() {
+        return new IntegrationTestPathsConfig("typescript/petstore");
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore
new file mode 100644
index 00000000000..35e2fb2b02e
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore
@@ -0,0 +1,3 @@
+wwwroot/*.js
+node_modules
+typings
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/LICENSE b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/LICENSE
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md
index b5338574869..654efaf000b 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md
@@ -31,3 +31,14 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 In your angular2 project:
 
 TODO: paste example.
+
+### Set service base path
+If different than the generated base path, during app bootstrap, you can provide the base path to your service. 
+
+```
+import { BASE_PATH } from './path-to-swagger-gen-service/index';
+
+bootstrap(AppComponent, [
+    { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
+]);
+```  
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts
new file mode 100644
index 00000000000..bb9f292627a
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts
@@ -0,0 +1,21 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
+
+import { UserService } from './api/user.service';
+
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ UserService ]
+})
+export class ApiModule {
+    public static forConfig(configuration: Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useValue: configuration}]
+        }
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/UserApi.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/UserApi.ts
deleted file mode 100644
index 77b6c013a8b..00000000000
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/UserApi.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {Http, Headers, RequestOptionsArgs, Response, URLSearchParams} from '@angular/http';
-import {Injectable, Optional} from '@angular/core';
-import {Observable} from 'rxjs/Observable';
-import * as models from '../model/models';
-import 'rxjs/Rx';
-
-/* tslint:disable:no-unused-variable member-ordering */
-
-'use strict';
-
-@Injectable()
-export class UserApi {
-    protected basePath = 'http://additional-properties.swagger.io/v2';
-    public defaultHeaders : Headers = new Headers();
-
-    constructor(protected http: Http, @Optional() basePath: string) {
-        if (basePath) {
-            this.basePath = basePath;
-        }
-    }
-
-    /**
-     * Add a new User to the store
-     * 
-     * @param body User object that needs to be added to the store
-     */
-    public addUser (body?: models.User, extraHttpRequestParams?: any ) : Observable<{}> {
-        const path = this.basePath + '/user';
-
-        let queryParameters: any = ""; // This should probably be an object in the future
-        let headerParams = this.defaultHeaders;
-        let requestOptions: RequestOptionsArgs = {
-            method: 'POST',
-            headers: headerParams,
-            search: queryParameters
-        };
-        requestOptions.body = JSON.stringify(body);
-
-        return this.http.request(path, requestOptions)
-            .map((response: Response) => response.json());
-    }
-
-    /**
-     * Update an existing User
-     * 
-     * @param body User object that needs to be added to the store
-     */
-    public updateUser (body?: models.User, extraHttpRequestParams?: any ) : Observable<{}> {
-        const path = this.basePath + '/user';
-
-        let queryParameters: any = ""; // This should probably be an object in the future
-        let headerParams = this.defaultHeaders;
-        let requestOptions: RequestOptionsArgs = {
-            method: 'PUT',
-            headers: headerParams,
-            search: queryParameters
-        };
-        requestOptions.body = JSON.stringify(body);
-
-        return this.http.request(path, requestOptions)
-            .map((response: Response) => response.json());
-    }
-
-}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts
index d3bd8432806..e17ee5c7aca 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts
@@ -1 +1 @@
-export * from './UserApi';
+export * from './user.service';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts
new file mode 100644
index 00000000000..3d0a08ea2f1
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts
@@ -0,0 +1,166 @@
+/**
+ * Swagger Additional Properties
+ * This is a test spec
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { Http, Headers, URLSearchParams }                    from '@angular/http';
+import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
+import { Response, ResponseContentType }                     from '@angular/http';
+
+import { Observable }                                        from 'rxjs/Observable';
+import '../rxjs-operators';
+
+import { User } from '../model/user';
+
+import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+
+@Injectable()
+export class UserService {
+    protected basePath = 'http://additional-properties.swagger.io/v2';
+    public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
+
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * Add a new User to the store
+     * 
+     * @param body User object that needs to be added to the store
+     */
+    public addUser(body?: User, extraHttpRequestParams?: any): Observable<{}> {
+        return this.addUserWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Update an existing User
+     * 
+     * @param body User object that needs to be added to the store
+     */
+    public updateUser(body?: User, extraHttpRequestParams?: any): Observable<{}> {
+        return this.updateUserWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+
+    /**
+     * Add a new User to the store
+     * 
+     * @param body User object that needs to be added to the store
+     */
+    public addUserWithHttpInfo(body?: User, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json'
+        ];
+        
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Update an existing User
+     * 
+     * @param body User object that needs to be added to the store
+     */
+    public updateUserWithHttpInfo(body?: User, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json'
+        ];
+        
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Put,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts
new file mode 100644
index 00000000000..ec087d2b0c8
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts
@@ -0,0 +1,24 @@
+export interface ConfigurationParameters {
+	apiKey?: string;
+	username?: string;
+	password?: string;
+	accessToken?: string;
+	basePath?: string;
+}
+
+export class Configuration {
+	apiKey: string;
+	username: string;
+	password: string;
+	accessToken: string;
+	basePath: string;
+
+
+	constructor(configurationParameters: ConfigurationParameters = {}) {
+		this.apiKey = configurationParameters.apiKey;
+		this.username = configurationParameters.username;
+		this.password = configurationParameters.password;
+		this.accessToken = configurationParameters.accessToken;
+		this.basePath = configurationParameters.basePath;
+	}
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh
new file mode 100644
index 00000000000..6ca091b49d9
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id=""
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id=""
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note=""
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts
index cdfea183ad3..c312b70fa3e 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts
@@ -1,2 +1,5 @@
 export * from './api/api';
 export * from './model/models';
+export * from './variables';
+export * from './configuration';
+export * from './api.module';
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/User.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/User.ts
deleted file mode 100644
index 66f270cea01..00000000000
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/User.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-import * as models from './models';
-
-export interface User {
-    [key: string]: string | any;
-
-    id?: number;
-
-    /**
-     * User Status
-     */
-    userStatus?: number;
-}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts
index f6b9f36c6e1..e5abc856509 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts
@@ -1 +1 @@
-export * from './User';
+export * from './user';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts
new file mode 100644
index 00000000000..06ff2657bc9
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts
@@ -0,0 +1,37 @@
+/**
+ * Swagger Additional Properties
+ * This is a test spec
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+export interface User {
+    [key: string]: string | any;
+
+    id?: number;
+
+    /**
+     * User Status
+     */
+    userStatus?: number;
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json
index bdd490f27b9..6e30608df67 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json
@@ -7,30 +7,32 @@
     "swagger-client"
   ],
   "license": "Apache-2.0",
-  "files": [
-    "lib"
-  ],
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "typings install && tsc"
+    "build": "typings install && tsc --outDir dist/"
   },
   "peerDependencies": {
-    "@angular/core": "^2.0.0-rc.1",
-    "@angular/http": "^2.0.0-rc.1"
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.17"
   },
   "devDependencies": {
-    "@angular/common": "^2.0.0-rc.1",
-    "@angular/compiler": "^2.0.0-rc.1",
-    "@angular/core": "^2.0.0-rc.1",
-    "@angular/http": "^2.0.0-rc.1",
-    "@angular/platform-browser": "^2.0.0-rc.1",
-    "@angular/platform-browser-dynamic": "^2.0.0-rc.1",
-    "core-js": "^2.3.0",
-    "rxjs": "^5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "typescript": "^1.8.10",
-    "typings": "^0.8.1",
-    "es6-shim": "^0.35.0",
-    "es7-reflect-metadata": "^1.6.0"
-  }}
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "@angular/platform-browser": "^2.0.0",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.17",
+    "typescript": "^2.0.0",
+    "typings": "^1.3.2"
+  }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/rxjs-operators.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/rxjs-operators.ts
new file mode 100644
index 00000000000..5659cd0694f
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/rxjs-operators.ts
@@ -0,0 +1,11 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json
index 07fbdf7e1b1..e1f949692b6 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json
@@ -1,27 +1,28 @@
 {
-    "compilerOptions": {
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "noImplicitAny": false,
-        "suppressImplicitAnyIndexErrors": true,
-        "target": "es5",
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "removeComments": true,
-        "sourceMap": true,
-        "outDir": "./lib",
-        "noLib": false,
-        "declaration": true
-    },
-    "exclude": [
-        "node_modules",
-        "typings/main.d.ts",
-        "typings/main",
-        "lib"
-    ],
-    "filesGlob": [
-        "./model/*.ts",
-        "./api/*.ts",
-        "typings/browser.d.ts"
-    ]
+  "compilerOptions": {
+	"emitDecoratorMetadata": true,
+	"experimentalDecorators": true,
+	"noImplicitAny": false,
+	"suppressImplicitAnyIndexErrors": true,
+	"target": "es5",
+	"module": "commonjs",
+	"moduleResolution": "node",
+	"removeComments": true,
+	"sourceMap": true,
+	"outDir": "./lib",
+	"noLib": false,
+	"declaration": true
+  },
+  "exclude": [
+	"node_modules",
+	"typings/main.d.ts",
+	"typings/main",
+	"lib",
+	"dist"
+  ],
+  "filesGlob": [
+	"./model/*.ts",
+	"./api/*.ts",
+	"typings/browser.d.ts"
+  ]
 }
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/typings.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/typings.json
index 0848dcffe31..507c40e5cbe 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/typings.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/typings.json
@@ -1,5 +1,5 @@
 {
-  "ambientDependencies": {
-    "core-js": "registry:dt/core-js#0.0.0+20160317120654"
+  "globalDependencies": {
+    "core-js": "registry:dt/core-js#0.0.0+20160725163759"
   }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts
new file mode 100644
index 00000000000..27b987e9b23
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts
@@ -0,0 +1,3 @@
+import { OpaqueToken } from '@angular/core';
+
+export const BASE_PATH = new OpaqueToken('basePath');
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore
new file mode 100644
index 00000000000..35e2fb2b02e
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore
@@ -0,0 +1,3 @@
+wwwroot/*.js
+node_modules
+typings
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/LICENSE b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/LICENSE
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md
index 85e98e0f9d9..fbcbf6e6dcd 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md
@@ -31,3 +31,14 @@ npm install PATH_TO_GENERATED_PACKAGE --save
 In your angular2 project:
 
 TODO: paste example.
+
+### Set service base path
+If different than the generated base path, during app bootstrap, you can provide the base path to your service. 
+
+```
+import { BASE_PATH } from './path-to-swagger-gen-service/index';
+
+bootstrap(AppComponent, [
+    { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
+]);
+```  
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts
new file mode 100644
index 00000000000..ec2e7e350aa
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts
@@ -0,0 +1,21 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
+
+import { ProjectService } from './api/project.service';
+
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ ProjectService ]
+})
+export class ApiModule {
+    public static forConfig(configuration: Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useValue: configuration}]
+        }
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/ProjectApi.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/ProjectApi.ts
deleted file mode 100644
index dbcdbe5fb7a..00000000000
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/ProjectApi.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import {Http, Headers, RequestOptionsArgs, Response, URLSearchParams} from '@angular/http';
-import {Injectable, Optional} from '@angular/core';
-import {Observable} from 'rxjs/Observable';
-import * as models from '../model/models';
-import 'rxjs/Rx';
-
-/* tslint:disable:no-unused-variable member-ordering */
-
-'use strict';
-
-@Injectable()
-export class ProjectApi {
-    protected basePath = 'https://localhost/v1';
-    public defaultHeaders : Headers = new Headers();
-
-    constructor(protected http: Http, @Optional() basePath: string) {
-        if (basePath) {
-            this.basePath = basePath;
-        }
-    }
-
-    /**
-     * Create a Project
-     * Creates an empty Project
-     * @param name 
-     * @param address 
-     * @param longitude 
-     * @param latitude 
-     * @param meta 
-     */
-    public createProject (name?: string, address?: string, longitude?: number, latitude?: number, meta?: string, extraHttpRequestParams?: any ) : Observable<models.ProjectEntity> {
-        const path = this.basePath + '/projects';
-
-        let queryParameters: any = ""; // This should probably be an object in the future
-        let headerParams = this.defaultHeaders;
-        let formParams = new URLSearchParams();
-
-        headerParams.set('Content-Type', 'application/x-www-form-urlencoded');
-
-        formParams['name'] = name;
-
-        formParams['address'] = address;
-
-        formParams['longitude'] = longitude;
-
-        formParams['latitude'] = latitude;
-
-        formParams['meta'] = meta;
-
-        let requestOptions: RequestOptionsArgs = {
-            method: 'POST',
-            headers: headerParams,
-            search: queryParameters
-        };
-        requestOptions.body = formParams.toString();
-
-        return this.http.request(path, requestOptions)
-            .map((response: Response) => response.json());
-    }
-
-    /**
-     * Delete a Project
-     * Returns a Project JSON object
-     * @param id Project id
-     */
-    public deleteProjectById (id: number, extraHttpRequestParams?: any ) : Observable<{}> {
-        const path = this.basePath + '/projects/{id}'
-            .replace('{' + 'id' + '}', String(id));
-
-        let queryParameters: any = ""; // This should probably be an object in the future
-        let headerParams = this.defaultHeaders;
-        // verify required parameter 'id' is set
-        if (!id) {
-            throw new Error('Missing required parameter id when calling deleteProjectById');
-        }
-        let requestOptions: RequestOptionsArgs = {
-            method: 'DELETE',
-            headers: headerParams,
-            search: queryParameters
-        };
-
-        return this.http.request(path, requestOptions)
-            .map((response: Response) => response.json());
-    }
-
-    /**
-     * Get a Project
-     * Returns a Project JSON object
-     * @param id Project id
-     */
-    public getProjectById (id: number, extraHttpRequestParams?: any ) : Observable<models.ProjectEntity> {
-        const path = this.basePath + '/projects/{id}'
-            .replace('{' + 'id' + '}', String(id));
-
-        let queryParameters: any = ""; // This should probably be an object in the future
-        let headerParams = this.defaultHeaders;
-        // verify required parameter 'id' is set
-        if (!id) {
-            throw new Error('Missing required parameter id when calling getProjectById');
-        }
-        let requestOptions: RequestOptionsArgs = {
-            method: 'GET',
-            headers: headerParams,
-            search: queryParameters
-        };
-
-        return this.http.request(path, requestOptions)
-            .map((response: Response) => response.json());
-    }
-
-    /**
-     * Get project list
-     * Returns a Project JSON object
-     * @param page 
-     * @param perPage 
-     * @param kind 
-     * @param q 
-     * @param filter 
-     * @param latitude Valid with kind as location
-     * @param longitude Valid with kind as location
-     * @param scope Valid with kind as location, and between 1~9
-     */
-    public getProjectList (page?: number, perPage?: number, kind?: string, q?: string, filter?: string, latitude?: number, longitude?: number, scope?: number, extraHttpRequestParams?: any ) : Observable<models.ProjectList> {
-        const path = this.basePath + '/projects';
-
-        let queryParameters: any = ""; // This should probably be an object in the future
-        let headerParams = this.defaultHeaders;
-        if (page !== undefined) {
-            queryParameters['page'] = page;
-        }
-
-        if (perPage !== undefined) {
-            queryParameters['per_page'] = perPage;
-        }
-
-        if (kind !== undefined) {
-            queryParameters['kind'] = kind;
-        }
-
-        if (q !== undefined) {
-            queryParameters['q'] = q;
-        }
-
-        if (filter !== undefined) {
-            queryParameters['filter'] = filter;
-        }
-
-        if (latitude !== undefined) {
-            queryParameters['latitude'] = latitude;
-        }
-
-        if (longitude !== undefined) {
-            queryParameters['longitude'] = longitude;
-        }
-
-        if (scope !== undefined) {
-            queryParameters['scope'] = scope;
-        }
-
-        let requestOptions: RequestOptionsArgs = {
-            method: 'GET',
-            headers: headerParams,
-            search: queryParameters
-        };
-
-        return this.http.request(path, requestOptions)
-            .map((response: Response) => response.json());
-    }
-
-    /**
-     * Update project
-     * 
-     * @param id Project id
-     * @param name User ID
-     * @param address Address
-     * @param longitude 
-     * @param latitude 
-     * @param meta 
-     * @param thumbnail Project thumbnail
-     */
-    public updateProject (id: number, name?: string, address?: string, longitude?: number, latitude?: number, meta?: string, thumbnail?: any, extraHttpRequestParams?: any ) : Observable<models.ProjectEntity> {
-        const path = this.basePath + '/projects/{id}'
-            .replace('{' + 'id' + '}', String(id));
-
-        let queryParameters: any = ""; // This should probably be an object in the future
-        let headerParams = this.defaultHeaders;
-        let formParams = new URLSearchParams();
-
-        // verify required parameter 'id' is set
-        if (!id) {
-            throw new Error('Missing required parameter id when calling updateProject');
-        }
-        headerParams.set('Content-Type', 'application/x-www-form-urlencoded');
-
-        formParams['name'] = name;
-
-        formParams['address'] = address;
-
-        formParams['longitude'] = longitude;
-
-        formParams['latitude'] = latitude;
-
-        formParams['meta'] = meta;
-
-        formParams['thumbnail'] = thumbnail;
-
-        let requestOptions: RequestOptionsArgs = {
-            method: 'PUT',
-            headers: headerParams,
-            search: queryParameters
-        };
-        requestOptions.body = formParams.toString();
-
-        return this.http.request(path, requestOptions)
-            .map((response: Response) => response.json());
-    }
-
-}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts
index d919ee6d629..82e8c1350d6 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts
@@ -1 +1 @@
-export * from './ProjectApi';
+export * from './project.service';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts
new file mode 100644
index 00000000000..71257302a9c
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts
@@ -0,0 +1,430 @@
+/**
+ * Cupix API
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.7.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { Http, Headers, URLSearchParams }                    from '@angular/http';
+import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
+import { Response, ResponseContentType }                     from '@angular/http';
+
+import { Observable }                                        from 'rxjs/Observable';
+import '../rxjs-operators';
+
+import { ProjectEntity } from '../model/projectEntity';
+import { ProjectList } from '../model/projectList';
+
+import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+
+@Injectable()
+export class ProjectService {
+    protected basePath = 'https://localhost/v1';
+    public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
+
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * Create a Project
+     * Creates an empty Project
+     * @param name 
+     * @param address 
+     * @param longitude 
+     * @param latitude 
+     * @param meta 
+     */
+    public createProject(name?: string, address?: string, longitude?: number, latitude?: number, meta?: string, extraHttpRequestParams?: any): Observable<ProjectEntity> {
+        return this.createProjectWithHttpInfo(name, address, longitude, latitude, meta, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Delete a Project
+     * Returns a Project JSON object
+     * @param id Project id
+     */
+    public deleteProjectById(id: number, extraHttpRequestParams?: any): Observable<{}> {
+        return this.deleteProjectByIdWithHttpInfo(id, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Get a Project
+     * Returns a Project JSON object
+     * @param id Project id
+     */
+    public getProjectById(id: number, extraHttpRequestParams?: any): Observable<ProjectEntity> {
+        return this.getProjectByIdWithHttpInfo(id, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Get project list
+     * Returns a Project JSON object
+     * @param page 
+     * @param perPage 
+     * @param kind 
+     * @param q 
+     * @param filter 
+     * @param latitude Valid with kind as location
+     * @param longitude Valid with kind as location
+     * @param scope Valid with kind as location, and between 1~9
+     */
+    public getProjectList(page?: number, perPage?: number, kind?: string, q?: string, filter?: string, latitude?: number, longitude?: number, scope?: number, extraHttpRequestParams?: any): Observable<ProjectList> {
+        return this.getProjectListWithHttpInfo(page, perPage, kind, q, filter, latitude, longitude, scope, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Update project
+     * 
+     * @param id Project id
+     * @param name User ID
+     * @param address Address
+     * @param longitude 
+     * @param latitude 
+     * @param meta 
+     * @param thumbnail Project thumbnail
+     */
+    public updateProject(id: number, name?: string, address?: string, longitude?: number, latitude?: number, meta?: string, thumbnail?: any, extraHttpRequestParams?: any): Observable<ProjectEntity> {
+        return this.updateProjectWithHttpInfo(id, name, address, longitude, latitude, meta, thumbnail, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+
+    /**
+     * Create a Project
+     * Creates an empty Project
+     * @param name 
+     * @param address 
+     * @param longitude 
+     * @param latitude 
+     * @param meta 
+     */
+    public createProjectWithHttpInfo(name?: string, address?: string, longitude?: number, latitude?: number, meta?: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/projects`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let formParams = new URLSearchParams();
+
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/x-www-form-urlencoded'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json'
+        ];
+        
+            
+        headers.set('Content-Type', 'application/x-www-form-urlencoded');
+
+
+        if (name !== undefined) {
+            formParams.set('name', <any>name); 
+        }
+        if (address !== undefined) {
+            formParams.set('address', <any>address); 
+        }
+        if (longitude !== undefined) {
+            formParams.set('longitude', <any>longitude); 
+        }
+        if (latitude !== undefined) {
+            formParams.set('latitude', <any>latitude); 
+        }
+        if (meta !== undefined) {
+            formParams.set('meta', <any>meta); 
+        }
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: formParams.toString(),
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Delete a Project
+     * Returns a Project JSON object
+     * @param id Project id
+     */
+    public deleteProjectByIdWithHttpInfo(id: number, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/projects/${id}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'id' is not null or undefined
+        if (id === null || id === undefined) {
+            throw new Error('Required parameter id was null or undefined when calling deleteProjectById.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Delete,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Get a Project
+     * Returns a Project JSON object
+     * @param id Project id
+     */
+    public getProjectByIdWithHttpInfo(id: number, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/projects/${id}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'id' is not null or undefined
+        if (id === null || id === undefined) {
+            throw new Error('Required parameter id was null or undefined when calling getProjectById.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Get project list
+     * Returns a Project JSON object
+     * @param page 
+     * @param perPage 
+     * @param kind 
+     * @param q 
+     * @param filter 
+     * @param latitude Valid with kind as location
+     * @param longitude Valid with kind as location
+     * @param scope Valid with kind as location, and between 1~9
+     */
+    public getProjectListWithHttpInfo(page?: number, perPage?: number, kind?: string, q?: string, filter?: string, latitude?: number, longitude?: number, scope?: number, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/projects`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        if (page !== undefined) {
+            queryParameters.set('page', <any>page);
+        }
+        if (perPage !== undefined) {
+            queryParameters.set('per_page', <any>perPage);
+        }
+        if (kind !== undefined) {
+            queryParameters.set('kind', <any>kind);
+        }
+        if (q !== undefined) {
+            queryParameters.set('q', <any>q);
+        }
+        if (filter !== undefined) {
+            queryParameters.set('filter', <any>filter);
+        }
+        if (latitude !== undefined) {
+            queryParameters.set('latitude', <any>latitude);
+        }
+        if (longitude !== undefined) {
+            queryParameters.set('longitude', <any>longitude);
+        }
+        if (scope !== undefined) {
+            queryParameters.set('scope', <any>scope);
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Update project
+     * 
+     * @param id Project id
+     * @param name User ID
+     * @param address Address
+     * @param longitude 
+     * @param latitude 
+     * @param meta 
+     * @param thumbnail Project thumbnail
+     */
+    public updateProjectWithHttpInfo(id: number, name?: string, address?: string, longitude?: number, latitude?: number, meta?: string, thumbnail?: any, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/projects/${id}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let formParams = new URLSearchParams();
+
+        // verify required parameter 'id' is not null or undefined
+        if (id === null || id === undefined) {
+            throw new Error('Required parameter id was null or undefined when calling updateProject.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'multipart/form-data'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json'
+        ];
+        
+            
+        headers.set('Content-Type', 'application/x-www-form-urlencoded');
+
+
+        if (name !== undefined) {
+            formParams.set('name', <any>name); 
+        }
+        if (address !== undefined) {
+            formParams.set('address', <any>address); 
+        }
+        if (longitude !== undefined) {
+            formParams.set('longitude', <any>longitude); 
+        }
+        if (latitude !== undefined) {
+            formParams.set('latitude', <any>latitude); 
+        }
+        if (meta !== undefined) {
+            formParams.set('meta', <any>meta); 
+        }
+        if (thumbnail !== undefined) {
+            formParams.set('thumbnail', <any>thumbnail); 
+        }
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Put,
+            headers: headers,
+            body: formParams.toString(),
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts
new file mode 100644
index 00000000000..ec087d2b0c8
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts
@@ -0,0 +1,24 @@
+export interface ConfigurationParameters {
+	apiKey?: string;
+	username?: string;
+	password?: string;
+	accessToken?: string;
+	basePath?: string;
+}
+
+export class Configuration {
+	apiKey: string;
+	username: string;
+	password: string;
+	accessToken: string;
+	basePath: string;
+
+
+	constructor(configurationParameters: ConfigurationParameters = {}) {
+		this.apiKey = configurationParameters.apiKey;
+		this.username = configurationParameters.username;
+		this.password = configurationParameters.password;
+		this.accessToken = configurationParameters.accessToken;
+		this.basePath = configurationParameters.basePath;
+	}
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh
new file mode 100644
index 00000000000..6ca091b49d9
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id=""
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id=""
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note=""
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts
index 557365516ad..c312b70fa3e 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts
@@ -1,2 +1,5 @@
 export * from './api/api';
-export * from './model/models';
\ No newline at end of file
+export * from './model/models';
+export * from './variables';
+export * from './configuration';
+export * from './api.module';
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectEntity.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectEntity.ts
deleted file mode 100644
index dc3bd6bdce9..00000000000
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectEntity.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-import * as models from './models';
-
-export interface ProjectEntity {
-    
-
-    id?: number;
-
-    kind?: ProjectEntity.KindEnum;
-
-    thumbnailUrl?: string;
-
-    name?: string;
-
-    state?: string;
-
-    meta?: any;
-
-    location?: models.ProjectEntityLocation;
-
-    createdAt?: Date;
-
-    updatedAt?: Date;
-
-    publishedAt?: Date;
-}
-export namespace ProjectEntity {
-
-    export enum KindEnum { 
-        project = <any> 'project',
-    }
-}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectEntityLocation.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectEntityLocation.ts
deleted file mode 100644
index 81fd66511a6..00000000000
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectEntityLocation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-import * as models from './models';
-
-export interface ProjectEntityLocation {
-    
-
-    lat?: number;
-
-    lon?: number;
-}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectList.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectList.ts
deleted file mode 100644
index a8a98e93a75..00000000000
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/ProjectList.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-import * as models from './models';
-
-export interface ProjectList {
-    
-
-    contents?: Array<models.ProjectEntity>;
-}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts
index b917c007157..e26fdb67136 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts
@@ -1,3 +1,3 @@
-export * from './ProjectEntity';
-export * from './ProjectEntityLocation';
-export * from './ProjectList';
+export * from './projectEntity';
+export * from './projectEntityLocation';
+export * from './projectList';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts
new file mode 100644
index 00000000000..ebce0323c89
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts
@@ -0,0 +1,54 @@
+/**
+ * Cupix API
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.7.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ProjectEntityLocation } from './projectEntityLocation';
+
+
+export interface ProjectEntity {
+    id: number;
+
+    kind?: ProjectEntity.KindEnum;
+
+    thumbnailUrl?: string;
+
+    name?: string;
+
+    state?: string;
+
+    meta?: any;
+
+    location?: ProjectEntityLocation;
+
+    createdAt?: Date;
+
+    updatedAt?: Date;
+
+    publishedAt?: Date;
+
+}
+export namespace ProjectEntity {
+    export enum KindEnum {
+        Project = <any> 'project'
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts
new file mode 100644
index 00000000000..8cfb2bc059b
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts
@@ -0,0 +1,32 @@
+/**
+ * Cupix API
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.7.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+export interface ProjectEntityLocation {
+    lat?: number;
+
+    lon?: number;
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts
new file mode 100644
index 00000000000..56f0791b01a
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts
@@ -0,0 +1,31 @@
+/**
+ * Cupix API
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.7.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ProjectEntity } from './projectEntity';
+
+
+export interface ProjectList {
+    contents: Array<ProjectEntity>;
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json
index adc902b3610..42ba4d5d54f 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json
@@ -7,30 +7,32 @@
     "swagger-client"
   ],
   "license": "Apache-2.0",
-  "files": [
-    "lib"
-  ],
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "typings install && tsc"
+    "build": "typings install && tsc --outDir dist/"
   },
   "peerDependencies": {
-    "@angular/core": "^2.0.0-rc.1",
-    "@angular/http": "^2.0.0-rc.1"
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.17"
   },
   "devDependencies": {
-    "@angular/common": "^2.0.0-rc.1",
-    "@angular/compiler": "^2.0.0-rc.1",
-    "@angular/core": "^2.0.0-rc.1",
-    "@angular/http": "^2.0.0-rc.1",
-    "@angular/platform-browser": "^2.0.0-rc.1",
-    "@angular/platform-browser-dynamic": "^2.0.0-rc.1",
-    "core-js": "^2.3.0",
-    "rxjs": "^5.0.0-beta.6",
-    "zone.js": "^0.6.12",
-    "typescript": "^1.8.10",
-    "typings": "^0.8.1",
-    "es6-shim": "^0.35.0",
-    "es7-reflect-metadata": "^1.6.0"
-  }}
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "@angular/platform-browser": "^2.0.0",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.17",
+    "typescript": "^2.0.0",
+    "typings": "^1.3.2"
+  }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/rxjs-operators.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/rxjs-operators.ts
new file mode 100644
index 00000000000..5659cd0694f
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/rxjs-operators.ts
@@ -0,0 +1,11 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json
index 07fbdf7e1b1..e1f949692b6 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json
@@ -1,27 +1,28 @@
 {
-    "compilerOptions": {
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "noImplicitAny": false,
-        "suppressImplicitAnyIndexErrors": true,
-        "target": "es5",
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "removeComments": true,
-        "sourceMap": true,
-        "outDir": "./lib",
-        "noLib": false,
-        "declaration": true
-    },
-    "exclude": [
-        "node_modules",
-        "typings/main.d.ts",
-        "typings/main",
-        "lib"
-    ],
-    "filesGlob": [
-        "./model/*.ts",
-        "./api/*.ts",
-        "typings/browser.d.ts"
-    ]
+  "compilerOptions": {
+	"emitDecoratorMetadata": true,
+	"experimentalDecorators": true,
+	"noImplicitAny": false,
+	"suppressImplicitAnyIndexErrors": true,
+	"target": "es5",
+	"module": "commonjs",
+	"moduleResolution": "node",
+	"removeComments": true,
+	"sourceMap": true,
+	"outDir": "./lib",
+	"noLib": false,
+	"declaration": true
+  },
+  "exclude": [
+	"node_modules",
+	"typings/main.d.ts",
+	"typings/main",
+	"lib",
+	"dist"
+  ],
+  "filesGlob": [
+	"./model/*.ts",
+	"./api/*.ts",
+	"typings/browser.d.ts"
+  ]
 }
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/typings.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/typings.json
index 0848dcffe31..507c40e5cbe 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/typings.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/typings.json
@@ -1,5 +1,5 @@
 {
-  "ambientDependencies": {
-    "core-js": "registry:dt/core-js#0.0.0+20160317120654"
+  "globalDependencies": {
+    "core-js": "registry:dt/core-js#0.0.0+20160725163759"
   }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts
new file mode 100644
index 00000000000..27b987e9b23
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts
@@ -0,0 +1,3 @@
+import { OpaqueToken } from '@angular/core';
+
+export const BASE_PATH = new OpaqueToken('basePath');
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/.gitignore b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/.gitignore
new file mode 100644
index 00000000000..35e2fb2b02e
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/.gitignore
@@ -0,0 +1,3 @@
+wwwroot/*.js
+node_modules
+typings
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/LICENSE b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/LICENSE
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts
index 6a1cfed4d79..8cb8fa4f123 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts
@@ -1,3 +1,27 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@wordnik.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import request = require('request');
 import http = require('http');
 import Promise = require('bluebird');
@@ -76,6 +100,7 @@ export enum PetApiApiKeys {
 export class PetApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
@@ -94,6 +119,10 @@ export class PetApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: PetApiApiKeys, value: string) {
         this.authentications[PetApiApiKeys[key]].apiKey = value;
     }
@@ -124,6 +153,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -179,6 +209,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -230,6 +261,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -275,6 +307,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -337,6 +370,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -370,6 +404,7 @@ export enum StoreApiApiKeys {
 export class StoreApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
@@ -388,6 +423,10 @@ export class StoreApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: StoreApiApiKeys, value: string) {
         this.authentications[StoreApiApiKeys[key]].apiKey = value;
     }
@@ -424,6 +463,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -468,6 +508,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -519,6 +560,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -564,6 +606,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
index fba3fa017f9..e2ef93f0d6d 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
@@ -2,9 +2,13 @@
     "name": "node-es6-test",
     "version": "1.0.3",
     "description": "NodeJS client for node-es6-test",
+    "repository": "/",
     "main": "api.js",
     "scripts": {
-        "build": "typings install && tsc"
+        "postinstall": "typings install",
+        "clean": "rm -Rf node_modules/ typings/ *.js",
+        "build": "tsc",
+        "test": "npm run build && node client.js"
     },
     "author": "Swagger Codegen Contributors",
     "license": "Apache-2.0",
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json
index 2dd166566e9..9a007e9f866 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json
@@ -10,9 +10,10 @@
         "noLib": false,
         "declaration": true
     },
-    "files": [
-        "api.ts",
-        "typings/main.d.ts"
+    "exclude": [
+        "node_modules",
+        "typings/browser",
+        "typings/browser.d.ts"
     ]
 }
 
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/typings.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/typings.json
index 76c4cc8e6af..22fcebdc231 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/typings.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/typings.json
@@ -1,10 +1,10 @@
 {
     "ambientDependencies": {
-        "bluebird": "registry:dt/bluebird#2.0.0+20160319051630",
         "core-js": "registry:dt/core-js#0.0.0+20160317120654",
         "node": "registry:dt/node#4.0.0+20160423143914"
     },
     "dependencies": {
+        "bluebird": "registry:npm/bluebird#3.3.4+20160515010139",
         "request": "registry:npm/request#2.69.0+20160304121250"
     }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/.gitignore b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/.gitignore
new file mode 100644
index 00000000000..35e2fb2b02e
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/.gitignore
@@ -0,0 +1,3 @@
+wwwroot/*.js
+node_modules
+typings
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/.swagger-codegen-ignore b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/.swagger-codegen-ignore
new file mode 100644
index 00000000000..c5fa491b4c5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/LICENSE b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/LICENSE
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/README.md b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/README.md
new file mode 100644
index 00000000000..3f1d74e23e8
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/README.md
@@ -0,0 +1,44 @@
+## petstore-integration-test@1.0.3
+
+### Building
+
+To build an compile the typescript sources to javascript use:
+```
+npm install
+npm run build
+```
+
+### publishing
+
+First build the package than run ```npm publish```
+
+### consuming
+
+navigate to the folder of your consuming project and run one of next commando's.
+
+_published:_
+
+```
+npm install petstore-integration-test@1.0.3 --save
+```
+
+_unPublished (not recommended):_
+
+```
+npm install PATH_TO_GENERATED_PACKAGE --save
+```
+
+In your angular2 project:
+
+TODO: paste example.
+
+### Set service base path
+If different than the generated base path, during app bootstrap, you can provide the base path to your service. 
+
+```
+import { BASE_PATH } from './path-to-swagger-gen-service/index';
+
+bootstrap(AppComponent, [
+    { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
+]);
+```  
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api.module.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api.module.ts
new file mode 100644
index 00000000000..4a2ae9c2e9f
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api.module.ts
@@ -0,0 +1,23 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
+
+import { PetService } from './api/pet.service';
+import { StoreService } from './api/store.service';
+import { UserService } from './api/user.service';
+
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ PetService, StoreService, UserService ]
+})
+export class ApiModule {
+    public static forConfig(configuration: Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useValue: configuration}]
+        }
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/api.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/api.ts
new file mode 100644
index 00000000000..b7d674969f5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/api.ts
@@ -0,0 +1,3 @@
+export * from './pet.service';
+export * from './store.service';
+export * from './user.service';
diff --git a/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts
similarity index 86%
rename from samples/client/petstore/typescript-angular2/npm/api/PetApi.ts
rename to modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts
index f91faccdd65..ebf28064219 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts
@@ -1,9 +1,9 @@
 /**
  * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -28,9 +28,11 @@ import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http
 import { Response, ResponseContentType }                     from '@angular/http';
 
 import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
+import '../rxjs-operators';
+
+import { Pet } from '../model/pet';
+import { ApiResponse } from '../model/apiResponse';
 
-import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
 import { Configuration }                                     from '../configuration';
 
@@ -38,7 +40,7 @@ import { Configuration }                                     from '../configurat
 
 
 @Injectable()
-export class PetApi {
+export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
     public configuration: Configuration = new Configuration();
@@ -49,6 +51,7 @@ export class PetApi {
         }
         if (configuration) {
             this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
         }
     }
 	
@@ -72,7 +75,7 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public addPet(body?: models.Pet, extraHttpRequestParams?: any): Observable<{}> {
+    public addPet(body: Pet, extraHttpRequestParams?: any): Observable<{}> {
         return this.addPetWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -105,7 +108,7 @@ export class PetApi {
      * Multiple status values can be provided with comma separated strings
      * @param status Status values that need to be considered for filter
      */
-    public findPetsByStatus(status?: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>> {
+    public findPetsByStatus(status: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
         return this.findPetsByStatusWithHttpInfo(status, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -121,7 +124,7 @@ export class PetApi {
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * @param tags Tags to filter by
      */
-    public findPetsByTags(tags?: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>> {
+    public findPetsByTags(tags: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
         return this.findPetsByTagsWithHttpInfo(tags, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -134,10 +137,10 @@ export class PetApi {
 
     /**
      * Find pet by ID
-     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-     * @param petId ID of pet that needs to be fetched
+     * Returns a single pet
+     * @param petId ID of pet to return
      */
-    public getPetById(petId: number, extraHttpRequestParams?: any): Observable<models.Pet> {
+    public getPetById(petId: number, extraHttpRequestParams?: any): Observable<Pet> {
         return this.getPetByIdWithHttpInfo(petId, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -153,7 +156,7 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public updatePet(body?: models.Pet, extraHttpRequestParams?: any): Observable<{}> {
+    public updatePet(body: Pet, extraHttpRequestParams?: any): Observable<{}> {
         return this.updatePetWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -171,7 +174,7 @@ export class PetApi {
      * @param name Updated name of the pet
      * @param status Updated status of the pet
      */
-    public updatePetWithForm(petId: string, name?: string, status?: string, extraHttpRequestParams?: any): Observable<{}> {
+    public updatePetWithForm(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<{}> {
         return this.updatePetWithFormWithHttpInfo(petId, name, status, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -189,7 +192,7 @@ export class PetApi {
      * @param additionalMetadata Additional data to pass to server
      * @param file file to upload
      */
-    public uploadFile(petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any): Observable<{}> {
+    public uploadFile(petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any): Observable<ApiResponse> {
         return this.uploadFileWithHttpInfo(petId, additionalMetadata, file, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -206,11 +209,15 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public addPetWithHttpInfo(body?: models.Pet, extraHttpRequestParams?: any): Observable<Response> {
+    public addPetWithHttpInfo(body: Pet, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'body' is not null or undefined
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling addPet.');
+        }
 
 
         // to determine the Content-Type header
@@ -221,8 +228,8 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
         // authentication (petstore_auth) required
@@ -274,8 +281,8 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
         // authentication (petstore_auth) required
@@ -307,11 +314,15 @@ export class PetApi {
      * Multiple status values can be provided with comma separated strings
      * @param status Status values that need to be considered for filter
      */
-    public findPetsByStatusWithHttpInfo(status?: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
+    public findPetsByStatusWithHttpInfo(status: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet/findByStatus`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'status' is not null or undefined
+        if (status === null || status === undefined) {
+            throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
+        }
         if (status !== undefined) {
             queryParameters.set('status', <any>status);
         }
@@ -323,8 +334,8 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
         // authentication (petstore_auth) required
@@ -356,11 +367,15 @@ export class PetApi {
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * @param tags Tags to filter by
      */
-    public findPetsByTagsWithHttpInfo(tags?: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
+    public findPetsByTagsWithHttpInfo(tags: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet/findByTags`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'tags' is not null or undefined
+        if (tags === null || tags === undefined) {
+            throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
+        }
         if (tags !== undefined) {
             queryParameters.set('tags', <any>tags);
         }
@@ -372,8 +387,8 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
         // authentication (petstore_auth) required
@@ -402,8 +417,8 @@ export class PetApi {
 
     /**
      * Find pet by ID
-     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-     * @param petId ID of pet that needs to be fetched
+     * Returns a single pet
+     * @param petId ID of pet to return
      */
     public getPetByIdWithHttpInfo(petId: number, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet/${petId}`;
@@ -422,16 +437,10 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
-        // authentication (petstore_auth) required
-        // oauth required
-        if (this.configuration.accessToken)
-        {
-            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
-        }
         // authentication (api_key) required
         if (this.configuration.apiKey)
         {
@@ -460,11 +469,15 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public updatePetWithHttpInfo(body?: models.Pet, extraHttpRequestParams?: any): Observable<Response> {
+    public updatePetWithHttpInfo(body: Pet, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'body' is not null or undefined
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling updatePet.');
+        }
 
 
         // to determine the Content-Type header
@@ -475,8 +488,8 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
         // authentication (petstore_auth) required
@@ -512,7 +525,7 @@ export class PetApi {
      * @param name Updated name of the pet
      * @param status Updated status of the pet
      */
-    public updatePetWithFormWithHttpInfo(petId: string, name?: string, status?: string, extraHttpRequestParams?: any): Observable<Response> {
+    public updatePetWithFormWithHttpInfo(petId: number, name?: string, status?: string, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet/${petId}`;
 
         let queryParameters = new URLSearchParams();
@@ -532,8 +545,8 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
         // authentication (petstore_auth) required
@@ -595,8 +608,7 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/json'
         ];
         
         // authentication (petstore_auth) required
diff --git a/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts
similarity index 89%
rename from samples/client/petstore/typescript-angular2/default/api/StoreApi.ts
rename to modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts
index e5382d97b05..a30c27d25df 100644
--- a/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts
@@ -1,9 +1,9 @@
 /**
  * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -28,9 +28,10 @@ import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http
 import { Response, ResponseContentType }                     from '@angular/http';
 
 import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
+import '../rxjs-operators';
+
+import { Order } from '../model/order';
 
-import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
 import { Configuration }                                     from '../configuration';
 
@@ -38,7 +39,7 @@ import { Configuration }                                     from '../configurat
 
 
 @Injectable()
-export class StoreApi {
+export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
     public configuration: Configuration = new Configuration();
@@ -49,6 +50,7 @@ export class StoreApi {
         }
         if (configuration) {
             this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
         }
     }
 	
@@ -103,7 +105,7 @@ export class StoreApi {
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param orderId ID of pet that needs to be fetched
      */
-    public getOrderById(orderId: string, extraHttpRequestParams?: any): Observable<models.Order> {
+    public getOrderById(orderId: number, extraHttpRequestParams?: any): Observable<Order> {
         return this.getOrderByIdWithHttpInfo(orderId, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -119,7 +121,7 @@ export class StoreApi {
      * 
      * @param body order placed for purchasing the pet
      */
-    public placeOrder(body?: models.Order, extraHttpRequestParams?: any): Observable<models.Order> {
+    public placeOrder(body: Order, extraHttpRequestParams?: any): Observable<Order> {
         return this.placeOrderWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -153,8 +155,8 @@ export class StoreApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -192,8 +194,7 @@ export class StoreApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/json'
         ];
         
         // authentication (api_key) required
@@ -224,7 +225,7 @@ export class StoreApi {
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param orderId ID of pet that needs to be fetched
      */
-    public getOrderByIdWithHttpInfo(orderId: string, extraHttpRequestParams?: any): Observable<Response> {
+    public getOrderByIdWithHttpInfo(orderId: number, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/store/order/${orderId}`;
 
         let queryParameters = new URLSearchParams();
@@ -241,8 +242,8 @@ export class StoreApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -268,11 +269,15 @@ export class StoreApi {
      * 
      * @param body order placed for purchasing the pet
      */
-    public placeOrderWithHttpInfo(body?: models.Order, extraHttpRequestParams?: any): Observable<Response> {
+    public placeOrderWithHttpInfo(body: Order, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/store/order`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'body' is not null or undefined
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling placeOrder.');
+        }
 
 
         // to determine the Content-Type header
@@ -281,8 +286,8 @@ export class StoreApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
diff --git a/samples/client/petstore/typescript-angular2/default/api/UserApi.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts
similarity index 82%
rename from samples/client/petstore/typescript-angular2/default/api/UserApi.ts
rename to modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts
index a3f14b23790..2246435f5a0 100644
--- a/samples/client/petstore/typescript-angular2/default/api/UserApi.ts
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts
@@ -1,9 +1,9 @@
 /**
  * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
@@ -28,9 +28,10 @@ import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http
 import { Response, ResponseContentType }                     from '@angular/http';
 
 import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
+import '../rxjs-operators';
+
+import { User } from '../model/user';
 
-import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
 import { Configuration }                                     from '../configuration';
 
@@ -38,7 +39,7 @@ import { Configuration }                                     from '../configurat
 
 
 @Injectable()
-export class UserApi {
+export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
     public configuration: Configuration = new Configuration();
@@ -49,6 +50,7 @@ export class UserApi {
         }
         if (configuration) {
             this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
         }
     }
 	
@@ -72,7 +74,7 @@ export class UserApi {
      * This can only be done by the logged in user.
      * @param body Created user object
      */
-    public createUser(body?: models.User, extraHttpRequestParams?: any): Observable<{}> {
+    public createUser(body: User, extraHttpRequestParams?: any): Observable<{}> {
         return this.createUserWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -88,7 +90,7 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithArrayInput(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<{}> {
+    public createUsersWithArrayInput(body: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
         return this.createUsersWithArrayInputWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -104,7 +106,7 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithListInput(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<{}> {
+    public createUsersWithListInput(body: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
         return this.createUsersWithListInputWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -136,7 +138,7 @@ export class UserApi {
      * 
      * @param username The name that needs to be fetched. Use user1 for testing. 
      */
-    public getUserByName(username: string, extraHttpRequestParams?: any): Observable<models.User> {
+    public getUserByName(username: string, extraHttpRequestParams?: any): Observable<User> {
         return this.getUserByNameWithHttpInfo(username, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -153,7 +155,7 @@ export class UserApi {
      * @param username The user name for login
      * @param password The password for login in clear text
      */
-    public loginUser(username?: string, password?: string, extraHttpRequestParams?: any): Observable<string> {
+    public loginUser(username: string, password: string, extraHttpRequestParams?: any): Observable<string> {
         return this.loginUserWithHttpInfo(username, password, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -185,7 +187,7 @@ export class UserApi {
      * @param username name that need to be deleted
      * @param body Updated user object
      */
-    public updateUser(username: string, body?: models.User, extraHttpRequestParams?: any): Observable<{}> {
+    public updateUser(username: string, body: User, extraHttpRequestParams?: any): Observable<{}> {
         return this.updateUserWithHttpInfo(username, body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -202,11 +204,15 @@ export class UserApi {
      * This can only be done by the logged in user.
      * @param body Created user object
      */
-    public createUserWithHttpInfo(body?: models.User, extraHttpRequestParams?: any): Observable<Response> {
+    public createUserWithHttpInfo(body: User, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'body' is not null or undefined
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling createUser.');
+        }
 
 
         // to determine the Content-Type header
@@ -215,8 +221,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -244,11 +250,15 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithArrayInputWithHttpInfo(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<Response> {
+    public createUsersWithArrayInputWithHttpInfo(body: Array<User>, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user/createWithArray`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'body' is not null or undefined
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
+        }
 
 
         // to determine the Content-Type header
@@ -257,8 +267,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -286,11 +296,15 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithListInputWithHttpInfo(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<Response> {
+    public createUsersWithListInputWithHttpInfo(body: Array<User>, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user/createWithList`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'body' is not null or undefined
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
+        }
 
 
         // to determine the Content-Type header
@@ -299,8 +313,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -345,8 +359,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -389,8 +403,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -417,11 +431,19 @@ export class UserApi {
      * @param username The user name for login
      * @param password The password for login in clear text
      */
-    public loginUserWithHttpInfo(username?: string, password?: string, extraHttpRequestParams?: any): Observable<Response> {
+    public loginUserWithHttpInfo(username: string, password: string, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user/login`;
 
         let queryParameters = new URLSearchParams();
         let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new Error('Required parameter username was null or undefined when calling loginUser.');
+        }
+        // verify required parameter 'password' is not null or undefined
+        if (password === null || password === undefined) {
+            throw new Error('Required parameter password was null or undefined when calling loginUser.');
+        }
         if (username !== undefined) {
             queryParameters.set('username', <any>username);
         }
@@ -436,8 +458,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -475,8 +497,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
@@ -503,7 +525,7 @@ export class UserApi {
      * @param username name that need to be deleted
      * @param body Updated user object
      */
-    public updateUserWithHttpInfo(username: string, body?: models.User, extraHttpRequestParams?: any): Observable<Response> {
+    public updateUserWithHttpInfo(username: string, body: User, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user/${username}`;
 
         let queryParameters = new URLSearchParams();
@@ -512,6 +534,10 @@ export class UserApi {
         if (username === null || username === undefined) {
             throw new Error('Required parameter username was null or undefined when calling updateUser.');
         }
+        // verify required parameter 'body' is not null or undefined
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling updateUser.');
+        }
 
 
         // to determine the Content-Type header
@@ -520,8 +546,8 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/json', 
-            'application/xml'
+            'application/xml', 
+            'application/json'
         ];
         
             
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts
new file mode 100644
index 00000000000..ec087d2b0c8
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts
@@ -0,0 +1,24 @@
+export interface ConfigurationParameters {
+	apiKey?: string;
+	username?: string;
+	password?: string;
+	accessToken?: string;
+	basePath?: string;
+}
+
+export class Configuration {
+	apiKey: string;
+	username: string;
+	password: string;
+	accessToken: string;
+	basePath: string;
+
+
+	constructor(configurationParameters: ConfigurationParameters = {}) {
+		this.apiKey = configurationParameters.apiKey;
+		this.username = configurationParameters.username;
+		this.password = configurationParameters.password;
+		this.accessToken = configurationParameters.accessToken;
+		this.basePath = configurationParameters.basePath;
+	}
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/git_push.sh b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/git_push.sh
new file mode 100644
index 00000000000..6ca091b49d9
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id=""
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id=""
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note=""
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/index.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/index.ts
new file mode 100644
index 00000000000..c312b70fa3e
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/index.ts
@@ -0,0 +1,5 @@
+export * from './api/api';
+export * from './model/models';
+export * from './variables';
+export * from './configuration';
+export * from './api.module';
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts
new file mode 100644
index 00000000000..eb7b906e915
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts
@@ -0,0 +1,34 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+export interface ApiResponse {
+    code?: number;
+
+    type?: string;
+
+    message?: string;
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/category.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/category.ts
new file mode 100644
index 00000000000..acff8d1751f
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/category.ts
@@ -0,0 +1,32 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+export interface Category {
+    id?: number;
+
+    name?: string;
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/models.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/models.ts
new file mode 100644
index 00000000000..8607c5dabd0
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/models.ts
@@ -0,0 +1,6 @@
+export * from './apiResponse';
+export * from './category';
+export * from './order';
+export * from './pet';
+export * from './tag';
+export * from './user';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/order.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/order.ts
new file mode 100644
index 00000000000..b204ff1e9c5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/order.ts
@@ -0,0 +1,50 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+export interface Order {
+    id?: number;
+
+    petId?: number;
+
+    quantity?: number;
+
+    shipDate?: Date;
+
+    /**
+     * Order Status
+     */
+    status?: Order.StatusEnum;
+
+    complete?: boolean;
+
+}
+export namespace Order {
+    export enum StatusEnum {
+        Placed = <any> 'placed',
+        Approved = <any> 'approved',
+        Delivered = <any> 'delivered'
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts
new file mode 100644
index 00000000000..391a3cf3b0a
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts
@@ -0,0 +1,52 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Category } from './category';
+import { Tag } from './tag';
+
+
+export interface Pet {
+    id?: number;
+
+    category?: Category;
+
+    name: string;
+
+    photoUrls: Array<string>;
+
+    tags?: Array<Tag>;
+
+    /**
+     * pet status in the store
+     */
+    status?: Pet.StatusEnum;
+
+}
+export namespace Pet {
+    export enum StatusEnum {
+        Available = <any> 'available',
+        Pending = <any> 'pending',
+        Sold = <any> 'sold'
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts
new file mode 100644
index 00000000000..4f91dc54fe8
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts
@@ -0,0 +1,32 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+export interface Tag {
+    id?: number;
+
+    name?: string;
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/user.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/user.ts
new file mode 100644
index 00000000000..1fc82a2a250
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/model/user.ts
@@ -0,0 +1,47 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+export interface User {
+    id?: number;
+
+    username?: string;
+
+    firstName?: string;
+
+    lastName?: string;
+
+    email?: string;
+
+    password?: string;
+
+    phone?: string;
+
+    /**
+     * User Status
+     */
+    userStatus?: number;
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/package.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/package.json
new file mode 100644
index 00000000000..6fda4434ce1
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "petstore-integration-test",
+  "version": "1.0.3",
+  "description": "swagger client for petstore-integration-test",
+  "author": "Swagger Codegen Contributors",
+  "keywords": [
+    "swagger-client"
+  ],
+  "license": "Apache-2.0",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "scripts": {
+    "build": "typings install && tsc --outDir dist/"
+  },
+  "peerDependencies": {
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.17"
+  },
+  "devDependencies": {
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "@angular/platform-browser": "^2.0.0",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.17",
+    "typescript": "^2.0.0",
+    "typings": "^1.3.2"
+  }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/rxjs-operators.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/rxjs-operators.ts
new file mode 100644
index 00000000000..5659cd0694f
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/rxjs-operators.ts
@@ -0,0 +1,11 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json
new file mode 100644
index 00000000000..e1f949692b6
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+	"emitDecoratorMetadata": true,
+	"experimentalDecorators": true,
+	"noImplicitAny": false,
+	"suppressImplicitAnyIndexErrors": true,
+	"target": "es5",
+	"module": "commonjs",
+	"moduleResolution": "node",
+	"removeComments": true,
+	"sourceMap": true,
+	"outDir": "./lib",
+	"noLib": false,
+	"declaration": true
+  },
+  "exclude": [
+	"node_modules",
+	"typings/main.d.ts",
+	"typings/main",
+	"lib",
+	"dist"
+  ],
+  "filesGlob": [
+	"./model/*.ts",
+	"./api/*.ts",
+	"typings/browser.d.ts"
+  ]
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/typings.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/typings.json
new file mode 100644
index 00000000000..507c40e5cbe
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/typings.json
@@ -0,0 +1,5 @@
+{
+  "globalDependencies": {
+    "core-js": "registry:dt/core-js#0.0.0+20160725163759"
+  }
+}
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/variables.ts b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/variables.ts
new file mode 100644
index 00000000000..27b987e9b23
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-expected/variables.ts
@@ -0,0 +1,3 @@
+import { OpaqueToken } from '@angular/core';
+
+export const BASE_PATH = new OpaqueToken('basePath');
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-spec.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-spec.json
new file mode 100644
index 00000000000..1617f8d0ae6
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/petstore-spec.json
@@ -0,0 +1,1030 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
+        "version": "1.0.0",
+        "title": "Swagger Petstore",
+        "termsOfService": "http://swagger.io/terms/",
+        "contact": {
+            "email": "apiteam@swagger.io"
+        },
+        "license": {
+            "name": "Apache 2.0",
+            "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+        }
+    },
+    "host": "petstore.swagger.io",
+    "basePath": "/v2",
+    "tags": [
+        {
+            "name": "pet",
+            "description": "Everything about your Pets",
+            "externalDocs": {
+                "description": "Find out more",
+                "url": "http://swagger.io"
+            }
+        },
+        {
+            "name": "store",
+            "description": "Access to Petstore orders"
+        },
+        {
+            "name": "user",
+            "description": "Operations about user",
+            "externalDocs": {
+                "description": "Find out more about our store",
+                "url": "http://swagger.io"
+            }
+        }
+    ],
+    "schemes": [
+        "http"
+    ],
+    "paths": {
+        "/pet": {
+            "post": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "Add a new pet to the store",
+                "description": "",
+                "operationId": "addPet",
+                "consumes": [
+                    "application/json",
+                    "application/xml"
+                ],
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "Pet object that needs to be added to the store",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/Pet"
+                        }
+                    }
+                ],
+                "responses": {
+                    "405": {
+                        "description": "Invalid input"
+                    }
+                },
+                "security": [
+                    {
+                        "petstore_auth": [
+                            "write:pets",
+                            "read:pets"
+                        ]
+                    }
+                ]
+            },
+            "put": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "Update an existing pet",
+                "description": "",
+                "operationId": "updatePet",
+                "consumes": [
+                    "application/json",
+                    "application/xml"
+                ],
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "Pet object that needs to be added to the store",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/Pet"
+                        }
+                    }
+                ],
+                "responses": {
+                    "400": {
+                        "description": "Invalid ID supplied"
+                    },
+                    "404": {
+                        "description": "Pet not found"
+                    },
+                    "405": {
+                        "description": "Validation exception"
+                    }
+                },
+                "security": [
+                    {
+                        "petstore_auth": [
+                            "write:pets",
+                            "read:pets"
+                        ]
+                    }
+                ]
+            }
+        },
+        "/pet/findByStatus": {
+            "get": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "Finds Pets by status",
+                "description": "Multiple status values can be provided with comma separated strings",
+                "operationId": "findPetsByStatus",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "status",
+                        "in": "query",
+                        "description": "Status values that need to be considered for filter",
+                        "required": true,
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "available",
+                                "pending",
+                                "sold"
+                            ],
+                            "default": "available"
+                        },
+                        "collectionFormat": "csv"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/Pet"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid status value"
+                    }
+                },
+                "security": [
+                    {
+                        "petstore_auth": [
+                            "write:pets",
+                            "read:pets"
+                        ]
+                    }
+                ]
+            }
+        },
+        "/pet/findByTags": {
+            "get": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "Finds Pets by tags",
+                "description": "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
+                "operationId": "findPetsByTags",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "tags",
+                        "in": "query",
+                        "description": "Tags to filter by",
+                        "required": true,
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        },
+                        "collectionFormat": "csv"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/Pet"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid tag value"
+                    }
+                },
+                "security": [
+                    {
+                        "petstore_auth": [
+                            "write:pets",
+                            "read:pets"
+                        ]
+                    }
+                ]
+            }
+        },
+        "/pet/{petId}": {
+            "get": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "Find pet by ID",
+                "description": "Returns a single pet",
+                "operationId": "getPetById",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "petId",
+                        "in": "path",
+                        "description": "ID of pet to return",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/Pet"
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid ID supplied"
+                    },
+                    "404": {
+                        "description": "Pet not found"
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ]
+            },
+            "post": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "Updates a pet in the store with form data",
+                "description": "",
+                "operationId": "updatePetWithForm",
+                "consumes": [
+                    "application/x-www-form-urlencoded"
+                ],
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "petId",
+                        "in": "path",
+                        "description": "ID of pet that needs to be updated",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "name": "name",
+                        "in": "formData",
+                        "description": "Updated name of the pet",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "name": "status",
+                        "in": "formData",
+                        "description": "Updated status of the pet",
+                        "required": false,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "405": {
+                        "description": "Invalid input"
+                    }
+                },
+                "security": [
+                    {
+                        "petstore_auth": [
+                            "write:pets",
+                            "read:pets"
+                        ]
+                    }
+                ]
+            },
+            "delete": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "Deletes a pet",
+                "description": "",
+                "operationId": "deletePet",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "api_key",
+                        "in": "header",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "name": "petId",
+                        "in": "path",
+                        "description": "Pet id to delete",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "400": {
+                        "description": "Invalid pet value"
+                    }
+                },
+                "security": [
+                    {
+                        "petstore_auth": [
+                            "write:pets",
+                            "read:pets"
+                        ]
+                    }
+                ]
+            }
+        },
+        "/pet/{petId}/uploadImage": {
+            "post": {
+                "tags": [
+                    "pet"
+                ],
+                "summary": "uploads an image",
+                "description": "",
+                "operationId": "uploadFile",
+                "consumes": [
+                    "multipart/form-data"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "petId",
+                        "in": "path",
+                        "description": "ID of pet to update",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "name": "additionalMetadata",
+                        "in": "formData",
+                        "description": "Additional data to pass to server",
+                        "required": false,
+                        "type": "string"
+                    },
+                    {
+                        "name": "file",
+                        "in": "formData",
+                        "description": "file to upload",
+                        "required": false,
+                        "type": "file"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/ApiResponse"
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "petstore_auth": [
+                            "write:pets",
+                            "read:pets"
+                        ]
+                    }
+                ]
+            }
+        },
+        "/store/inventory": {
+            "get": {
+                "tags": [
+                    "store"
+                ],
+                "summary": "Returns pet inventories by status",
+                "description": "Returns a map of status codes to quantities",
+                "operationId": "getInventory",
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "type": "object",
+                            "additionalProperties": {
+                                "type": "integer",
+                                "format": "int32"
+                            }
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "api_key": []
+                    }
+                ]
+            }
+        },
+        "/store/order": {
+            "post": {
+                "tags": [
+                    "store"
+                ],
+                "summary": "Place an order for a pet",
+                "description": "",
+                "operationId": "placeOrder",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "order placed for purchasing the pet",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/Order"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/Order"
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid Order"
+                    }
+                }
+            }
+        },
+        "/store/order/{orderId}": {
+            "get": {
+                "tags": [
+                    "store"
+                ],
+                "summary": "Find purchase order by ID",
+                "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+                "operationId": "getOrderById",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "orderId",
+                        "in": "path",
+                        "description": "ID of pet that needs to be fetched",
+                        "required": true,
+                        "type": "integer",
+                        "maximum": 5.0,
+                        "minimum": 1.0,
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/Order"
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid ID supplied"
+                    },
+                    "404": {
+                        "description": "Order not found"
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "store"
+                ],
+                "summary": "Delete purchase order by ID",
+                "description": "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
+                "operationId": "deleteOrder",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "orderId",
+                        "in": "path",
+                        "description": "ID of the order that needs to be deleted",
+                        "required": true,
+                        "type": "string",
+                        "minimum": 1.0
+                    }
+                ],
+                "responses": {
+                    "400": {
+                        "description": "Invalid ID supplied"
+                    },
+                    "404": {
+                        "description": "Order not found"
+                    }
+                }
+            }
+        },
+        "/user": {
+            "post": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Create user",
+                "description": "This can only be done by the logged in user.",
+                "operationId": "createUser",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "Created user object",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/User"
+                        }
+                    }
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                }
+            }
+        },
+        "/user/createWithArray": {
+            "post": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Creates list of users with given input array",
+                "description": "",
+                "operationId": "createUsersWithArrayInput",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "List of user object",
+                        "required": true,
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/User"
+                            }
+                        }
+                    }
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                }
+            }
+        },
+        "/user/createWithList": {
+            "post": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Creates list of users with given input array",
+                "description": "",
+                "operationId": "createUsersWithListInput",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "List of user object",
+                        "required": true,
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/User"
+                            }
+                        }
+                    }
+                ],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                }
+            }
+        },
+        "/user/login": {
+            "get": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Logs user into the system",
+                "description": "",
+                "operationId": "loginUser",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "username",
+                        "in": "query",
+                        "description": "The user name for login",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "name": "password",
+                        "in": "query",
+                        "description": "The password for login in clear text",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "type": "string"
+                        },
+                        "headers": {
+                            "X-Rate-Limit": {
+                                "type": "integer",
+                                "format": "int32",
+                                "description": "calls per hour allowed by the user"
+                            },
+                            "X-Expires-After": {
+                                "type": "string",
+                                "format": "date-time",
+                                "description": "date in UTC when toekn expires"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid username/password supplied"
+                    }
+                }
+            }
+        },
+        "/user/logout": {
+            "get": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Logs out current logged in user session",
+                "description": "",
+                "operationId": "logoutUser",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [],
+                "responses": {
+                    "default": {
+                        "description": "successful operation"
+                    }
+                }
+            }
+        },
+        "/user/{username}": {
+            "get": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Get user by user name",
+                "description": "",
+                "operationId": "getUserByName",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "username",
+                        "in": "path",
+                        "description": "The name that needs to be fetched. Use user1 for testing. ",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/User"
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid username supplied"
+                    },
+                    "404": {
+                        "description": "User not found"
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Updated user",
+                "description": "This can only be done by the logged in user.",
+                "operationId": "updateUser",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "username",
+                        "in": "path",
+                        "description": "name that need to be deleted",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "Updated user object",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/User"
+                        }
+                    }
+                ],
+                "responses": {
+                    "400": {
+                        "description": "Invalid user supplied"
+                    },
+                    "404": {
+                        "description": "User not found"
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "user"
+                ],
+                "summary": "Delete user",
+                "description": "This can only be done by the logged in user.",
+                "operationId": "deleteUser",
+                "produces": [
+                    "application/xml",
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "username",
+                        "in": "path",
+                        "description": "The name that needs to be deleted",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "400": {
+                        "description": "Invalid username supplied"
+                    },
+                    "404": {
+                        "description": "User not found"
+                    }
+                }
+            }
+        }
+    },
+    "securityDefinitions": {
+        "petstore_auth": {
+            "type": "oauth2",
+            "authorizationUrl": "http://petstore.swagger.io/api/oauth/dialog",
+            "flow": "implicit",
+            "scopes": {
+                "write:pets": "modify pets in your account",
+                "read:pets": "read your pets"
+            }
+        },
+        "api_key": {
+            "type": "apiKey",
+            "name": "api_key",
+            "in": "header"
+        }
+    },
+    "definitions": {
+        "Order": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "petId": {
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "quantity": {
+                    "type": "integer",
+                    "format": "int32"
+                },
+                "shipDate": {
+                    "type": "string",
+                    "format": "date-time"
+                },
+                "status": {
+                    "type": "string",
+                    "description": "Order Status",
+                    "enum": [
+                        "placed",
+                        "approved",
+                        "delivered"
+                    ]
+                },
+                "complete": {
+                    "type": "boolean",
+                    "default": false
+                }
+            },
+            "xml": {
+                "name": "Order"
+            }
+        },
+        "User": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "firstName": {
+                    "type": "string"
+                },
+                "lastName": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "password": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                },
+                "userStatus": {
+                    "type": "integer",
+                    "format": "int32",
+                    "description": "User Status"
+                }
+            },
+            "xml": {
+                "name": "User"
+            }
+        },
+        "Category": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "xml": {
+                "name": "Category"
+            }
+        },
+        "Tag": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "xml": {
+                "name": "Tag"
+            }
+        },
+        "ApiResponse": {
+            "type": "object",
+            "properties": {
+                "code": {
+                    "type": "integer",
+                    "format": "int32"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "Pet": {
+            "type": "object",
+            "required": [
+                "name",
+                "photoUrls"
+            ],
+            "properties": {
+                "id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "category": {
+                    "$ref": "#/definitions/Category"
+                },
+                "name": {
+                    "type": "string",
+                    "example": "doggie"
+                },
+                "photoUrls": {
+                    "type": "array",
+                    "xml": {
+                        "name": "photoUrl",
+                        "wrapped": true
+                    },
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "tags": {
+                    "type": "array",
+                    "xml": {
+                        "name": "tag",
+                        "wrapped": true
+                    },
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    }
+                },
+                "status": {
+                    "type": "string",
+                    "description": "pet status in the store",
+                    "enum": [
+                        "available",
+                        "pending",
+                        "sold"
+                    ]
+                }
+            },
+            "xml": {
+                "name": "Pet"
+            }
+        }
+    },
+    "externalDocs": {
+        "description": "Find out more about Swagger",
+        "url": "http://swagger.io"
+    }
+}
diff --git a/samples/client/petstore-security-test/typescript-angular2/api.module.ts b/samples/client/petstore-security-test/typescript-angular2/api.module.ts
new file mode 100644
index 00000000000..4ed0510d0d1
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular2/api.module.ts
@@ -0,0 +1,21 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
+
+import { FakeService } from './api/fake.service';
+
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ FakeService ]
+})
+export class ApiModule {
+    public static forConfig(configuration: Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useValue: configuration}]
+        }
+    }
+}
diff --git a/samples/client/petstore-security-test/typescript-angular2/api/fake.service.ts b/samples/client/petstore-security-test/typescript-angular2/api/fake.service.ts
new file mode 100644
index 00000000000..41d9cbf0fd1
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular2/api/fake.service.ts
@@ -0,0 +1,137 @@
+/**
+ * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
+ *
+ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { Http, Headers, URLSearchParams }                    from '@angular/http';
+import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
+import { Response, ResponseContentType }                     from '@angular/http';
+
+import { Observable }                                        from 'rxjs/Observable';
+import '../rxjs-operators';
+
+
+import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+
+@Injectable()
+export class FakeService {
+    protected basePath = 'https://petstore.swagger.io *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r/v2 *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r';
+    public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
+
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+	
+	/**
+     * 
+     * Extends object by coping non-existing properties.
+     * @param objA object to be extended
+     * @param objB source object
+     */
+    private extendObj<T1,T2>(objA: T1, objB: T2) {
+        for(let key in objB){
+            if(objB.hasOwnProperty(key)){
+                objA[key] = objB[key];
+            }
+        }
+        return <T1&T2>objA;
+    }
+
+    /**
+     * To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     * 
+     * @param test code inject * &#39; &quot; &#x3D;end  rn n r To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     */
+    public testCodeInjectEndRnNR(test code inject * &#39; &quot; &#x3D;end  rn n r?: string, extraHttpRequestParams?: any): Observable<{}> {
+        return this.testCodeInjectEndRnNRWithHttpInfo(test code inject * &#39; &quot; &#x3D;end  rn n r, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+
+    /**
+     * To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     * 
+     * @param test code inject * &#39; &quot; &#x3D;end  rn n r To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     */
+    public testCodeInjectEndRnNRWithHttpInfo(test code inject * &#39; &quot; &#x3D;end  rn n r?: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/fake`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let formParams = new URLSearchParams();
+
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json', 
+            '*_/   =end --       '
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            '*_/   =end --       '
+        ];
+        
+            
+        headers.set('Content-Type', 'application/x-www-form-urlencoded');
+
+
+        if (test code inject * &#39; &quot; &#x3D;end  rn n r !== undefined) {
+            formParams.set('test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r', <any>test code inject * &#39; &quot; &#x3D;end  rn n r); 
+        }
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Put,
+            headers: headers,
+            body: formParams.toString(),
+            search: queryParameters
+        });
+        
+        // https://github.com/swagger-api/swagger-codegen/issues/4037
+        if (extraHttpRequestParams) {
+            requestOptions = this.extendObj(requestOptions, extraHttpRequestParams);
+        }
+
+        return this.http.request(path, requestOptions);
+    }
+
+}
diff --git a/samples/client/petstore-security-test/typescript-angular2/configuration.ts b/samples/client/petstore-security-test/typescript-angular2/configuration.ts
new file mode 100644
index 00000000000..ec087d2b0c8
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular2/configuration.ts
@@ -0,0 +1,24 @@
+export interface ConfigurationParameters {
+	apiKey?: string;
+	username?: string;
+	password?: string;
+	accessToken?: string;
+	basePath?: string;
+}
+
+export class Configuration {
+	apiKey: string;
+	username: string;
+	password: string;
+	accessToken: string;
+	basePath: string;
+
+
+	constructor(configurationParameters: ConfigurationParameters = {}) {
+		this.apiKey = configurationParameters.apiKey;
+		this.username = configurationParameters.username;
+		this.password = configurationParameters.password;
+		this.accessToken = configurationParameters.accessToken;
+		this.basePath = configurationParameters.basePath;
+	}
+}
diff --git a/samples/client/petstore-security-test/typescript-angular2/rxjs-operators.ts b/samples/client/petstore-security-test/typescript-angular2/rxjs-operators.ts
new file mode 100644
index 00000000000..5659cd0694f
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular2/rxjs-operators.ts
@@ -0,0 +1,11 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
diff --git a/samples/client/petstore-security-test/typescript-angular2/variables.ts b/samples/client/petstore-security-test/typescript-angular2/variables.ts
new file mode 100644
index 00000000000..27b987e9b23
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular2/variables.ts
@@ -0,0 +1,3 @@
+import { OpaqueToken } from '@angular/core';
+
+export const BASE_PATH = new OpaqueToken('basePath');
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular2/default/api.module.ts b/samples/client/petstore/typescript-angular2/default/api.module.ts
new file mode 100644
index 00000000000..4a2ae9c2e9f
--- /dev/null
+++ b/samples/client/petstore/typescript-angular2/default/api.module.ts
@@ -0,0 +1,23 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
+
+import { PetService } from './api/pet.service';
+import { StoreService } from './api/store.service';
+import { UserService } from './api/user.service';
+
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ PetService, StoreService, UserService ]
+})
+export class ApiModule {
+    public static forConfig(configuration: Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useValue: configuration}]
+        }
+    }
+}
diff --git a/samples/client/petstore/typescript-angular2/default/api/api.ts b/samples/client/petstore/typescript-angular2/default/api/api.ts
index 056206bfaca..b7d674969f5 100644
--- a/samples/client/petstore/typescript-angular2/default/api/api.ts
+++ b/samples/client/petstore/typescript-angular2/default/api/api.ts
@@ -1,3 +1,3 @@
-export * from './PetApi';
-export * from './StoreApi';
-export * from './UserApi';
+export * from './pet.service';
+export * from './store.service';
+export * from './user.service';
diff --git a/samples/client/petstore/typescript-angular2/default/api/pet.service.ts b/samples/client/petstore/typescript-angular2/default/api/pet.service.ts
new file mode 100644
index 00000000000..6680fd39ffe
--- /dev/null
+++ b/samples/client/petstore/typescript-angular2/default/api/pet.service.ts
@@ -0,0 +1,589 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@wordnik.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { Http, Headers, URLSearchParams }                    from '@angular/http';
+import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
+import { Response, ResponseContentType }                     from '@angular/http';
+
+import { Observable }                                        from 'rxjs/Observable';
+import '../rxjs-operators';
+
+import { Pet } from '../model/pet';
+
+import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+
+@Injectable()
+export class PetService {
+    protected basePath = 'http://petstore.swagger.io/v2';
+    public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
+
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * Add a new pet to the store
+     * 
+     * @param body Pet object that needs to be added to the store
+     */
+    public addPet(body?: Pet, extraHttpRequestParams?: any): Observable<{}> {
+        return this.addPetWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Deletes a pet
+     * 
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePet(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<{}> {
+        return this.deletePetWithHttpInfo(petId, apiKey, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatus(status?: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
+        return this.findPetsByStatusWithHttpInfo(status, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @param tags Tags to filter by
+     */
+    public findPetsByTags(tags?: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
+        return this.findPetsByTagsWithHttpInfo(tags, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Find pet by ID
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param petId ID of pet that needs to be fetched
+     */
+    public getPetById(petId: number, extraHttpRequestParams?: any): Observable<Pet> {
+        return this.getPetByIdWithHttpInfo(petId, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Update an existing pet
+     * 
+     * @param body Pet object that needs to be added to the store
+     */
+    public updatePet(body?: Pet, extraHttpRequestParams?: any): Observable<{}> {
+        return this.updatePetWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithForm(petId: string, name?: string, status?: string, extraHttpRequestParams?: any): Observable<{}> {
+        return this.updatePetWithFormWithHttpInfo(petId, name, status, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * uploads an image
+     * 
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFile(petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any): Observable<{}> {
+        return this.uploadFileWithHttpInfo(petId, additionalMetadata, file, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+
+    /**
+     * Add a new pet to the store
+     * 
+     * @param body Pet object that needs to be added to the store
+     */
+    public addPetWithHttpInfo(body?: Pet, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Deletes a pet
+     * 
+     * @param petId Pet id to delete
+     * @param apiKey 
+     */
+    public deletePetWithHttpInfo(petId: number, apiKey?: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet/${petId}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling deletePet.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Delete,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * @param status Status values that need to be considered for filter
+     */
+    public findPetsByStatusWithHttpInfo(status?: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet/findByStatus`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        if (status !== undefined) {
+            queryParameters.set('status', <any>status);
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @param tags Tags to filter by
+     */
+    public findPetsByTagsWithHttpInfo(tags?: Array<string>, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet/findByTags`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        if (tags !== undefined) {
+            queryParameters.set('tags', <any>tags);
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Find pet by ID
+     * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+     * @param petId ID of pet that needs to be fetched
+     */
+    public getPetByIdWithHttpInfo(petId: number, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet/${petId}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling getPetById.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+        // authentication (api_key) required
+        if (this.configuration.apiKey)
+        {
+            headers.set('api_key', this.configuration.apiKey);
+        }
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Update an existing pet
+     * 
+     * @param body Pet object that needs to be added to the store
+     */
+    public updatePetWithHttpInfo(body?: Pet, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Put,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * @param petId ID of pet that needs to be updated
+     * @param name Updated name of the pet
+     * @param status Updated status of the pet
+     */
+    public updatePetWithFormWithHttpInfo(petId: string, name?: string, status?: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet/${petId}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let formParams = new URLSearchParams();
+
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'application/x-www-form-urlencoded'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
+        headers.set('Content-Type', 'application/x-www-form-urlencoded');
+
+
+        if (name !== undefined) {
+            formParams.set('name', <any>name); 
+        }
+        if (status !== undefined) {
+            formParams.set('status', <any>status); 
+        }
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: formParams.toString(),
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * uploads an image
+     * 
+     * @param petId ID of pet to update
+     * @param additionalMetadata Additional data to pass to server
+     * @param file file to upload
+     */
+    public uploadFileWithHttpInfo(petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/pet/${petId}/uploadImage`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        let formParams = new URLSearchParams();
+
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+            'multipart/form-data'
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (petstore_auth) required
+        // oauth required
+        if (this.configuration.accessToken)
+        {
+            headers.set('Authorization', 'Bearer ' + this.configuration.accessToken);
+        }
+            
+        headers.set('Content-Type', 'application/x-www-form-urlencoded');
+
+
+        if (additionalMetadata !== undefined) {
+            formParams.set('additionalMetadata', <any>additionalMetadata); 
+        }
+        if (file !== undefined) {
+            formParams.set('file', <any>file); 
+        }
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: formParams.toString(),
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+}
diff --git a/samples/client/petstore/typescript-angular2/default/api/store.service.ts b/samples/client/petstore/typescript-angular2/default/api/store.service.ts
new file mode 100644
index 00000000000..c9979216fca
--- /dev/null
+++ b/samples/client/petstore/typescript-angular2/default/api/store.service.ts
@@ -0,0 +1,279 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@wordnik.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { Http, Headers, URLSearchParams }                    from '@angular/http';
+import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
+import { Response, ResponseContentType }                     from '@angular/http';
+
+import { Observable }                                        from 'rxjs/Observable';
+import '../rxjs-operators';
+
+import { Order } from '../model/order';
+
+import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+
+@Injectable()
+export class StoreService {
+    protected basePath = 'http://petstore.swagger.io/v2';
+    public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
+
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrder(orderId: string, extraHttpRequestParams?: any): Observable<{}> {
+        return this.deleteOrderWithHttpInfo(orderId, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     */
+    public getInventory(extraHttpRequestParams?: any): Observable<{ [key: string]: number; }> {
+        return this.getInventoryWithHttpInfo(extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderById(orderId: string, extraHttpRequestParams?: any): Observable<Order> {
+        return this.getOrderByIdWithHttpInfo(orderId, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Place an order for a pet
+     * 
+     * @param body order placed for purchasing the pet
+     */
+    public placeOrder(body?: Order, extraHttpRequestParams?: any): Observable<Order> {
+        return this.placeOrderWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted
+     */
+    public deleteOrderWithHttpInfo(orderId: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/store/order/${orderId}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Delete,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     */
+    public getInventoryWithHttpInfo(extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/store/inventory`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+        // authentication (api_key) required
+        if (this.configuration.apiKey)
+        {
+            headers.set('api_key', this.configuration.apiKey);
+        }
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * @param orderId ID of pet that needs to be fetched
+     */
+    public getOrderByIdWithHttpInfo(orderId: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/store/order/${orderId}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Place an order for a pet
+     * 
+     * @param body order placed for purchasing the pet
+     */
+    public placeOrderWithHttpInfo(body?: Order, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/store/order`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+}
diff --git a/samples/client/petstore/typescript-angular2/default/api/user.service.ts b/samples/client/petstore/typescript-angular2/default/api/user.service.ts
new file mode 100644
index 00000000000..51bb7ba908c
--- /dev/null
+++ b/samples/client/petstore/typescript-angular2/default/api/user.service.ts
@@ -0,0 +1,502 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@wordnik.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { Http, Headers, URLSearchParams }                    from '@angular/http';
+import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
+import { Response, ResponseContentType }                     from '@angular/http';
+
+import { Observable }                                        from 'rxjs/Observable';
+import '../rxjs-operators';
+
+import { User } from '../model/user';
+
+import { BASE_PATH }                                         from '../variables';
+import { Configuration }                                     from '../configuration';
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+
+@Injectable()
+export class UserService {
+    protected basePath = 'http://petstore.swagger.io/v2';
+    public defaultHeaders: Headers = new Headers();
+    public configuration: Configuration = new Configuration();
+
+    constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (basePath) {
+            this.basePath = basePath;
+        }
+        if (configuration) {
+            this.configuration = configuration;
+			this.basePath = basePath || configuration.basePath || this.basePath;
+        }
+    }
+
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * @param body Created user object
+     */
+    public createUser(body?: User, extraHttpRequestParams?: any): Observable<{}> {
+        return this.createUserWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object
+     */
+    public createUsersWithArrayInput(body?: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
+        return this.createUsersWithArrayInputWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object
+     */
+    public createUsersWithListInput(body?: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
+        return this.createUsersWithListInputWithHttpInfo(body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted
+     */
+    public deleteUser(username: string, extraHttpRequestParams?: any): Observable<{}> {
+        return this.deleteUserWithHttpInfo(username, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Get user by user name
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+     */
+    public getUserByName(username: string, extraHttpRequestParams?: any): Observable<User> {
+        return this.getUserByNameWithHttpInfo(username, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Logs user into the system
+     * 
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUser(username?: string, password?: string, extraHttpRequestParams?: any): Observable<string> {
+        return this.loginUserWithHttpInfo(username, password, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Logs out current logged in user session
+     * 
+     */
+    public logoutUser(extraHttpRequestParams?: any): Observable<{}> {
+        return this.logoutUserWithHttpInfo(extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted
+     * @param body Updated user object
+     */
+    public updateUser(username: string, body?: User, extraHttpRequestParams?: any): Observable<{}> {
+        return this.updateUserWithHttpInfo(username, body, extraHttpRequestParams)
+            .map((response: Response) => {
+                if (response.status === 204) {
+                    return undefined;
+                } else {
+                    return response.json();
+                }
+            });
+    }
+
+
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * @param body Created user object
+     */
+    public createUserWithHttpInfo(body?: User, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object
+     */
+    public createUsersWithArrayInputWithHttpInfo(body?: Array<User>, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user/createWithArray`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object
+     */
+    public createUsersWithListInputWithHttpInfo(body?: Array<User>, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user/createWithList`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Post,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted
+     */
+    public deleteUserWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user/${username}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new Error('Required parameter username was null or undefined when calling deleteUser.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Delete,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Get user by user name
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+     */
+    public getUserByNameWithHttpInfo(username: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user/${username}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new Error('Required parameter username was null or undefined when calling getUserByName.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Logs user into the system
+     * 
+     * @param username The user name for login
+     * @param password The password for login in clear text
+     */
+    public loginUserWithHttpInfo(username?: string, password?: string, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user/login`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        if (username !== undefined) {
+            queryParameters.set('username', <any>username);
+        }
+        if (password !== undefined) {
+            queryParameters.set('password', <any>password);
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Logs out current logged in user session
+     * 
+     */
+    public logoutUserWithHttpInfo(extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user/logout`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Get,
+            headers: headers,
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted
+     * @param body Updated user object
+     */
+    public updateUserWithHttpInfo(username: string, body?: User, extraHttpRequestParams?: any): Observable<Response> {
+        const path = this.basePath + `/user/${username}`;
+
+        let queryParameters = new URLSearchParams();
+        let headers = new Headers(this.defaultHeaders.toJSON()); // https://github.com/angular/angular/issues/6845
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new Error('Required parameter username was null or undefined when calling updateUser.');
+        }
+
+
+        // to determine the Content-Type header
+        let consumes: string[] = [
+        ];
+
+        // to determine the Accept header
+        let produces: string[] = [
+            'application/json', 
+            'application/xml'
+        ];
+        
+            
+
+        headers.set('Content-Type', 'application/json');
+
+
+        let requestOptions: RequestOptionsArgs = new RequestOptions({
+            method: RequestMethod.Put,
+            headers: headers,
+            body: body == null ? '' : JSON.stringify(body), // https://github.com/angular/angular/issues/10612
+            search: queryParameters,
+            responseType: ResponseContentType.Json
+        });
+
+        return this.http.request(path, requestOptions);
+    }
+
+}
diff --git a/samples/client/petstore/typescript-angular2/default/configuration.ts b/samples/client/petstore/typescript-angular2/default/configuration.ts
index 94989933b63..ec087d2b0c8 100644
--- a/samples/client/petstore/typescript-angular2/default/configuration.ts
+++ b/samples/client/petstore/typescript-angular2/default/configuration.ts
@@ -1,6 +1,24 @@
+export interface ConfigurationParameters {
+	apiKey?: string;
+	username?: string;
+	password?: string;
+	accessToken?: string;
+	basePath?: string;
+}
+
 export class Configuration {
-    apiKey: string;
-    username: string;
-    password: string;
-    accessToken: string;
-}
\ No newline at end of file
+	apiKey: string;
+	username: string;
+	password: string;
+	accessToken: string;
+	basePath: string;
+
+
+	constructor(configurationParameters: ConfigurationParameters = {}) {
+		this.apiKey = configurationParameters.apiKey;
+		this.username = configurationParameters.username;
+		this.password = configurationParameters.password;
+		this.accessToken = configurationParameters.accessToken;
+		this.basePath = configurationParameters.basePath;
+	}
+}
diff --git a/samples/client/petstore/typescript-angular2/default/model/Category.ts b/samples/client/petstore/typescript-angular2/default/model/category.ts
similarity index 96%
rename from samples/client/petstore/typescript-angular2/default/model/Category.ts
rename to samples/client/petstore/typescript-angular2/default/model/category.ts
index 4ab562b6d3b..fadade3901b 100644
--- a/samples/client/petstore/typescript-angular2/default/model/Category.ts
+++ b/samples/client/petstore/typescript-angular2/default/model/category.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface Category {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/default/model/models.ts b/samples/client/petstore/typescript-angular2/default/model/models.ts
index 92dac02846c..1f152369d80 100644
--- a/samples/client/petstore/typescript-angular2/default/model/models.ts
+++ b/samples/client/petstore/typescript-angular2/default/model/models.ts
@@ -1,5 +1,5 @@
-export * from './Category';
-export * from './Order';
-export * from './Pet';
-export * from './Tag';
-export * from './User';
+export * from './category';
+export * from './order';
+export * from './pet';
+export * from './tag';
+export * from './user';
diff --git a/samples/client/petstore/typescript-angular2/npm/model/Order.ts b/samples/client/petstore/typescript-angular2/default/model/order.ts
similarity index 97%
rename from samples/client/petstore/typescript-angular2/npm/model/Order.ts
rename to samples/client/petstore/typescript-angular2/default/model/order.ts
index 8fdad0357f4..59be66c49fa 100644
--- a/samples/client/petstore/typescript-angular2/npm/model/Order.ts
+++ b/samples/client/petstore/typescript-angular2/default/model/order.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface Order {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/npm/model/Pet.ts b/samples/client/petstore/typescript-angular2/default/model/pet.ts
similarity index 92%
rename from samples/client/petstore/typescript-angular2/npm/model/Pet.ts
rename to samples/client/petstore/typescript-angular2/default/model/pet.ts
index 14b0c4ced46..b05f6839d40 100644
--- a/samples/client/petstore/typescript-angular2/npm/model/Pet.ts
+++ b/samples/client/petstore/typescript-angular2/default/model/pet.ts
@@ -22,18 +22,20 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+import { Category } from './category';
+import { Tag } from './tag';
+
 
 export interface Pet {
     id?: number;
 
-    category?: models.Category;
+    category?: Category;
 
     name: string;
 
     photoUrls: Array<string>;
 
-    tags?: Array<models.Tag>;
+    tags?: Array<Tag>;
 
     /**
      * pet status in the store
diff --git a/samples/client/petstore/typescript-angular2/default/model/Tag.ts b/samples/client/petstore/typescript-angular2/default/model/tag.ts
similarity index 96%
rename from samples/client/petstore/typescript-angular2/default/model/Tag.ts
rename to samples/client/petstore/typescript-angular2/default/model/tag.ts
index 2e1bf1572e1..c414399f3ac 100644
--- a/samples/client/petstore/typescript-angular2/default/model/Tag.ts
+++ b/samples/client/petstore/typescript-angular2/default/model/tag.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface Tag {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/npm/model/User.ts b/samples/client/petstore/typescript-angular2/default/model/user.ts
similarity index 97%
rename from samples/client/petstore/typescript-angular2/npm/model/User.ts
rename to samples/client/petstore/typescript-angular2/default/model/user.ts
index efb2351b234..eb28aa2f417 100644
--- a/samples/client/petstore/typescript-angular2/npm/model/User.ts
+++ b/samples/client/petstore/typescript-angular2/default/model/user.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface User {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/default/rxjs-operators.ts b/samples/client/petstore/typescript-angular2/default/rxjs-operators.ts
new file mode 100644
index 00000000000..5659cd0694f
--- /dev/null
+++ b/samples/client/petstore/typescript-angular2/default/rxjs-operators.ts
@@ -0,0 +1,11 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
diff --git a/samples/client/petstore/typescript-angular2/npm/README.md b/samples/client/petstore/typescript-angular2/npm/README.md
index d5d17b9074d..d9c9481e210 100644
--- a/samples/client/petstore/typescript-angular2/npm/README.md
+++ b/samples/client/petstore/typescript-angular2/npm/README.md
@@ -1,4 +1,4 @@
-## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201610271623
+## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201611081538
 
 ### Building
 
@@ -19,7 +19,7 @@ navigate to the folder of your consuming project and run one of next commando's.
 _published:_
 
 ```
-npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201610271623 --save
+npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201611081538 --save
 ```
 
 _unPublished (not recommended):_
@@ -41,4 +41,4 @@ import { BASE_PATH } from './path-to-swagger-gen-service/index';
 bootstrap(AppComponent, [
     { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
 ]);
-```  
\ No newline at end of file
+```
diff --git a/samples/client/petstore/typescript-angular2/npm/api.module.ts b/samples/client/petstore/typescript-angular2/npm/api.module.ts
new file mode 100644
index 00000000000..4a2ae9c2e9f
--- /dev/null
+++ b/samples/client/petstore/typescript-angular2/npm/api.module.ts
@@ -0,0 +1,23 @@
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { Configuration } from './configuration';
+
+import { PetService } from './api/pet.service';
+import { StoreService } from './api/store.service';
+import { UserService } from './api/user.service';
+
+@NgModule({
+  imports:      [ CommonModule, HttpModule ],
+  declarations: [],
+  exports:      [],
+  providers:    [ PetService, StoreService, UserService ]
+})
+export class ApiModule {
+    public static forConfig(configuration: Configuration): ModuleWithProviders {
+        return {
+            ngModule: ApiModule,
+            providers: [ {provide: Configuration, useValue: configuration}]
+        }
+    }
+}
diff --git a/samples/client/petstore/typescript-angular2/npm/api/api.ts b/samples/client/petstore/typescript-angular2/npm/api/api.ts
index 056206bfaca..b7d674969f5 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/api.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/api.ts
@@ -1,3 +1,3 @@
-export * from './PetApi';
-export * from './StoreApi';
-export * from './UserApi';
+export * from './pet.service';
+export * from './store.service';
+export * from './user.service';
diff --git a/samples/client/petstore/typescript-angular2/default/api/PetApi.ts b/samples/client/petstore/typescript-angular2/npm/api/pet.service.ts
similarity index 97%
rename from samples/client/petstore/typescript-angular2/default/api/PetApi.ts
rename to samples/client/petstore/typescript-angular2/npm/api/pet.service.ts
index f91faccdd65..dfce5fb7cf4 100644
--- a/samples/client/petstore/typescript-angular2/default/api/PetApi.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/pet.service.ts
@@ -28,9 +28,10 @@ import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http
 import { Response, ResponseContentType }                     from '@angular/http';
 
 import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
+import '../rxjs-operators';
+
+import { Pet } from '../model/pet';
 
-import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
 import { Configuration }                                     from '../configuration';
 
@@ -38,7 +39,7 @@ import { Configuration }                                     from '../configurat
 
 
 @Injectable()
-export class PetApi {
+export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
     public configuration: Configuration = new Configuration();
@@ -72,7 +73,7 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public addPet(body?: models.Pet, extraHttpRequestParams?: any): Observable<{}> {
+    public addPet(body?: Pet, extraHttpRequestParams?: any): Observable<{}> {
         return this.addPetWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -105,7 +106,7 @@ export class PetApi {
      * Multiple status values can be provided with comma separated strings
      * @param status Status values that need to be considered for filter
      */
-    public findPetsByStatus(status?: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>> {
+    public findPetsByStatus(status?: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
         return this.findPetsByStatusWithHttpInfo(status, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -121,7 +122,7 @@ export class PetApi {
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * @param tags Tags to filter by
      */
-    public findPetsByTags(tags?: Array<string>, extraHttpRequestParams?: any): Observable<Array<models.Pet>> {
+    public findPetsByTags(tags?: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
         return this.findPetsByTagsWithHttpInfo(tags, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -137,7 +138,7 @@ export class PetApi {
      * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
      * @param petId ID of pet that needs to be fetched
      */
-    public getPetById(petId: number, extraHttpRequestParams?: any): Observable<models.Pet> {
+    public getPetById(petId: number, extraHttpRequestParams?: any): Observable<Pet> {
         return this.getPetByIdWithHttpInfo(petId, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -153,7 +154,7 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public updatePet(body?: models.Pet, extraHttpRequestParams?: any): Observable<{}> {
+    public updatePet(body?: Pet, extraHttpRequestParams?: any): Observable<{}> {
         return this.updatePetWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -206,7 +207,7 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public addPetWithHttpInfo(body?: models.Pet, extraHttpRequestParams?: any): Observable<Response> {
+    public addPetWithHttpInfo(body?: Pet, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet`;
 
         let queryParameters = new URLSearchParams();
@@ -460,7 +461,7 @@ export class PetApi {
      * 
      * @param body Pet object that needs to be added to the store
      */
-    public updatePetWithHttpInfo(body?: models.Pet, extraHttpRequestParams?: any): Observable<Response> {
+    public updatePetWithHttpInfo(body?: Pet, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/pet`;
 
         let queryParameters = new URLSearchParams();
diff --git a/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts b/samples/client/petstore/typescript-angular2/npm/api/store.service.ts
similarity index 96%
rename from samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts
rename to samples/client/petstore/typescript-angular2/npm/api/store.service.ts
index e5382d97b05..323d28bc1cd 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/store.service.ts
@@ -28,9 +28,10 @@ import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http
 import { Response, ResponseContentType }                     from '@angular/http';
 
 import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
+import '../rxjs-operators';
+
+import { Order } from '../model/order';
 
-import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
 import { Configuration }                                     from '../configuration';
 
@@ -38,7 +39,7 @@ import { Configuration }                                     from '../configurat
 
 
 @Injectable()
-export class StoreApi {
+export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
     public configuration: Configuration = new Configuration();
@@ -103,7 +104,7 @@ export class StoreApi {
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param orderId ID of pet that needs to be fetched
      */
-    public getOrderById(orderId: string, extraHttpRequestParams?: any): Observable<models.Order> {
+    public getOrderById(orderId: string, extraHttpRequestParams?: any): Observable<Order> {
         return this.getOrderByIdWithHttpInfo(orderId, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -119,7 +120,7 @@ export class StoreApi {
      * 
      * @param body order placed for purchasing the pet
      */
-    public placeOrder(body?: models.Order, extraHttpRequestParams?: any): Observable<models.Order> {
+    public placeOrder(body?: Order, extraHttpRequestParams?: any): Observable<Order> {
         return this.placeOrderWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -268,7 +269,7 @@ export class StoreApi {
      * 
      * @param body order placed for purchasing the pet
      */
-    public placeOrderWithHttpInfo(body?: models.Order, extraHttpRequestParams?: any): Observable<Response> {
+    public placeOrderWithHttpInfo(body?: Order, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/store/order`;
 
         let queryParameters = new URLSearchParams();
diff --git a/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts b/samples/client/petstore/typescript-angular2/npm/api/user.service.ts
similarity index 94%
rename from samples/client/petstore/typescript-angular2/npm/api/UserApi.ts
rename to samples/client/petstore/typescript-angular2/npm/api/user.service.ts
index a3f14b23790..efb48cb73c4 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/user.service.ts
@@ -28,9 +28,10 @@ import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http
 import { Response, ResponseContentType }                     from '@angular/http';
 
 import { Observable }                                        from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
+import '../rxjs-operators';
+
+import { User } from '../model/user';
 
-import * as models                                           from '../model/models';
 import { BASE_PATH }                                         from '../variables';
 import { Configuration }                                     from '../configuration';
 
@@ -38,7 +39,7 @@ import { Configuration }                                     from '../configurat
 
 
 @Injectable()
-export class UserApi {
+export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders: Headers = new Headers();
     public configuration: Configuration = new Configuration();
@@ -72,7 +73,7 @@ export class UserApi {
      * This can only be done by the logged in user.
      * @param body Created user object
      */
-    public createUser(body?: models.User, extraHttpRequestParams?: any): Observable<{}> {
+    public createUser(body?: User, extraHttpRequestParams?: any): Observable<{}> {
         return this.createUserWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -88,7 +89,7 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithArrayInput(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<{}> {
+    public createUsersWithArrayInput(body?: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
         return this.createUsersWithArrayInputWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -104,7 +105,7 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithListInput(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<{}> {
+    public createUsersWithListInput(body?: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
         return this.createUsersWithListInputWithHttpInfo(body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -136,7 +137,7 @@ export class UserApi {
      * 
      * @param username The name that needs to be fetched. Use user1 for testing. 
      */
-    public getUserByName(username: string, extraHttpRequestParams?: any): Observable<models.User> {
+    public getUserByName(username: string, extraHttpRequestParams?: any): Observable<User> {
         return this.getUserByNameWithHttpInfo(username, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -185,7 +186,7 @@ export class UserApi {
      * @param username name that need to be deleted
      * @param body Updated user object
      */
-    public updateUser(username: string, body?: models.User, extraHttpRequestParams?: any): Observable<{}> {
+    public updateUser(username: string, body?: User, extraHttpRequestParams?: any): Observable<{}> {
         return this.updateUserWithHttpInfo(username, body, extraHttpRequestParams)
             .map((response: Response) => {
                 if (response.status === 204) {
@@ -202,7 +203,7 @@ export class UserApi {
      * This can only be done by the logged in user.
      * @param body Created user object
      */
-    public createUserWithHttpInfo(body?: models.User, extraHttpRequestParams?: any): Observable<Response> {
+    public createUserWithHttpInfo(body?: User, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user`;
 
         let queryParameters = new URLSearchParams();
@@ -244,7 +245,7 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithArrayInputWithHttpInfo(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<Response> {
+    public createUsersWithArrayInputWithHttpInfo(body?: Array<User>, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user/createWithArray`;
 
         let queryParameters = new URLSearchParams();
@@ -286,7 +287,7 @@ export class UserApi {
      * 
      * @param body List of user object
      */
-    public createUsersWithListInputWithHttpInfo(body?: Array<models.User>, extraHttpRequestParams?: any): Observable<Response> {
+    public createUsersWithListInputWithHttpInfo(body?: Array<User>, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user/createWithList`;
 
         let queryParameters = new URLSearchParams();
@@ -503,7 +504,7 @@ export class UserApi {
      * @param username name that need to be deleted
      * @param body Updated user object
      */
-    public updateUserWithHttpInfo(username: string, body?: models.User, extraHttpRequestParams?: any): Observable<Response> {
+    public updateUserWithHttpInfo(username: string, body?: User, extraHttpRequestParams?: any): Observable<Response> {
         const path = this.basePath + `/user/${username}`;
 
         let queryParameters = new URLSearchParams();
diff --git a/samples/client/petstore/typescript-angular2/npm/model/Category.ts b/samples/client/petstore/typescript-angular2/npm/model/category.ts
similarity index 96%
rename from samples/client/petstore/typescript-angular2/npm/model/Category.ts
rename to samples/client/petstore/typescript-angular2/npm/model/category.ts
index 4ab562b6d3b..fadade3901b 100644
--- a/samples/client/petstore/typescript-angular2/npm/model/Category.ts
+++ b/samples/client/petstore/typescript-angular2/npm/model/category.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface Category {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/npm/model/models.ts b/samples/client/petstore/typescript-angular2/npm/model/models.ts
index 92dac02846c..1f152369d80 100644
--- a/samples/client/petstore/typescript-angular2/npm/model/models.ts
+++ b/samples/client/petstore/typescript-angular2/npm/model/models.ts
@@ -1,5 +1,5 @@
-export * from './Category';
-export * from './Order';
-export * from './Pet';
-export * from './Tag';
-export * from './User';
+export * from './category';
+export * from './order';
+export * from './pet';
+export * from './tag';
+export * from './user';
diff --git a/samples/client/petstore/typescript-angular2/default/model/Order.ts b/samples/client/petstore/typescript-angular2/npm/model/order.ts
similarity index 97%
rename from samples/client/petstore/typescript-angular2/default/model/Order.ts
rename to samples/client/petstore/typescript-angular2/npm/model/order.ts
index 8fdad0357f4..59be66c49fa 100644
--- a/samples/client/petstore/typescript-angular2/default/model/Order.ts
+++ b/samples/client/petstore/typescript-angular2/npm/model/order.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface Order {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/default/model/Pet.ts b/samples/client/petstore/typescript-angular2/npm/model/pet.ts
similarity index 92%
rename from samples/client/petstore/typescript-angular2/default/model/Pet.ts
rename to samples/client/petstore/typescript-angular2/npm/model/pet.ts
index 14b0c4ced46..b05f6839d40 100644
--- a/samples/client/petstore/typescript-angular2/default/model/Pet.ts
+++ b/samples/client/petstore/typescript-angular2/npm/model/pet.ts
@@ -22,18 +22,20 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+import { Category } from './category';
+import { Tag } from './tag';
+
 
 export interface Pet {
     id?: number;
 
-    category?: models.Category;
+    category?: Category;
 
     name: string;
 
     photoUrls: Array<string>;
 
-    tags?: Array<models.Tag>;
+    tags?: Array<Tag>;
 
     /**
      * pet status in the store
diff --git a/samples/client/petstore/typescript-angular2/npm/model/Tag.ts b/samples/client/petstore/typescript-angular2/npm/model/tag.ts
similarity index 96%
rename from samples/client/petstore/typescript-angular2/npm/model/Tag.ts
rename to samples/client/petstore/typescript-angular2/npm/model/tag.ts
index 2e1bf1572e1..c414399f3ac 100644
--- a/samples/client/petstore/typescript-angular2/npm/model/Tag.ts
+++ b/samples/client/petstore/typescript-angular2/npm/model/tag.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface Tag {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/default/model/User.ts b/samples/client/petstore/typescript-angular2/npm/model/user.ts
similarity index 97%
rename from samples/client/petstore/typescript-angular2/default/model/User.ts
rename to samples/client/petstore/typescript-angular2/npm/model/user.ts
index efb2351b234..eb28aa2f417 100644
--- a/samples/client/petstore/typescript-angular2/default/model/User.ts
+++ b/samples/client/petstore/typescript-angular2/npm/model/user.ts
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-import * as models from './models';
+
 
 export interface User {
     id?: number;
diff --git a/samples/client/petstore/typescript-angular2/npm/package.json b/samples/client/petstore/typescript-angular2/npm/package.json
index 0bd97a1b43c..4a0760e7efd 100644
--- a/samples/client/petstore/typescript-angular2/npm/package.json
+++ b/samples/client/petstore/typescript-angular2/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swagger/angular2-typescript-petstore",
-  "version": "0.0.1-SNAPSHOT.201610271623",
+  "version": "0.0.1-SNAPSHOT.201611081538",
   "description": "swagger client for @swagger/angular2-typescript-petstore",
   "author": "Swagger Codegen Contributors",
   "keywords": [
@@ -14,25 +14,25 @@
     "postinstall": "npm run build"
   },
   "peerDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
-    "@angular/http": "^2.0.0-rc.5",
-    "@angular/common": "^2.0.0-rc.5",
-    "@angular/compiler": "^2.0.0-rc.5",
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.17"
   },
   "devDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
-    "@angular/http": "^2.0.0-rc.5",
-    "@angular/common": "^2.0.0-rc.5",
-    "@angular/compiler": "^2.0.0-rc.5",
-    "@angular/platform-browser": "^2.0.0-rc.5",
+    "@angular/core": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "@angular/platform-browser": "^2.0.0",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "5.0.0-beta.6",
-    "zone.js": "^0.6.17",  
+    "zone.js": "^0.6.17",
     "typescript": "^1.8.10",
     "typings": "^1.3.2"
   },
diff --git a/samples/client/petstore/typescript-angular2/npm/rxjs-operators.ts b/samples/client/petstore/typescript-angular2/npm/rxjs-operators.ts
new file mode 100644
index 00000000000..5659cd0694f
--- /dev/null
+++ b/samples/client/petstore/typescript-angular2/npm/rxjs-operators.ts
@@ -0,0 +1,11 @@
+// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
+
+// See node_module/rxjs/Rxjs.js
+// Import just the rxjs statics and operators we need for THIS app.
+
+// Statics
+import 'rxjs/add/observable/throw';
+
+// Operators
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';