diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index bc4f08d7f55..c44e070fe62 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -600,7 +600,7 @@ public class DefaultCodegen {
 
     public CodegenProperty fromProperty(String name, Property p) {
         if (p == null) {
-            LOGGER.error("unexpected missing property for name " + null);
+            LOGGER.error("unexpected missing property for name " + name);
             return null;
         }
         CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
index 33c3c48c168..8eec2b8772e 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -2,6 +2,8 @@ package io.swagger.codegen.languages;
 
 import io.swagger.codegen.SupportingFile;
 
+import java.io.File;
+
 public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen {
 	
 	@Override
@@ -19,6 +21,8 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
 	    modelTemplateFiles.put("model.mustache", ".ts");
 	    apiTemplateFiles.put("api.mustache", ".ts");
 	    templateDir = "TypeScript-Angular";
-	    supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage, "api.d.ts"));
+	    apiPackage = "API.Client";
+	    modelPackage = "API.Client";
+	    supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage().replace('.', File.separatorChar), "api.d.ts"));
 	}
 }
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts
similarity index 87%
rename from samples/client/petstore/typescript-angular/Category.ts
rename to samples/client/petstore/typescript-angular/API/Client/Category.ts
index 2ec6a2b20f9..7faf87208eb 100644
--- a/samples/client/petstore/typescript-angular/Category.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts
@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Category {
diff --git a/samples/client/petstore/typescript-angular/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts
similarity index 96%
rename from samples/client/petstore/typescript-angular/Order.ts
rename to samples/client/petstore/typescript-angular/API/Client/Order.ts
index f916138d7a0..abee3a2894b 100644
--- a/samples/client/petstore/typescript-angular/Order.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts
@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Order {
diff --git a/samples/client/petstore/typescript-angular/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
similarity index 96%
rename from samples/client/petstore/typescript-angular/Pet.ts
rename to samples/client/petstore/typescript-angular/API/Client/Pet.ts
index ac8d6b72fdf..9523bef90b0 100644
--- a/samples/client/petstore/typescript-angular/Pet.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Pet {
diff --git a/samples/client/petstore/typescript-angular/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular/PetApi.ts
rename to samples/client/petstore/typescript-angular/API/Client/PetApi.ts
index 3067994a76c..d3052eec52f 100644
--- a/samples/client/petstore/typescript-angular/PetApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
@@ -2,7 +2,7 @@
 
 /* tslint:disable:no-unused-variable member-ordering */
 
-module  {
+module API.Client {
     'use strict';
 
     export class PetApi {
diff --git a/samples/client/petstore/typescript-angular/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular/StoreApi.ts
rename to samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
index 67f60be3133..f796cef4b94 100644
--- a/samples/client/petstore/typescript-angular/StoreApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
@@ -2,7 +2,7 @@
 
 /* tslint:disable:no-unused-variable member-ordering */
 
-module  {
+module API.Client {
     'use strict';
 
     export class StoreApi {
diff --git a/samples/client/petstore/typescript-angular/Tag.ts b/samples/client/petstore/typescript-angular/API/Client/Tag.ts
similarity index 86%
rename from samples/client/petstore/typescript-angular/Tag.ts
rename to samples/client/petstore/typescript-angular/API/Client/Tag.ts
index e614fcc084d..2ec9b456f27 100644
--- a/samples/client/petstore/typescript-angular/Tag.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts
@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Tag {
diff --git a/samples/client/petstore/typescript-angular/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts
similarity index 94%
rename from samples/client/petstore/typescript-angular/User.ts
rename to samples/client/petstore/typescript-angular/API/Client/User.ts
index 93b8ae0fde6..ca8ac57c7a3 100644
--- a/samples/client/petstore/typescript-angular/User.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/User.ts
@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class User {
diff --git a/samples/client/petstore/typescript-angular/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
similarity index 99%
rename from samples/client/petstore/typescript-angular/UserApi.ts
rename to samples/client/petstore/typescript-angular/API/Client/UserApi.ts
index 10166a0ea90..eb04f4b31f0 100644
--- a/samples/client/petstore/typescript-angular/UserApi.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
@@ -2,7 +2,7 @@
 
 /* tslint:disable:no-unused-variable member-ordering */
 
-module  {
+module API.Client {
     'use strict';
 
     export class UserApi {
diff --git a/samples/client/petstore/typescript-angular/api.d.ts b/samples/client/petstore/typescript-angular/API/Client/api.d.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular/api.d.ts
rename to samples/client/petstore/typescript-angular/API/Client/api.d.ts