diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts
index cfab553c724..57c569031b4 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumArrays.ts
@@ -33,6 +33,22 @@ export interface EnumArrays {
     arrayEnum?: Array<EnumArraysArrayEnumEnum>;
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum EnumArraysJustSymbolEnum {
+    GreaterThanOrEqualTo = '>=',
+    Dollar = '$'
+}/**
+* @export
+* @enum {string}
+*/
+export enum EnumArraysArrayEnumEnum {
+    Fish = 'fish',
+    Crab = 'crab'
+}
+
 export function EnumArraysFromJSON(json: any): EnumArrays {
     return EnumArraysFromJSONTyped(json, false);
 }
@@ -62,21 +78,4 @@ export function EnumArraysToJSON(value?: EnumArrays | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum EnumArraysJustSymbolEnum {
-    GreaterThanOrEqualTo = '>=',
-    Dollar = '$'
-}
-/**
-* @export
-* @enum {string}
-*/
-export enum EnumArraysArrayEnumEnum {
-    Fish = 'fish',
-    Crab = 'crab'
-}
-
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts
index 3ba0162d6ab..fbd6a1cf2c8 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/EnumTest.ts
@@ -88,6 +88,38 @@ export interface EnumTest {
     outerEnumIntegerDefaultValue?: OuterEnumIntegerDefaultValue;
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum EnumTestEnumStringEnum {
+    Upper = 'UPPER',
+    Lower = 'lower',
+    Empty = ''
+}/**
+* @export
+* @enum {string}
+*/
+export enum EnumTestEnumStringRequiredEnum {
+    Upper = 'UPPER',
+    Lower = 'lower',
+    Empty = ''
+}/**
+* @export
+* @enum {string}
+*/
+export enum EnumTestEnumIntegerEnum {
+    NUMBER_1 = 1,
+    NUMBER_MINUS_1 = -1
+}/**
+* @export
+* @enum {string}
+*/
+export enum EnumTestEnumNumberEnum {
+    NUMBER_1_DOT_1 = 1.1,
+    NUMBER_MINUS_1_DOT_2 = -1.2
+}
+
 export function EnumTestFromJSON(json: any): EnumTest {
     return EnumTestFromJSONTyped(json, false);
 }
@@ -129,39 +161,4 @@ export function EnumTestToJSON(value?: EnumTest | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum EnumTestEnumStringEnum {
-    Upper = 'UPPER',
-    Lower = 'lower',
-    Empty = ''
-}
-/**
-* @export
-* @enum {string}
-*/
-export enum EnumTestEnumStringRequiredEnum {
-    Upper = 'UPPER',
-    Lower = 'lower',
-    Empty = ''
-}
-/**
-* @export
-* @enum {string}
-*/
-export enum EnumTestEnumIntegerEnum {
-    NUMBER_1 = 1,
-    NUMBER_MINUS_1 = -1
-}
-/**
-* @export
-* @enum {string}
-*/
-export enum EnumTestEnumNumberEnum {
-    NUMBER_1_DOT_1 = 1.1,
-    NUMBER_MINUS_1_DOT_2 = -1.2
-}
-
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/InlineObject2.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/InlineObject2.ts
index fbbb7001c5f..7c8694d56a4 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/InlineObject2.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/InlineObject2.ts
@@ -33,6 +33,23 @@ export interface InlineObject2 {
     enumFormString?: InlineObject2EnumFormStringEnum;
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum InlineObject2EnumFormStringArrayEnum {
+    GreaterThan = '>',
+    Dollar = '$'
+}/**
+* @export
+* @enum {string}
+*/
+export enum InlineObject2EnumFormStringEnum {
+    Abc = '_abc',
+    Efg = '-efg',
+    Xyz = '(xyz)'
+}
+
 export function InlineObject2FromJSON(json: any): InlineObject2 {
     return InlineObject2FromJSONTyped(json, false);
 }
@@ -62,22 +79,4 @@ export function InlineObject2ToJSON(value?: InlineObject2 | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum InlineObject2EnumFormStringArrayEnum {
-    GreaterThan = '>',
-    Dollar = '$'
-}
-/**
-* @export
-* @enum {string}
-*/
-export enum InlineObject2EnumFormStringEnum {
-    Abc = '_abc',
-    Efg = '-efg',
-    Xyz = '(xyz)'
-}
-
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts
index de13e08cb68..ca67d6cc33c 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/MapTest.ts
@@ -45,6 +45,15 @@ export interface MapTest {
     indirectMap?: { [key: string]: boolean; };
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum MapTestMapOfEnumStringEnum {
+    Upper = 'UPPER',
+    Lower = 'lower'
+}
+
 export function MapTestFromJSON(json: any): MapTest {
     return MapTestFromJSONTyped(json, false);
 }
@@ -78,13 +87,4 @@ export function MapTestToJSON(value?: MapTest | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum MapTestMapOfEnumStringEnum {
-    Upper = 'UPPER',
-    Lower = 'lower'
-}
-
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
index 23c8e752403..8ba94be0acd 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
@@ -57,6 +57,16 @@ export interface Order {
     complete?: boolean;
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum OrderStatusEnum {
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
+}
+
 export function OrderFromJSON(json: any): Order {
     return OrderFromJSONTyped(json, false);
 }
@@ -94,14 +104,4 @@ export function OrderToJSON(value?: Order | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum OrderStatusEnum {
-    Placed = 'placed',
-    Approved = 'approved',
-    Delivered = 'delivered'
-}
-
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts
index 24bb6915527..f188f88dcee 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts
@@ -68,6 +68,16 @@ export interface Pet {
     status?: PetStatusEnum;
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum PetStatusEnum {
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
+}
+
 export function PetFromJSON(json: any): Pet {
     return PetFromJSONTyped(json, false);
 }
@@ -105,14 +115,4 @@ export function PetToJSON(value?: Pet | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum PetStatusEnum {
-    Available = 'available',
-    Pending = 'pending',
-    Sold = 'sold'
-}
-
 
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/InlineObject.ts
index a3b90dd840a..e6592c5be29 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/models/InlineObject.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/models/InlineObject.ts
@@ -45,6 +45,24 @@ export interface InlineObject {
     nullableNumberEnum?: number | null;
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum InlineObjectStringEnumEnum {
+    One = 'one',
+    Two = 'two',
+    Three = 'three'
+}/**
+* @export
+* @enum {string}
+*/
+export enum InlineObjectNumberEnumEnum {
+    NUMBER_1 = 1,
+    NUMBER_2 = 2,
+    NUMBER_3 = 3
+}
+
 export function InlineObjectFromJSON(json: any): InlineObject {
     return InlineObjectFromJSONTyped(json, false);
 }
@@ -78,23 +96,4 @@ export function InlineObjectToJSON(value?: InlineObject | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum InlineObjectStringEnumEnum {
-    One = 'one',
-    Two = 'two',
-    Three = 'three'
-}
-/**
-* @export
-* @enum {string}
-*/
-export enum InlineObjectNumberEnumEnum {
-    NUMBER_1 = 1,
-    NUMBER_2 = 2,
-    NUMBER_3 = 3
-}
-
 
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/InlineResponse200.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/InlineResponse200.ts
index 41aad0beccb..5b410f1ca99 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/models/InlineResponse200.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/models/InlineResponse200.ts
@@ -45,6 +45,24 @@ export interface InlineResponse200 {
     nullableNumberEnum?: number | null;
 }
 
+/**
+* @export
+* @enum {string}
+*/
+export enum InlineResponse200StringEnumEnum {
+    One = 'one',
+    Two = 'two',
+    Three = 'three'
+}/**
+* @export
+* @enum {string}
+*/
+export enum InlineResponse200NumberEnumEnum {
+    NUMBER_1 = 1,
+    NUMBER_2 = 2,
+    NUMBER_3 = 3
+}
+
 export function InlineResponse200FromJSON(json: any): InlineResponse200 {
     return InlineResponse200FromJSONTyped(json, false);
 }
@@ -78,23 +96,4 @@ export function InlineResponse200ToJSON(value?: InlineResponse200 | null): any {
     };
 }
 
-/**
-* @export
-* @enum {string}
-*/
-export enum InlineResponse200StringEnumEnum {
-    One = 'one',
-    Two = 'two',
-    Three = 'three'
-}
-/**
-* @export
-* @enum {string}
-*/
-export enum InlineResponse200NumberEnumEnum {
-    NUMBER_1 = 1,
-    NUMBER_2 = 2,
-    NUMBER_3 = 3
-}
-