diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache
index d0b6c4cb269e..2644d7dd1aff 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache
@@ -1,14 +1,14 @@
-import {Map, Record, RecordOf} from 'immutable';
+import { Map, Record, RecordOf } from 'immutable';
 
-import {
 {{#models}}
 {{#model}}
 {{#isEntity}}
+import {
     {{classname}}RecordEntity,
+} from "./models/{{classname}}{{importFileExtension}}"
 {{/isEntity}}
 {{/model}}
 {{/models}}
-} from "./models/index{{importFileExtension}}"
 
 export const ApiEntitiesRecordProps = {
     recType: "ApiEntitiesRecord" as "ApiEntitiesRecord",
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache
index 781fc5129f05..50b76da708b7 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache
@@ -1,6 +1,6 @@
-import {ApiEntitiesRecord} from "./ApiEntitiesRecord{{importFileExtension}}";
-import {ReducerBuilder} from "redux-ts-simple";
-import {normalizedEntities} from "./runtimeSagasAndRecords{{importFileExtension}}";
+import { ApiEntitiesRecord } from "./ApiEntitiesRecord{{importFileExtension}}";
+import { ReducerBuilder } from "redux-ts-simple";
+import { normalizedEntities } from "./runtimeSagasAndRecords{{importFileExtension}}";
 
 export const ApiEntitiesReducer = new ReducerBuilder(ApiEntitiesRecord())
     .on(normalizedEntities, (state, action): ApiEntitiesRecord => {
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache
index b756ab47c2c7..911a8fe9ed37 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache
@@ -1,12 +1,12 @@
-import {all, fork} from "redux-saga/effects";
+import { all, fork } from "redux-saga/effects";
 
-import {
 {{#apiInfo}}
 {{#apis}}
+import {
     {{#lambda.camelcase}}{{classFilename}}{{/lambda.camelcase}}AllSagas,
+} from "./{{classFilename}}{{importFileExtension}}";
 {{/apis}}
 {{/apiInfo}}
-} from "./index{{importFileExtension}}";
 
 export function *allApiSagas() {
     yield all([
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
index 5c99230c73f0..4f1a4420e027 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
@@ -2,23 +2,16 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
-
 import * as runtime from '../runtime{{importFileExtension}}';
-{{#imports.0}}
-import type {
-  {{#imports}}
-  {{className}},
-  {{/imports}}
-} from '../models/index{{importFileExtension}}';
+{{#imports}}
 {{^withoutRuntimeChecks}}
 import {
-    {{#imports}}
+    type {{className}},
     {{className}}FromJSON,
     {{className}}ToJSON,
-    {{/imports}}
-} from '../models/index{{importFileExtension}}';
+} from '../models/{{className}}{{importFileExtension}}';
 {{/withoutRuntimeChecks}}
-{{/imports.0}}
+{{/imports}}
 
 {{#operations}}
 {{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache
index 819a29e44ee8..188b2addea88 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache
@@ -1,8 +1,8 @@
-import {ApiRecordUtils, knownRecordFactories{{#returnPassthrough}}, appFromJS, NormalizedRecordEntities{{/returnPassthrough}}} from "../runtimeSagasAndRecords{{importFileExtension}}";
-import {getApiEntitiesState} from "../ApiEntitiesSelectors{{importFileExtension}}"
-import {List, Record, RecordOf, Map} from 'immutable';
-import {Schema, schema, NormalizedSchema} from "normalizr";
-import {select, call} from "redux-saga/effects";
+import { ApiRecordUtils, knownRecordFactories{{#returnPassthrough}}, appFromJS, NormalizedRecordEntities{{/returnPassthrough}} } from "../runtimeSagasAndRecords{{importFileExtension}}";
+import { getApiEntitiesState } from "../ApiEntitiesSelectors{{importFileExtension}}"
+import { List, Record, RecordOf, Map } from 'immutable';
+import { Schema, schema, NormalizedSchema } from "normalizr";
+import { select, call } from "redux-saga/effects";
 
 import {
     {{classname}},
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
index 8cfe7948e922..d29baae425a7 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
@@ -2,7 +2,6 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
-
 export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, "");
 
 export interface ConfigurationParameters {
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache
index 5c6c927648f6..7e83c056b130 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache
@@ -1,9 +1,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import {fromJS as originalFromJS, isIndexed, List, Map as ImmMap, RecordOf} from 'immutable';
-import {normalize, NormalizedSchema, schema, Schema} from "normalizr";
-import {ActionDefinition, createAction} from "redux-ts-simple";
+import { fromJS as originalFromJS, isIndexed, List, Map as ImmMap, RecordOf } from 'immutable';
+import { normalize, NormalizedSchema, schema, Schema } from "normalizr";
+import { ActionDefinition, createAction } from "redux-ts-simple";
 
 export const knownRecordFactories = new Map<string, any>();
 export const knownIndexedSetByKey: (string | number)[] = [];
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache
index d8979fd9eda3..456f00512c0f 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache
@@ -1,15 +1,15 @@
 import {
     Configuration,
     ConfigurationParameters,
-} from "../index{{importFileExtension}}";
+} from "../runtime{{importFileExtension}}";
 
-import {
 {{#apiInfo}}
 {{#apis}}
+import {
     {{classFilename}},
+} from "./{{classFilename}}{{importFileExtension}}";
 {{/apis}}
 {{/apiInfo}}
-} from "./index{{importFileExtension}}";
 
 export class Api {
 {{#apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache
index 2ea9cf32d73a..99f754518ae4 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache
@@ -2,25 +2,28 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+import { Api } from './index{{importFileExtension}}';
+import { List } from 'immutable';
+import { all, fork, put, takeLatest } from "redux-saga/effects";
+import { apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities } from "../runtimeSagasAndRecords{{importFileExtension}}";
+import { Action } from "redux-ts-simple";
 
-import {Api} from './index{{importFileExtension}}';
-import {List} from 'immutable';
-import {all, fork, put, takeLatest} from "redux-saga/effects";
-import {apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities} from "../runtimeSagasAndRecords{{importFileExtension}}";
-import {Action} from "redux-ts-simple";
-
-{{#imports.0}}
+{{#imports}}
 import {
-    {{#imports}}
     {{className}},
+} from '../models/{{className}}{{importFileExtension}}';
+import {
     {{className}}Record,
     {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}RecordUtils,
-    {{/imports}}
-    {{#passthroughImports}}
+} from '../models/{{className}}Record{{importFileExtension}}';
+{{/imports}}
+
+{{#passthroughImports}}
+import {
     {{.}},
-    {{/passthroughImports}}
-} from '../models/index{{importFileExtension}}';
-{{/imports.0}}
+} from '../models/{{.}}{{importFileExtension}}';
+{{/passthroughImports}}
+
 {{#hasEnums}}
 {{#operations}}
 {{#operation}}