diff --git a/langs/ts/ts.go b/langs/ts/ts.go
index c29ee96..ecc1ee9 100644
--- a/langs/ts/ts.go
+++ b/langs/ts/ts.go
@@ -134,11 +134,58 @@ func getModelOption(namespace string, key string, required bool, options firemod
 
 const (
 	file = `// DO NOT EDIT - Code generated by firemodel {{firemodelVersion}}.
-
 import { firestore } from 'firebase';
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
+export interface Query<DataType = firestore.DocumentData>
+  extends firestore.Query {
+  where(
+    fieldPath: string | firestore.FieldPath,
+    opStr: firestore.WhereFilterOp,
+    value: any,
+  ): Query<DataType>;
+  orderBy(
+    fieldPath: string | firestore.FieldPath,
+    directionStr?: firestore.OrderByDirection,
+  ): Query<DataType>;
+  limit(limit: number): Query<DataType>;
+  startAt(snapshot: DocumentSnapshot): Query<DataType>;
+  startAt(...fieldValues: any[]): Query<DataType>;
+  startAfter(snapshot: DocumentSnapshot): Query<DataType>;
+  startAfter(...fieldValues: any[]): Query<DataType>;
+  endBefore(snapshot: DocumentSnapshot): Query<DataType>;
+  endBefore(...fieldValues: any[]): Query<DataType>;
+  endAt(snapshot: DocumentSnapshot): Query<DataType>;
+  endAt(...fieldValues: any[]): Query<DataType>;
+  get(options?: firestore.GetOptions): Promise<QuerySnapshot<DataType>>;
+  onSnapshot(observer: {
+    next?: (snapshot: QuerySnapshot<DataType>) => void;
+    error?: (error: Error) => void;
+    complete?: () => void;
+  }): () => void;
+  onSnapshot(
+    options: firestore.SnapshotListenOptions,
+    observer: {
+      next?: (snapshot: QuerySnapshot<DataType>) => void;
+      error?: (error: Error) => void;
+      complete?: () => void;
+    },
+  ): () => void;
+  onSnapshot(
+    onNext: (snapshot: QuerySnapshot<DataType>) => void,
+    onError?: (error: Error) => void,
+    onCompletion?: () => void,
+  ): () => void;
+  onSnapshot(
+    options: firestore.SnapshotListenOptions,
+    onNext: (snapshot: QuerySnapshot<DataType>) => void,
+    onError?: (error: Error) => void,
+    onCompletion?: () => void,
+  ): () => void;
+}
+
+
 export interface DocumentSnapshot<DataType = firestore.DocumentData>
   extends firestore.DocumentSnapshot {
   data(options?: firestore.SnapshotOptions): DataType | undefined;
@@ -198,6 +245,9 @@ export interface DocumentReference<DataType = firestore.DocumentData>
     onCompletion?: () => void,
   ): () => void;
 }
+
+
+
 export interface CollectionReference<DataType = firestore.DocumentData>
   extends Query<DataType>,
     Omit<firestore.CollectionReference, keyof Query> {
@@ -207,52 +257,6 @@ export interface Collection<DataType = firestore.DocumentData> {
   [id: string]: DocumentSnapshotExpanded<DataType>;
 }
 
-export interface Query<DataType = firestore.DocumentData>
-  extends firestore.Query {
-  where(
-    fieldPath: string | firestore.FieldPath,
-    opStr: firestore.WhereFilterOp,
-    value: any,
-  ): Query<DataType>;
-  orderBy(
-    fieldPath: string | firestore.FieldPath,
-    directionStr?: firestore.OrderByDirection,
-  ): Query<DataType>;
-  limit(limit: number): Query<DataType>;
-  startAt(snapshot: DocumentSnapshot): Query<DataType>;
-  startAt(...fieldValues: any[]): Query<DataType>;
-  startAfter(snapshot: DocumentSnapshot): Query<DataType>;
-  startAfter(...fieldValues: any[]): Query<DataType>;
-  endBefore(snapshot: DocumentSnapshot): Query<DataType>;
-  endBefore(...fieldValues: any[]): Query<DataType>;
-  endAt(snapshot: DocumentSnapshot): Query<DataType>;
-  endAt(...fieldValues: any[]): Query<DataType>;
-  get(options?: firestore.GetOptions): Promise<QuerySnapshot<DataType>>;
-  onSnapshot(observer: {
-    next?: (snapshot: QuerySnapshot<DataType>) => void;
-    error?: (error: Error) => void;
-    complete?: () => void;
-  }): () => void;
-  onSnapshot(
-    options: firestore.SnapshotListenOptions,
-    observer: {
-      next?: (snapshot: QuerySnapshot<DataType>) => void;
-      error?: (error: Error) => void;
-      complete?: () => void;
-    },
-  ): () => void;
-  onSnapshot(
-    onNext: (snapshot: QuerySnapshot<DataType>) => void,
-    onError?: (error: Error) => void,
-    onCompletion?: () => void,
-  ): () => void;
-  onSnapshot(
-    options: firestore.SnapshotListenOptions,
-    onNext: (snapshot: QuerySnapshot<DataType>) => void,
-    onError?: (error: Error) => void,
-    onCompletion?: () => void,
-  ): () => void;
-}
 
 // tslint:disable-next-line:no-namespace
 export namespace {{.Options | getSchemaOption "ts" "namespace" "firemodel"}} {
diff --git a/testfixtures/firemodel/TestFiremodelFromSchema/ts/firemodel.d.ts b/testfixtures/firemodel/TestFiremodelFromSchema/ts/firemodel.d.ts
index ac9f0b7..bef7c0f 100644
--- a/testfixtures/firemodel/TestFiremodelFromSchema/ts/firemodel.d.ts
+++ b/testfixtures/firemodel/TestFiremodelFromSchema/ts/firemodel.d.ts
@@ -1,9 +1,56 @@
 // DO NOT EDIT - Code generated by firemodel (dev).
-
 import { firestore } from 'firebase';
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
+export interface Query<DataType = firestore.DocumentData>
+  extends firestore.Query {
+  where(
+    fieldPath: string | firestore.FieldPath,
+    opStr: firestore.WhereFilterOp,
+    value: any,
+  ): Query<DataType>;
+  orderBy(
+    fieldPath: string | firestore.FieldPath,
+    directionStr?: firestore.OrderByDirection,
+  ): Query<DataType>;
+  limit(limit: number): Query<DataType>;
+  startAt(snapshot: DocumentSnapshot): Query<DataType>;
+  startAt(...fieldValues: any[]): Query<DataType>;
+  startAfter(snapshot: DocumentSnapshot): Query<DataType>;
+  startAfter(...fieldValues: any[]): Query<DataType>;
+  endBefore(snapshot: DocumentSnapshot): Query<DataType>;
+  endBefore(...fieldValues: any[]): Query<DataType>;
+  endAt(snapshot: DocumentSnapshot): Query<DataType>;
+  endAt(...fieldValues: any[]): Query<DataType>;
+  get(options?: firestore.GetOptions): Promise<QuerySnapshot<DataType>>;
+  onSnapshot(observer: {
+    next?: (snapshot: QuerySnapshot<DataType>) => void;
+    error?: (error: Error) => void;
+    complete?: () => void;
+  }): () => void;
+  onSnapshot(
+    options: firestore.SnapshotListenOptions,
+    observer: {
+      next?: (snapshot: QuerySnapshot<DataType>) => void;
+      error?: (error: Error) => void;
+      complete?: () => void;
+    },
+  ): () => void;
+  onSnapshot(
+    onNext: (snapshot: QuerySnapshot<DataType>) => void,
+    onError?: (error: Error) => void,
+    onCompletion?: () => void,
+  ): () => void;
+  onSnapshot(
+    options: firestore.SnapshotListenOptions,
+    onNext: (snapshot: QuerySnapshot<DataType>) => void,
+    onError?: (error: Error) => void,
+    onCompletion?: () => void,
+  ): () => void;
+}
+
+
 export interface DocumentSnapshot<DataType = firestore.DocumentData>
   extends firestore.DocumentSnapshot {
   data(options?: firestore.SnapshotOptions): DataType | undefined;
@@ -63,6 +110,9 @@ export interface DocumentReference<DataType = firestore.DocumentData>
     onCompletion?: () => void,
   ): () => void;
 }
+
+
+
 export interface CollectionReference<DataType = firestore.DocumentData>
   extends Query<DataType>,
     Omit<firestore.CollectionReference, keyof Query> {
@@ -72,52 +122,6 @@ export interface Collection<DataType = firestore.DocumentData> {
   [id: string]: DocumentSnapshotExpanded<DataType>;
 }
 
-export interface Query<DataType = firestore.DocumentData>
-  extends firestore.Query {
-  where(
-    fieldPath: string | firestore.FieldPath,
-    opStr: firestore.WhereFilterOp,
-    value: any,
-  ): Query<DataType>;
-  orderBy(
-    fieldPath: string | firestore.FieldPath,
-    directionStr?: firestore.OrderByDirection,
-  ): Query<DataType>;
-  limit(limit: number): Query<DataType>;
-  startAt(snapshot: DocumentSnapshot): Query<DataType>;
-  startAt(...fieldValues: any[]): Query<DataType>;
-  startAfter(snapshot: DocumentSnapshot): Query<DataType>;
-  startAfter(...fieldValues: any[]): Query<DataType>;
-  endBefore(snapshot: DocumentSnapshot): Query<DataType>;
-  endBefore(...fieldValues: any[]): Query<DataType>;
-  endAt(snapshot: DocumentSnapshot): Query<DataType>;
-  endAt(...fieldValues: any[]): Query<DataType>;
-  get(options?: firestore.GetOptions): Promise<QuerySnapshot<DataType>>;
-  onSnapshot(observer: {
-    next?: (snapshot: QuerySnapshot<DataType>) => void;
-    error?: (error: Error) => void;
-    complete?: () => void;
-  }): () => void;
-  onSnapshot(
-    options: firestore.SnapshotListenOptions,
-    observer: {
-      next?: (snapshot: QuerySnapshot<DataType>) => void;
-      error?: (error: Error) => void;
-      complete?: () => void;
-    },
-  ): () => void;
-  onSnapshot(
-    onNext: (snapshot: QuerySnapshot<DataType>) => void,
-    onError?: (error: Error) => void,
-    onCompletion?: () => void,
-  ): () => void;
-  onSnapshot(
-    options: firestore.SnapshotListenOptions,
-    onNext: (snapshot: QuerySnapshot<DataType>) => void,
-    onError?: (error: Error) => void,
-    onCompletion?: () => void,
-  ): () => void;
-}
 
 // tslint:disable-next-line:no-namespace
 export namespace example {