diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh
index af322af4820..2bb63f6d573 100755
--- a/bin/all-petstore.sh
+++ b/bin/all-petstore.sh
@@ -49,5 +49,6 @@ cd $APP_DIR
 ./bin/tizen-petstore.sh
 ./bin/typescript-angular-petstore.sh
 ./bin/typescript-angular2-petstore.sh
+./bin/typescript-angular2-petstore-with-npm.sh
 ./bin/typescript-node-petstore.sh
 ./bin/lumen-petstore-server.sh
\ No newline at end of file
diff --git a/bin/typescript-angular2-petstore-with-npm.sh b/bin/typescript-angular2-petstore-with-npm.sh
index 9e455715b01..6f13f3bfb32 100755
--- a/bin/typescript-angular2-petstore-with-npm.sh
+++ b/bin/typescript-angular2-petstore-with-npm.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-angular2 -c bin/typescript-angular2-petstore-with-npm.json -o samples/client/petstore/typescript-angular2-with-npm"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-angular2 -c bin/typescript-angular2-petstore-with-npm.json -o samples/client/petstore/typescript-angular2/npm"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/typescript-angular2-petstore.sh b/bin/typescript-angular2-petstore.sh
index 4ad341f64f8..f26dd0f668f 100755
--- a/bin/typescript-angular2-petstore.sh
+++ b/bin/typescript-angular2-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-angular2 -o samples/client/petstore/typescript-angular2"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-angular2 -o samples/client/petstore/typescript-angular2/default"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/typescript-angular2-with-npm.bat b/bin/windows/typescript-angular2-with-npm.bat
new file mode 100644
index 00000000000..34866ca1faa
--- /dev/null
+++ b/bin/windows/typescript-angular2-with-npm.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\npm
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/typescript-angular2.bat b/bin/windows/typescript-angular2.bat
index 7657d184fd1..ce2f0e0dc8c 100755
--- a/bin/windows/typescript-angular2.bat
+++ b/bin/windows/typescript-angular2.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular
+set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\default
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/samples/client/petstore/typescript-angular2-with-npm/api/PetApi.ts b/samples/client/petstore/typescript-angular2/default/api/PetApi.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/api/PetApi.ts
rename to samples/client/petstore/typescript-angular2/default/api/PetApi.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/api/StoreApi.ts b/samples/client/petstore/typescript-angular2/default/api/StoreApi.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/api/StoreApi.ts
rename to samples/client/petstore/typescript-angular2/default/api/StoreApi.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/api/UserApi.ts b/samples/client/petstore/typescript-angular2/default/api/UserApi.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/api/UserApi.ts
rename to samples/client/petstore/typescript-angular2/default/api/UserApi.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/api/api.ts b/samples/client/petstore/typescript-angular2/default/api/api.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/api/api.ts
rename to samples/client/petstore/typescript-angular2/default/api/api.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/index.ts b/samples/client/petstore/typescript-angular2/default/index.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/index.ts
rename to samples/client/petstore/typescript-angular2/default/index.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/model/Category.ts b/samples/client/petstore/typescript-angular2/default/model/Category.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/model/Category.ts
rename to samples/client/petstore/typescript-angular2/default/model/Category.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/model/Order.ts b/samples/client/petstore/typescript-angular2/default/model/Order.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/model/Order.ts
rename to samples/client/petstore/typescript-angular2/default/model/Order.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/model/Pet.ts b/samples/client/petstore/typescript-angular2/default/model/Pet.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/model/Pet.ts
rename to samples/client/petstore/typescript-angular2/default/model/Pet.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/model/Tag.ts b/samples/client/petstore/typescript-angular2/default/model/Tag.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/model/Tag.ts
rename to samples/client/petstore/typescript-angular2/default/model/Tag.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/model/User.ts b/samples/client/petstore/typescript-angular2/default/model/User.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/model/User.ts
rename to samples/client/petstore/typescript-angular2/default/model/User.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/model/models.ts b/samples/client/petstore/typescript-angular2/default/model/models.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/model/models.ts
rename to samples/client/petstore/typescript-angular2/default/model/models.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/README.md b/samples/client/petstore/typescript-angular2/npm/README.md
similarity index 84%
rename from samples/client/petstore/typescript-angular2-with-npm/README.md
rename to samples/client/petstore/typescript-angular2/npm/README.md
index 5c393dc4906..7fc18e940b3 100644
--- a/samples/client/petstore/typescript-angular2-with-npm/README.md
+++ b/samples/client/petstore/typescript-angular2/npm/README.md
@@ -1,4 +1,4 @@
-## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201604211551
+## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201604241113
 
 ### 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.201604211551 --save
+npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201604241113 --save
 ```
 
 _unPublished (not recommended):_
diff --git a/samples/client/petstore/typescript-angular2/api/PetApi.ts b/samples/client/petstore/typescript-angular2/npm/api/PetApi.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/api/PetApi.ts
rename to samples/client/petstore/typescript-angular2/npm/api/PetApi.ts
diff --git a/samples/client/petstore/typescript-angular2/api/StoreApi.ts b/samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/api/StoreApi.ts
rename to samples/client/petstore/typescript-angular2/npm/api/StoreApi.ts
diff --git a/samples/client/petstore/typescript-angular2/api/UserApi.ts b/samples/client/petstore/typescript-angular2/npm/api/UserApi.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/api/UserApi.ts
rename to samples/client/petstore/typescript-angular2/npm/api/UserApi.ts
diff --git a/samples/client/petstore/typescript-angular2/api/api.ts b/samples/client/petstore/typescript-angular2/npm/api/api.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/api/api.ts
rename to samples/client/petstore/typescript-angular2/npm/api/api.ts
diff --git a/samples/client/petstore/typescript-angular2/index.ts b/samples/client/petstore/typescript-angular2/npm/index.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/index.ts
rename to samples/client/petstore/typescript-angular2/npm/index.ts
diff --git a/samples/client/petstore/typescript-angular2/model/Category.ts b/samples/client/petstore/typescript-angular2/npm/model/Category.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/model/Category.ts
rename to samples/client/petstore/typescript-angular2/npm/model/Category.ts
diff --git a/samples/client/petstore/typescript-angular2/model/Order.ts b/samples/client/petstore/typescript-angular2/npm/model/Order.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/model/Order.ts
rename to samples/client/petstore/typescript-angular2/npm/model/Order.ts
diff --git a/samples/client/petstore/typescript-angular2/model/Pet.ts b/samples/client/petstore/typescript-angular2/npm/model/Pet.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/model/Pet.ts
rename to samples/client/petstore/typescript-angular2/npm/model/Pet.ts
diff --git a/samples/client/petstore/typescript-angular2/model/Tag.ts b/samples/client/petstore/typescript-angular2/npm/model/Tag.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/model/Tag.ts
rename to samples/client/petstore/typescript-angular2/npm/model/Tag.ts
diff --git a/samples/client/petstore/typescript-angular2/model/User.ts b/samples/client/petstore/typescript-angular2/npm/model/User.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/model/User.ts
rename to samples/client/petstore/typescript-angular2/npm/model/User.ts
diff --git a/samples/client/petstore/typescript-angular2/model/models.ts b/samples/client/petstore/typescript-angular2/npm/model/models.ts
similarity index 100%
rename from samples/client/petstore/typescript-angular2/model/models.ts
rename to samples/client/petstore/typescript-angular2/npm/model/models.ts
diff --git a/samples/client/petstore/typescript-angular2-with-npm/package.json b/samples/client/petstore/typescript-angular2/npm/package.json
similarity index 94%
rename from samples/client/petstore/typescript-angular2-with-npm/package.json
rename to samples/client/petstore/typescript-angular2/npm/package.json
index f88c08d4df0..0f4c2b3200a 100644
--- a/samples/client/petstore/typescript-angular2-with-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.201604211551",
+  "version": "0.0.1-SNAPSHOT.201604241113",
   "description": "swagger client for @swagger/angular2-typescript-petstore",
   "keywords": [
     "swagger-client"
diff --git a/samples/client/petstore/typescript-angular2-with-npm/tsconfig.json b/samples/client/petstore/typescript-angular2/npm/tsconfig.json
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/tsconfig.json
rename to samples/client/petstore/typescript-angular2/npm/tsconfig.json
diff --git a/samples/client/petstore/typescript-angular2-with-npm/typings.json b/samples/client/petstore/typescript-angular2/npm/typings.json
similarity index 100%
rename from samples/client/petstore/typescript-angular2-with-npm/typings.json
rename to samples/client/petstore/typescript-angular2/npm/typings.json
diff --git a/samples/server/petstore/slim/SwaggerServer/lib/models/ApiResponse.php b/samples/server/petstore/slim/SwaggerServer/lib/models/ApiResponse.php
deleted file mode 100644
index 25779f3fc34..00000000000
--- a/samples/server/petstore/slim/SwaggerServer/lib/models/ApiResponse.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * ApiResponse
- */
-namespace SwaggerServer\lib\models;
-
-/*
- * ApiResponse
- */
-class ApiResponse {
-    /* @var int $code  */
-    private $code;
-    /* @var string $type  */
-    private $type;
-    /* @var string $message  */
-    private $message;
-    
-}
diff --git a/samples/server/petstore/slim/SwaggerServer/lib/models/Category.php b/samples/server/petstore/slim/SwaggerServer/lib/models/Category.php
deleted file mode 100644
index df850ec1d65..00000000000
--- a/samples/server/petstore/slim/SwaggerServer/lib/models/Category.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * Category
- */
-namespace SwaggerServer\lib\models;
-
-/*
- * Category
- */
-class Category {
-    /* @var int $id  */
-    private $id;
-    /* @var string $name  */
-    private $name;
-    
-}
diff --git a/samples/server/petstore/slim/SwaggerServer/lib/models/Order.php b/samples/server/petstore/slim/SwaggerServer/lib/models/Order.php
deleted file mode 100644
index 274aa80b7bf..00000000000
--- a/samples/server/petstore/slim/SwaggerServer/lib/models/Order.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * Order
- */
-namespace SwaggerServer\lib\models;
-
-/*
- * Order
- */
-class Order {
-    /* @var int $id  */
-    private $id;
-    /* @var int $pet_id  */
-    private $pet_id;
-    /* @var int $quantity  */
-    private $quantity;
-    /* @var DateTime $ship_date  */
-    private $ship_date;
-    /* @var string $status Order Status */
-    private $status;
-    /* @var boolean $complete  */
-    private $complete;
-    
-}
diff --git a/samples/server/petstore/slim/SwaggerServer/lib/models/Pet.php b/samples/server/petstore/slim/SwaggerServer/lib/models/Pet.php
deleted file mode 100644
index cfd4efe376f..00000000000
--- a/samples/server/petstore/slim/SwaggerServer/lib/models/Pet.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * Pet
- */
-namespace SwaggerServer\lib\models;
-
-/*
- * Pet
- */
-class Pet {
-    /* @var int $id  */
-    private $id;
-    /* @var Category $category  */
-    private $category;
-    /* @var string $name  */
-    private $name;
-    /* @var array[string] $photo_urls  */
-    private $photo_urls;
-    /* @var array[Tag] $tags  */
-    private $tags;
-    /* @var string $status pet status in the store */
-    private $status;
-    
-}
diff --git a/samples/server/petstore/slim/SwaggerServer/lib/models/Tag.php b/samples/server/petstore/slim/SwaggerServer/lib/models/Tag.php
deleted file mode 100644
index 8bbcb83f269..00000000000
--- a/samples/server/petstore/slim/SwaggerServer/lib/models/Tag.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * Tag
- */
-namespace SwaggerServer\lib\models;
-
-/*
- * Tag
- */
-class Tag {
-    /* @var int $id  */
-    private $id;
-    /* @var string $name  */
-    private $name;
-    
-}
diff --git a/samples/server/petstore/slim/SwaggerServer/lib/models/User.php b/samples/server/petstore/slim/SwaggerServer/lib/models/User.php
deleted file mode 100644
index 92ab9dfc054..00000000000
--- a/samples/server/petstore/slim/SwaggerServer/lib/models/User.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
- * User
- */
-namespace SwaggerServer\lib\models;
-
-/*
- * User
- */
-class User {
-    /* @var int $id  */
-    private $id;
-    /* @var string $username  */
-    private $username;
-    /* @var string $first_name  */
-    private $first_name;
-    /* @var string $last_name  */
-    private $last_name;
-    /* @var string $email  */
-    private $email;
-    /* @var string $password  */
-    private $password;
-    /* @var string $phone  */
-    private $phone;
-    /* @var int $user_status User Status */
-    private $user_status;
-    
-}