diff --git a/lib/codegen/c/curl.dart b/lib/codegen/c/curl.dart
index 3b363e3b..fae29ec9 100644
--- a/lib/codegen/c/curl.dart
+++ b/lib/codegen/c/curl.dart
@@ -1,8 +1,7 @@
 import 'package:apidash/consts.dart';
 import 'package:jinja/jinja.dart' as jj;
-import 'package:apidash/utils/utils.dart'
-    show getValidRequestUri, requestModelToHARJsonRequest;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/utils/utils.dart' show getValidRequestUri;
+import 'package:apidash/models/models.dart';
 
 class CCurlCodeGen {
   final String kTemplateStart = """#include <stdio.h>
@@ -93,14 +92,22 @@ int main() {
 }""";
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = "";
       var hasBody = false;
-      var requestBody = requestModel.requestBody;
 
-      String url = requestModel.url;
+      var rec = getValidRequestUri(
+        requestModel.url,
+        requestModel.enabledParams,
+      );
+
+      Uri? uri = rec.$1;
+
+      if (uri == null) {
+        return result;
+      }
 
       var templateStart = jj.Template(kTemplateStart);
       result += templateStart.render({
@@ -115,18 +122,10 @@ int main() {
         "hasBody": hasBody,
       });
 
-      var harJson =
-          requestModelToHARJsonRequest(requestModel, useEnabled: true);
       var templateUrl = jj.Template(kTemplateUrl);
-      String correctUrl = harJson["url"];
-      result += templateUrl.render({"url": correctUrl});
+      result += templateUrl.render({"url": uri});
 
-      var rec = getValidRequestUri(
-        url,
-        requestModel.enabledRequestParams,
-      );
-
-      var headersList = requestModel.enabledRequestHeaders;
+      var headersList = requestModel.enabledHeaders;
       if (headersList != null ||
           requestModel.hasBody ||
           requestModel.hasTextData ||
@@ -136,8 +135,8 @@ int main() {
         //   headers.putIfAbsent("Content-Type", () => "multipart/form-data");
         // }
         if (requestModel.hasTextData || requestModel.hasJsonData) {
-          headers.putIfAbsent(kHeaderContentType,
-              () => requestModel.requestBodyContentType.header);
+          headers.putIfAbsent(
+              kHeaderContentType, () => requestModel.bodyContentType.header);
         }
         if (headers.isNotEmpty) {
           var templateHeader = jj.Template(kTemplateHeader);
@@ -147,43 +146,40 @@ int main() {
         }
       }
 
-      Uri? uri = rec.$1;
-
-      if (uri != null) {
-        if (requestModel.hasTextData || requestModel.hasJsonData) {
-          hasBody = true;
-          var templateRawBody = jj.Template(kTemplateBody);
-          String body = "";
-          if (requestBody != null) {
-            body = requestBody.replaceAll('"', '\\"').replaceAll('\n', '\\n');
-          }
-          result += templateRawBody.render({"body": body});
-        } else if (requestModel.hasFormData) {
-          hasBody = true;
-          var templateFormData = jj.Template(kTemplateFormData);
-          result += templateFormData.render({
-            "hasFileInFormData": requestModel.hasFileInFormData,
-            "fields": requestModel.formDataMapList,
-          });
+      if (requestModel.hasTextData || requestModel.hasJsonData) {
+        hasBody = true;
+        var templateRawBody = jj.Template(kTemplateBody);
+        String body = "";
+        if (requestModel.body != null) {
+          body =
+              requestModel.body!.replaceAll('"', '\\"').replaceAll('\n', '\\n');
         }
-        if (requestModel.hasTextData) {}
-        if (uri.hasQuery) {
-          var params = uri.queryParameters;
-          if (params.isNotEmpty) {
-            var templateQueryParam = jj.Template(kTemplateQueryParam);
-            result += templateQueryParam.render({"params": params});
-          }
-        }
-        var headers = requestModel.enabledHeadersMap;
-        bool allow = headers.isNotEmpty ||
-            requestModel.hasTextData ||
-            requestModel.hasJsonData;
-        var templateEnd = jj.Template(kTemplateEnd);
-        result += templateEnd.render({
-          "formdata": requestModel.hasFormData,
-          "headers": allow,
+        result += templateRawBody.render({"body": body});
+      } else if (requestModel.hasFormData) {
+        hasBody = true;
+        var templateFormData = jj.Template(kTemplateFormData);
+        result += templateFormData.render({
+          "hasFileInFormData": requestModel.hasFileInFormData,
+          "fields": requestModel.formDataMapList,
         });
       }
+      if (requestModel.hasTextData) {}
+      if (uri.hasQuery) {
+        var params = uri.queryParameters;
+        if (params.isNotEmpty) {
+          var templateQueryParam = jj.Template(kTemplateQueryParam);
+          result += templateQueryParam.render({"params": params});
+        }
+      }
+      var headers = requestModel.enabledHeadersMap;
+      bool allow = headers.isNotEmpty ||
+          requestModel.hasTextData ||
+          requestModel.hasJsonData;
+      var templateEnd = jj.Template(kTemplateEnd);
+      result += templateEnd.render({
+        "formdata": requestModel.hasFormData,
+        "headers": allow,
+      });
 
       return result;
     } catch (e) {
diff --git a/lib/codegen/codegen.dart b/lib/codegen/codegen.dart
index 888044b8..514d0af5 100644
--- a/lib/codegen/codegen.dart
+++ b/lib/codegen/codegen.dart
@@ -1,4 +1,4 @@
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart' show getNewUuid;
 import 'c/curl.dart';
@@ -36,7 +36,11 @@ class Codegen {
     String defaultUriScheme, {
     String? boundary,
   }) {
-    String url = requestModel.url;
+    var httpRequestModel = requestModel.httpRequestModel;
+    if (httpRequestModel == null) {
+      return "";
+    }
+    String url = httpRequestModel.url;
 
     if (url.isEmpty) {
       url = kDefaultUri;
@@ -44,7 +48,7 @@ class Codegen {
     if (!url.contains("://") && url.isNotEmpty) {
       url = "$defaultUriScheme://$url";
     }
-    var rM = requestModel.copyWith(url: url);
+    var rM = httpRequestModel.copyWith(url: url);
 
     switch (codegenLanguage) {
       case CodegenLanguage.curl:
diff --git a/lib/codegen/csharp/http_client.dart b/lib/codegen/csharp/http_client.dart
index bb377623..390966d9 100644
--- a/lib/codegen/csharp/http_client.dart
+++ b/lib/codegen/csharp/http_client.dart
@@ -1,6 +1,6 @@
 import 'package:apidash/consts.dart';
 import 'package:jinja/jinja.dart' as jj;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/utils/http_utils.dart';
 
 class CSharpHttpClientCodeGen {
@@ -78,7 +78,7 @@ using (var request = new HttpRequestMessage(HttpMethod.{{ method | capitalize }}
 }
 ''';
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       StringBuffer result = StringBuffer();
 
@@ -86,10 +86,12 @@ using (var request = new HttpRequestMessage(HttpMethod.{{ method | capitalize }}
       String formdataImport = requestModel.hasFormData
           ? "multipart" //(requestModel.hasFileInFormData ? "multipart" : "urlencoded")
           : "nodata";
-      result.writeln(jj.Template(kTemplateNamespaces).render({"formdata": formdataImport}));
+      result.writeln(jj.Template(kTemplateNamespaces)
+          .render({"formdata": formdataImport}));
 
       // Set request URL
-      var (uri, _) = getValidRequestUri(requestModel.url, requestModel.enabledRequestParams);
+      var (uri, _) =
+          getValidRequestUri(requestModel.url, requestModel.enabledParams);
       if (uri != null) {
         result.writeln(jj.Template(kTemplateUri).render({"uri": uri}));
       }
@@ -102,22 +104,26 @@ using (var request = new HttpRequestMessage(HttpMethod.{{ method | capitalize }}
       // Set request headers
       var headers = requestModel.enabledHeadersMap;
       if (headers.isNotEmpty) {
-        result.writeln(jj.Template(kTemplateHeaders).render({"headers": headers}));
+        result.writeln(
+            jj.Template(kTemplateHeaders).render({"headers": headers}));
       }
 
       // Set request body if exists
-      if (kMethodsWithBody.contains(requestModel.method) && requestModel.hasBody) {
-        var requestBody = requestModel.requestBody;
+      if (kMethodsWithBody.contains(requestModel.method) &&
+          requestModel.hasBody) {
+        var requestBody = requestModel.body;
 
-        if (!requestModel.hasFormData && requestBody != null && requestBody.isNotEmpty) {
+        if (!requestModel.hasFormData &&
+            requestBody != null &&
+            requestBody.isNotEmpty) {
           // if the request body is not formdata then render raw text body
           result.writeln(jj.Template(kTemplateRawBody).render({
             "body": requestBody,
-            "mediaType": requestModel.requestBodyContentType.header,
+            "mediaType": requestModel.bodyContentType.header,
           }));
         } else if (requestModel.hasFormData) {
           // final String renderingTemplate = requestModel.hasFileInFormData
-          //     ? kTemplateMultipartFormDataContent 
+          //     ? kTemplateMultipartFormDataContent
           //     : kTemplateFormUrlEncodedContent;
 
           final String renderingTemplate = kTemplateMultipartFormDataContent;
diff --git a/lib/codegen/csharp/rest_sharp.dart b/lib/codegen/csharp/rest_sharp.dart
index d3c69193..47f3379b 100644
--- a/lib/codegen/csharp/rest_sharp.dart
+++ b/lib/codegen/csharp/rest_sharp.dart
@@ -1,10 +1,9 @@
 import 'dart:convert';
-
-import 'package:apidash/consts.dart';
 import 'package:jinja/jinja.dart' as jj;
-import '../../models/request_model.dart';
-import '../../extensions/extensions.dart';
-import '../../utils/http_utils.dart';
+import 'package:apidash/consts.dart';
+import 'package:apidash/models/models.dart';
+import 'package:apidash/extensions/extensions.dart';
+import 'package:apidash/utils/http_utils.dart';
 
 class CSharpRestSharp {
   String kStringImports = """
@@ -90,12 +89,12 @@ class Program
 }
 """;
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       String result = "";
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
       if (uri != null) {
@@ -130,14 +129,13 @@ class Program
           }
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null ||
             requestModel.hasJsonData ||
             requestModel.hasTextData) {
           var headers = requestModel.enabledHeadersMap;
           if (requestModel.hasJsonData || requestModel.hasTextData) {
-            headers[kHeaderContentType] =
-                requestModel.requestBodyContentType.header;
+            headers[kHeaderContentType] = requestModel.bodyContentType.header;
           }
           if (headers.isNotEmpty) {
             jj.Template templateHeaders = jj.Template(kTemplateHeaders);
@@ -169,8 +167,7 @@ class Program
 
         if (requestModel.hasJsonData) {
           var templateJsonData = jj.Template(kTemplateJsonData);
-          Map<String, dynamic> bodyData =
-              json.decode(requestModel.requestBody!);
+          Map<String, dynamic> bodyData = json.decode(requestModel.body!);
           List<String> jsonArr = [];
 
           bodyData.forEach((key, value) {
@@ -184,7 +181,7 @@ class Program
         if (requestModel.hasTextData) {
           jj.Template templateTextData = jj.Template(kTemplateTextData);
           result += templateTextData
-              .render({"textData": jsonEncode(requestModel.requestBody)});
+              .render({"textData": jsonEncode(requestModel.body)});
         }
 
         result += kStringEnd;
diff --git a/lib/codegen/dart/dio.dart b/lib/codegen/dart/dio.dart
index e9590f79..63a1d532 100644
--- a/lib/codegen/dart/dio.dart
+++ b/lib/codegen/dart/dio.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'package:code_builder/code_builder.dart';
 import 'package:dart_style/dart_style.dart';
-import 'package:apidash/models/request_model.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 import 'shared.dart';
 
 class DartDioCodeGen {
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       final next = generatedDartCode(
@@ -15,8 +15,8 @@ class DartDioCodeGen {
         method: requestModel.method,
         queryParams: requestModel.enabledParamsMap,
         headers: requestModel.enabledHeadersMap,
-        body: requestModel.requestBody,
-        contentType: requestModel.requestBodyContentType,
+        body: requestModel.body,
+        contentType: requestModel.bodyContentType,
         formData: requestModel.formDataMapList,
       );
       return next;
diff --git a/lib/codegen/dart/http.dart b/lib/codegen/dart/http.dart
index 8419757c..5a341606 100644
--- a/lib/codegen/dart/http.dart
+++ b/lib/codegen/dart/http.dart
@@ -2,13 +2,13 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:code_builder/code_builder.dart';
 import 'package:dart_style/dart_style.dart';
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 import 'shared.dart';
 
 class DartHttpCodeGen {
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       final next = generatedDartCode(
@@ -16,9 +16,9 @@ class DartHttpCodeGen {
         method: requestModel.method,
         queryParams: requestModel.enabledParamsMap,
         headers: {...requestModel.enabledHeadersMap},
-        contentType: requestModel.requestBodyContentType,
+        contentType: requestModel.bodyContentType,
         hasContentTypeHeader: requestModel.hasContentTypeHeader,
-        body: requestModel.requestBody,
+        body: requestModel.body,
         formData: requestModel.formDataMapList,
       );
       return next;
diff --git a/lib/codegen/go/http.dart b/lib/codegen/go/http.dart
index a93d47e0..bc7dfa08 100644
--- a/lib/codegen/go/http.dart
+++ b/lib/codegen/go/http.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/consts.dart';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart' show getValidRequestUri;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 
 class GoHttpCodeGen {
   final String kTemplateStart = """package main
@@ -88,12 +88,11 @@ func main() {
 }""";
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = "";
       var hasBody = false;
-      var requestBody = requestModel.requestBody;
 
       String url = requestModel.url;
 
@@ -109,7 +108,7 @@ func main() {
 
       var rec = getValidRequestUri(
         url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       Uri? uri = rec.$1;
@@ -118,7 +117,7 @@ func main() {
         if (requestModel.hasTextData || requestModel.hasJsonData) {
           hasBody = true;
           var templateRawBody = jj.Template(kTemplateBody);
-          result += templateRawBody.render({"body": requestBody});
+          result += templateRawBody.render({"body": requestModel.body});
         } else if (requestModel.hasFormData) {
           hasBody = true;
           var templateFormData = jj.Template(kTemplateFormData);
@@ -143,12 +142,12 @@ func main() {
           "hasBody": hasBody,
         });
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || requestModel.hasBody) {
           var headers = requestModel.enabledHeadersMap;
           if (requestModel.hasJsonData || requestModel.hasTextData) {
-            headers.putIfAbsent(kHeaderContentType,
-                () => requestModel.requestBodyContentType.header);
+            headers.putIfAbsent(
+                kHeaderContentType, () => requestModel.bodyContentType.header);
           }
           if (headers.isNotEmpty) {
             var templateHeader = jj.Template(kTemplateHeader);
diff --git a/lib/codegen/java/async_http_client.dart b/lib/codegen/java/async_http_client.dart
index 0651f737..d163a578 100644
--- a/lib/codegen/java/async_http_client.dart
+++ b/lib/codegen/java/async_http_client.dart
@@ -1,7 +1,7 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class JavaAsyncHttpClientGen {
@@ -114,7 +114,7 @@ public class Main {
 ''';
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = '';
@@ -122,7 +122,7 @@ public class Main {
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
 
@@ -153,8 +153,7 @@ public class Main {
       // we need to parse the body as it is, and write it to the body
       if (requestModel.hasTextData || requestModel.hasJsonData) {
         var templateBodyContent = jj.Template(kTemplateRequestBodyContent);
-        result +=
-            templateBodyContent.render({"body": requestModel.requestBody});
+        result += templateBodyContent.render({"body": requestModel.body});
         hasBody = true;
       }
 
@@ -170,8 +169,7 @@ public class Main {
 
       var headers = requestModel.enabledHeadersMap;
       if (hasBody && !requestModel.hasContentTypeHeader) {
-        headers[kHeaderContentType] =
-            requestModel.requestBodyContentType.header;
+        headers[kHeaderContentType] = requestModel.bodyContentType.header;
       }
 
       // setting up rest of the request headers
diff --git a/lib/codegen/java/httpclient.dart b/lib/codegen/java/httpclient.dart
index 01d45b05..5dbe27f9 100644
--- a/lib/codegen/java/httpclient.dart
+++ b/lib/codegen/java/httpclient.dart
@@ -1,7 +1,7 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, requestModelToHARJsonRequest;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class JavaHttpClientCodeGen {
@@ -110,12 +110,12 @@ multipart/form-data; boundary={{boundary}}''';
 """;
 
   String? getCode(
-    RequestModel requestModel, {
+    HttpRequestModel requestModel, {
     String? boundary,
   }) {
     try {
       String result = "";
-      var requestBody = requestModel.requestBody;
+      var requestBody = requestModel.body;
       String url = requestModel.url;
 
       result += jj.Template(kTemplateStart).render({
@@ -124,7 +124,7 @@ multipart/form-data; boundary={{boundary}}''';
 
       var rec = getValidRequestUri(
         url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       Uri? uri = rec.$1;
@@ -159,12 +159,12 @@ multipart/form-data; boundary={{boundary}}''';
           "hasBody": requestModel.hasBody,
         });
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || requestModel.hasBody) {
           var headers = requestModel.enabledHeadersMap;
           if (requestModel.hasJsonData || requestModel.hasTextData) {
-            headers.putIfAbsent(kHeaderContentType,
-                () => requestModel.requestBodyContentType.header);
+            headers.putIfAbsent(
+                kHeaderContentType, () => requestModel.bodyContentType.header);
           }
           if (requestModel.hasFormData) {
             var formDataHeader = jj.Template(kTemplateFormHeaderContentType);
diff --git a/lib/codegen/java/okhttp.dart b/lib/codegen/java/okhttp.dart
index ac7a6b09..12b2f90f 100644
--- a/lib/codegen/java/okhttp.dart
+++ b/lib/codegen/java/okhttp.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import '../../models/request_model.dart';
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class JavaOkHttpCodeGen {
@@ -92,7 +92,7 @@ import okhttp3.MultipartBody;""";
 ''';
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = "";
@@ -102,7 +102,7 @@ import okhttp3.MultipartBody;""";
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
 
@@ -124,7 +124,7 @@ import okhttp3.MultipartBody;""";
         }
 
         var method = requestModel.method;
-        var requestBody = requestModel.requestBody;
+        var requestBody = requestModel.body;
         if (requestModel.hasFormData) {
           hasFormData = true;
           var formDataTemplate = jj.Template(kFormDataBody);
@@ -136,7 +136,7 @@ import okhttp3.MultipartBody;""";
           var contentLength = utf8.encode(requestBody).length;
           if (contentLength > 0) {
             hasBody = true;
-            String contentType = requestModel.requestBodyContentType.header;
+            String contentType = requestModel.bodyContentType.header;
             var templateBody = jj.Template(kTemplateRequestBody);
             result += templateBody.render({
               "contentType": contentType,
@@ -155,7 +155,7 @@ import okhttp3.MultipartBody;""";
         result = stringStart + result;
         result += kStringRequestStart;
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null) {
           var headers = requestModel.enabledHeadersMap;
           if (headers.isNotEmpty) {
@@ -176,7 +176,9 @@ import okhttp3.MultipartBody;""";
   }
 
   String getQueryParams(Map<String, String> params) {
-    final paramStrings = params.entries.map((entry) => '.addQueryParameter("${entry.key}", "${entry.value}")').toList();
+    final paramStrings = params.entries
+        .map((entry) => '.addQueryParameter("${entry.key}", "${entry.value}")')
+        .toList();
     return paramStrings.join('\n            ');
   }
 
@@ -187,4 +189,4 @@ import okhttp3.MultipartBody;""";
     }
     return result;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart
index 6b7e7b1d..c8bccbf1 100644
--- a/lib/codegen/java/unirest.dart
+++ b/lib/codegen/java/unirest.dart
@@ -1,5 +1,5 @@
 import 'package:jinja/jinja.dart' as jj;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/utils/http_utils.dart';
 import 'package:apidash/consts.dart';
 
@@ -61,14 +61,14 @@ public class Main {
 }
 """;
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       String result = '';
       bool hasBody = false;
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       // uri is already generated based on url and enabled request params
@@ -101,7 +101,7 @@ public class Main {
       if (requestModel.hasTextData || requestModel.hasJsonData) {
         var templateBodyContent = jj.Template(kTemplateRequestBodyContent);
         result += templateBodyContent.render({
-          "body": requestModel.requestBody,
+          "body": requestModel.body,
         });
         hasBody = true;
       }
@@ -114,8 +114,7 @@ public class Main {
 
       var headers = requestModel.enabledHeadersMap;
       if (hasBody && !requestModel.hasContentTypeHeader) {
-        headers[kHeaderContentType] =
-            requestModel.requestBodyContentType.header;
+        headers[kHeaderContentType] = requestModel.bodyContentType.header;
       }
 
       var templateRequestHeader = jj.Template(kTemplateRequestHeader);
diff --git a/lib/codegen/js/axios.dart b/lib/codegen/js/axios.dart
index 00d4d1a9..faf97304 100644
--- a/lib/codegen/js/axios.dart
+++ b/lib/codegen/js/axios.dart
@@ -1,7 +1,7 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show padMultilineString, requestModelToHARJsonRequest, stripUrlParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class AxiosCodeGen {
@@ -47,7 +47,7 @@ axios(config)
   });
 """;
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
diff --git a/lib/codegen/js/fetch.dart b/lib/codegen/js/fetch.dart
index cd6732a6..21c4f238 100644
--- a/lib/codegen/js/fetch.dart
+++ b/lib/codegen/js/fetch.dart
@@ -1,7 +1,7 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show padMultilineString, requestModelToHARJsonRequest;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class FetchCodeGen {
@@ -52,7 +52,7 @@ fetch(url, options)
   });
 """;
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
       String importsData = kNodejsImportTemplate.render({
diff --git a/lib/codegen/julia/http.dart b/lib/codegen/julia/http.dart
index 56ab744e..f5d55e1a 100644
--- a/lib/codegen/julia/http.dart
+++ b/lib/codegen/julia/http.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 
 class JuliaHttpClientCodeGen {
   final String kTemplateStart = """
@@ -70,7 +70,7 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response.
 println("Response Body: \n$(String(response.body))")
 """;
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       String result = "";
       bool hasQuery = false;
@@ -79,7 +79,7 @@ println("Response Body: \n$(String(response.body))")
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
       if (uri != null) {
@@ -105,7 +105,7 @@ println("Response Body: \n$(String(response.body))")
         if (requestModel.hasJsonData || requestModel.hasTextData) {
           addHeaderForBody = true;
           final templateBody = jj.Template(kTemplateBody);
-          var bodyStr = requestModel.requestBody;
+          var bodyStr = requestModel.body;
           result += templateBody.render({"body": bodyStr});
         }
 
@@ -119,14 +119,14 @@ println("Response Body: \n$(String(response.body))")
           );
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || addHeaderForBody) {
           var headers = requestModel.enabledHeadersMap;
 
           if (!requestModel.hasContentTypeHeader) {
             if (addHeaderForBody) {
               headers[HttpHeaders.contentTypeHeader] =
-                  requestModel.requestBodyContentType.header;
+                  requestModel.bodyContentType.header;
             }
           }
 
diff --git a/lib/codegen/kotlin/okhttp.dart b/lib/codegen/kotlin/okhttp.dart
index a3a2fb89..8f4605b4 100644
--- a/lib/codegen/kotlin/okhttp.dart
+++ b/lib/codegen/kotlin/okhttp.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import '../../models/request_model.dart';
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class KotlinOkHttpCodeGen {
@@ -80,7 +80,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
 ''';
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = "";
@@ -91,7 +91,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
 
@@ -113,34 +113,28 @@ import okhttp3.MediaType.Companion.toMediaType""";
         }
 
         var method = requestModel.method;
-        var requestBody = requestModel.requestBody;
+        var requestBody = requestModel.body;
         if (requestModel.hasFormData) {
           hasFormData = true;
           var formDataTemplate = jj.Template(kFormDataBody);
 
-          List<Map<String,String>> modifiedFormDataList = [];
+          List<Map<String, String>> modifiedFormDataList = [];
           for (var item in requestModel.formDataList) {
-            if (item.type == FormDataType.file ) {
+            if (item.type == FormDataType.file) {
               if (item.value[0] == "/") {
-              modifiedFormDataList.add({
-                "name": item.name,
-                "value": item.value.substring(1),
-                "type": "file"
-              });
-              }else{
                 modifiedFormDataList.add({
-                "name": item.name,
-                "value": item.value,
-                "type": "file"
-              });
+                  "name": item.name,
+                  "value": item.value.substring(1),
+                  "type": "file"
+                });
+              } else {
+                modifiedFormDataList.add(
+                    {"name": item.name, "value": item.value, "type": "file"});
               }
               hasFile = true;
-            }else{
-              modifiedFormDataList.add({
-                "name": item.name,
-                "value": item.value,
-                "type": "text"
-              });
+            } else {
+              modifiedFormDataList.add(
+                  {"name": item.name, "value": item.value, "type": "text"});
             }
           }
 
@@ -151,7 +145,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
           var contentLength = utf8.encode(requestBody).length;
           if (contentLength > 0) {
             hasBody = true;
-            String contentType = requestModel.requestBodyContentType.header;
+            String contentType = requestModel.bodyContentType.header;
             var templateBody = jj.Template(kTemplateRequestBody);
             result += templateBody
                 .render({"contentType": contentType, "body": requestBody});
@@ -169,7 +163,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
         result = stringStart + result;
         result += kStringRequestStart;
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null) {
           var headers = requestModel.enabledHeadersMap;
           if (headers.isNotEmpty) {
diff --git a/lib/codegen/others/curl.dart b/lib/codegen/others/curl.dart
index 2f177609..1fb6bfd8 100644
--- a/lib/codegen/others/curl.dart
+++ b/lib/codegen/others/curl.dart
@@ -1,6 +1,6 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 // ignore: camel_case_types
@@ -20,7 +20,7 @@ class cURLCodeGen {
 """;
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = "";
@@ -54,7 +54,7 @@ class cURLCodeGen {
 
       if (requestModel.hasJsonData || requestModel.hasTextData) {
         var templateBody = jj.Template(kTemplateBody);
-        result += templateBody.render({"body": requestModel.requestBody});
+        result += templateBody.render({"body": requestModel.body});
       } else if (requestModel.hasFormData) {
         for (var formData in requestModel.formDataList) {
           var templateFormData = jj.Template(kTemplateFormData);
diff --git a/lib/codegen/others/har.dart b/lib/codegen/others/har.dart
index 72ab8731..32a35abe 100644
--- a/lib/codegen/others/har.dart
+++ b/lib/codegen/others/har.dart
@@ -1,10 +1,10 @@
 import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 
 class HARCodeGen {
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
     String defaultUriScheme, {
     String? boundary,
   }) {
diff --git a/lib/codegen/php/curl.dart b/lib/codegen/php/curl.dart
index 974159ee..a9ff8b91 100644
--- a/lib/codegen/php/curl.dart
+++ b/lib/codegen/php/curl.dart
@@ -1,7 +1,7 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class PHPcURLCodeGen {
@@ -92,14 +92,14 @@ echo "Status Code: " . $httpCode . "\n";
 echo $response . "\n";
 ''';
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       String result = "";
       bool hasBody = false;
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       Uri? uri = rec.$1;
@@ -120,7 +120,7 @@ echo $response . "\n";
           result += templateBody.render({
             'body': requestModel.hasFormData
                 ? requestModel.formDataMapList
-                : requestModel.requestBody,
+                : requestModel.body,
           });
         }
 
@@ -136,8 +136,7 @@ echo $response . "\n";
         var headers = requestModel.enabledHeadersMap;
         if (requestModel.hasBody && !requestModel.hasContentTypeHeader) {
           if (requestModel.hasJsonData || requestModel.hasTextData) {
-            headers[kHeaderContentType] =
-                requestModel.requestBodyContentType.header;
+            headers[kHeaderContentType] = requestModel.bodyContentType.header;
           }
         }
 
diff --git a/lib/codegen/php/guzzle.dart b/lib/codegen/php/guzzle.dart
index ce0ebef6..d60c43fb 100644
--- a/lib/codegen/php/guzzle.dart
+++ b/lib/codegen/php/guzzle.dart
@@ -1,7 +1,6 @@
 import 'package:jinja/jinja.dart' as jj;
-import 'package:apidash/utils/utils.dart'
-    show stripUrlParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/utils/utils.dart' show stripUrlParams;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class PhpGuzzleCodeGen {
@@ -59,7 +58,7 @@ echo $res->getBody();
 
 """;
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       var templateImport = jj.Template(kTemplateImport);
       String importsData = templateImport.render({
@@ -75,7 +74,7 @@ echo $res->getBody();
             var row = '''
     [
         'name'     => '${field.name}',
-        'contents' => ${field.type == FormDataType.file? "fopen('${field.value}', 'r')":"'${field.value}'"}
+        'contents' => ${field.type == FormDataType.file ? "fopen('${field.value}', 'r')" : "'${field.value}'"}
     ]''';
             return row;
           }).join(",\n"),
@@ -103,12 +102,14 @@ echo $res->getBody();
           headerList.add("'$key' => '$value'");
         });
 
-        if(!requestModel.hasContentTypeHeader && requestModel.hasBody){
-          if(requestModel.hasJsonData || requestModel.hasTextData){
-            headerList.add("'$kHeaderContentType' => '${requestModel.requestBodyContentType.header}'");
+        if (!requestModel.hasContentTypeHeader && requestModel.hasBody) {
+          if (requestModel.hasJsonData || requestModel.hasTextData) {
+            headerList.add(
+                "'$kHeaderContentType' => '${requestModel.bodyContentType.header}'");
           }
-          if(requestModel.hasFormData){
-            headerList.add("'$kHeaderContentType' => '${requestModel.requestBodyContentType.header}; boundary=' . \$body->getBoundary()");
+          if (requestModel.hasFormData) {
+            headerList.add(
+                "'$kHeaderContentType' => '${requestModel.bodyContentType.header}; boundary=' . \$body->getBoundary()");
           }
         }
         result += templateHeader.render({
@@ -119,18 +120,16 @@ echo $res->getBody();
       var templateBody = jj.Template(kTemplateBody);
 
       if (requestModel.hasJsonData || requestModel.hasTextData) {
-        result += templateBody
-            .render({"body": requestModel.requestBody});
+        result += templateBody.render({"body": requestModel.body});
       }
 
       var templateRequest = jj.Template(kTemplateRequest);
       result += templateRequest.render({
         "url": stripUrlParams(requestModel.url),
         "method": requestModel.method.name.toLowerCase(),
-        "queryParams":
-            params.isNotEmpty ? ". \$queryParamsStr" : "",
+        "queryParams": params.isNotEmpty ? ". \$queryParamsStr" : "",
         "headers": headerList.isNotEmpty ? ", \$headers" : "",
-        "body": requestModel.hasBody? ", \$body" : "",
+        "body": requestModel.hasBody ? ", \$body" : "",
       });
 
       return result;
diff --git a/lib/codegen/php/http_plug.dart b/lib/codegen/php/http_plug.dart
index 8202cfc1..3f8bc17d 100644
--- a/lib/codegen/php/http_plug.dart
+++ b/lib/codegen/php/http_plug.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class PhpHttpPlugCodeGen {
@@ -73,13 +73,13 @@ echo \$response->getBody();
 
 """;
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       String result = "";
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
 
@@ -110,7 +110,7 @@ echo \$response->getBody();
         result += templateRequestInit
             .render({"method": requestModel.method.name.toUpperCase()});
 
-        var requestBody = requestModel.requestBody;
+        var requestBody = requestModel.body;
 
         if ((requestModel.hasTextData || requestModel.hasJsonData) &&
             requestBody != null) {
@@ -153,7 +153,7 @@ echo \$response->getBody();
         if (requestModel.hasBody && !requestModel.hasContentTypeHeader) {
           if (requestModel.hasJsonData || requestModel.hasTextData) {
             headers[kHeaderContentType] =
-                "'${requestModel.requestBodyContentType.header}'";
+                "'${requestModel.bodyContentType.header}'";
           }
           if (requestModel.hasFormData) {
             headers[kHeaderContentType] =
diff --git a/lib/codegen/python/http_client.dart b/lib/codegen/python/http_client.dart
index 2df5132c..ea783ebe 100644
--- a/lib/codegen/python/http_client.dart
+++ b/lib/codegen/python/http_client.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 import 'dart:convert';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart' show getValidRequestUri;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class PythonHttpClientCodeGen {
@@ -83,7 +83,7 @@ dataList = build_data_list({{fields_list}})
 body = b'\r\n'.join(dataList)
 ''';
   String? getCode(
-    RequestModel requestModel, {
+    HttpRequestModel requestModel, {
     String? boundary,
   }) {
     try {
@@ -100,7 +100,7 @@ body = b'\r\n'.join(dataList)
       );
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       Uri? uri = rec.$1;
@@ -120,11 +120,11 @@ body = b'\r\n'.join(dataList)
           hasBody = true;
           if (requestModel.hasJsonData || requestModel.hasTextData) {
             var templateBody = jj.Template(kTemplateBody);
-            result += templateBody.render({"body": requestModel.requestBody});
+            result += templateBody.render({"body": requestModel.body});
           }
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || hasBody) {
           var headers = requestModel.enabledHeadersMap;
 
@@ -133,7 +133,7 @@ body = b'\r\n'.join(dataList)
             if (hasBody && !requestModel.hasContentTypeHeader) {
               if (requestModel.hasJsonData || requestModel.hasTextData) {
                 headers[HttpHeaders.contentTypeHeader] =
-                    requestModel.requestBodyContentType.header;
+                    requestModel.bodyContentType.header;
               } else if (requestModel.hasFormData) {
                 var formHeaderTemplate =
                     jj.Template(kTemplateFormHeaderContentType);
diff --git a/lib/codegen/python/requests.dart b/lib/codegen/python/requests.dart
index 6fb07908..bb41ad9d 100644
--- a/lib/codegen/python/requests.dart
+++ b/lib/codegen/python/requests.dart
@@ -3,7 +3,7 @@ import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams, getFilenameFromPath;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import '../codegen_utils.dart';
 
 class PythonRequestsCodeGen {
@@ -80,7 +80,7 @@ print('Response Body:', response.text)
   }
 
   String? getCode(
-    RequestModel requestModel, {
+    HttpRequestModel requestModel, {
     String? boundary,
   }) {
     try {
@@ -92,7 +92,7 @@ print('Response Body:', response.text)
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
       if (uri != null) {
@@ -140,15 +140,15 @@ print('Response Body:', response.text)
         } else if (requestModel.hasJsonData) {
           hasJsonBody = true;
           var templateBody = jj.Template(kTemplateJson);
-          var pyDict = jsonToPyDict(requestModel.requestBody ?? "");
+          var pyDict = jsonToPyDict(requestModel.body ?? "");
           result += templateBody.render({"body": pyDict});
         } else if (requestModel.hasTextData) {
           hasBody = true;
           var templateBody = jj.Template(kTemplateBody);
-          result += templateBody.render({"body": requestModel.requestBody});
+          result += templateBody.render({"body": requestModel.body});
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || hasBody) {
           var headers = requestModel.enabledHeadersMap;
           if (hasBody) {
@@ -157,7 +157,7 @@ print('Response Body:', response.text)
                   kStringFormDataContentType;
             } else {
               headers[HttpHeaders.contentTypeHeader] =
-                  requestModel.requestBodyContentType.header;
+                  requestModel.bodyContentType.header;
             }
           }
           if (headers.isNotEmpty) {
diff --git a/lib/codegen/ruby/faraday.dart b/lib/codegen/ruby/faraday.dart
index da552479..f34e8340 100644
--- a/lib/codegen/ruby/faraday.dart
+++ b/lib/codegen/ruby/faraday.dart
@@ -2,8 +2,7 @@ import 'package:apidash/consts.dart';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart' show getValidRequestUri;
 import 'package:apidash/utils/http_utils.dart' show stripUriParams;
-
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 
 // Note that delete is a special case in Faraday as API Dash supports request
 // body inside delete reqest, but Faraday does not. Hence we need to manually
@@ -88,14 +87,14 @@ puts "Response Body: #{response.body}"
 """;
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = "";
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       Uri? uri = rec.$1;
@@ -126,7 +125,7 @@ puts "Response Body: #{response.body}"
       } else if (requestModel.hasJsonData || requestModel.hasTextData) {
         var templateBody = jj.Template(kTemplateBody);
         result += templateBody.render({
-          "body": requestModel.requestBody,
+          "body": requestModel.body,
         });
       }
 
@@ -150,8 +149,7 @@ puts "Response Body: #{response.body}"
       var headers = requestModel.enabledHeadersMap;
       if (requestModel.hasBody && !requestModel.hasContentTypeHeader) {
         if (requestModel.hasJsonData || requestModel.hasTextData) {
-          headers[kHeaderContentType] =
-              requestModel.requestBodyContentType.header;
+          headers[kHeaderContentType] = requestModel.bodyContentType.header;
         }
       }
 
diff --git a/lib/codegen/ruby/net_http.dart b/lib/codegen/ruby/net_http.dart
index b64e5196..f198c7a9 100644
--- a/lib/codegen/ruby/net_http.dart
+++ b/lib/codegen/ruby/net_http.dart
@@ -1,8 +1,8 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
-import '../../extensions/extensions.dart';
+import 'package:apidash/models/models.dart';
+import 'package:apidash/extensions/extensions.dart';
 import 'package:apidash/consts.dart';
 
 class RubyNetHttpCodeGen {
@@ -39,13 +39,13 @@ puts "Response Code: #{response.code}"
 
 """;
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       String result = "";
 
       var rec = getValidRequestUri(
         requestModel.url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       Uri? uri = rec.$1;
@@ -64,8 +64,7 @@ puts "Response Code: #{response.code}"
       var headers = requestModel.enabledHeadersMap;
       if (!requestModel.hasContentTypeHeader &&
           (requestModel.hasJsonData || requestModel.hasTextData)) {
-        headers[kHeaderContentType] =
-            requestModel.requestBodyContentType.header;
+        headers[kHeaderContentType] = requestModel.bodyContentType.header;
       }
 
       if (headers.isNotEmpty) {
@@ -78,7 +77,7 @@ puts "Response Code: #{response.code}"
       if (requestModel.hasTextData || requestModel.hasJsonData) {
         var templateBody = jj.Template(kTemplateBody);
         result += templateBody.render({
-          "body": requestModel.requestBody,
+          "body": requestModel.body,
         });
       }
 
diff --git a/lib/codegen/rust/actix.dart b/lib/codegen/rust/actix.dart
index 4e13b0f1..12f8c6bf 100644
--- a/lib/codegen/rust/actix.dart
+++ b/lib/codegen/rust/actix.dart
@@ -4,7 +4,7 @@ import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart'
     show getNewUuid, getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 
 class RustActixCodeGen {
   final String kTemplateStart = """
@@ -112,7 +112,7 @@ multipart/form-data; boundary={{boundary}}''';
 """;
 
   String? getCode(
-    RequestModel requestModel, {
+    HttpRequestModel requestModel, {
     String? boundary,
   }) {
     try {
@@ -125,7 +125,7 @@ multipart/form-data; boundary={{boundary}}''';
 
       var rec = getValidRequestUri(
         url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
       if (uri != null) {
@@ -137,11 +137,11 @@ multipart/form-data; boundary={{boundary}}''';
         });
 
         var method = requestModel.method;
-        var requestBody = requestModel.requestBody;
+        var requestBody = requestModel.body;
         if (kMethodsWithBody.contains(method) && requestBody != null) {
           var contentLength = utf8.encode(requestBody).length;
           if (contentLength > 0) {
-            if (requestModel.requestBodyContentType == ContentType.json) {
+            if (requestModel.bodyContentType == ContentType.json) {
               hasJsonBody = true;
               var templateBody = jj.Template(kTemplateJson);
               result += templateBody.render({"body": requestBody});
@@ -179,7 +179,7 @@ multipart/form-data; boundary={{boundary}}''';
           }
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || hasBody || requestModel.hasFormData) {
           var headers = requestModel.enabledHeadersMap;
           if (requestModel.hasFormData) {
@@ -190,7 +190,7 @@ multipart/form-data; boundary={{boundary}}''';
             });
           } else if (hasBody) {
             headers[HttpHeaders.contentTypeHeader] =
-                requestModel.requestBodyContentType.header;
+                requestModel.bodyContentType.header;
           }
 
           if (headers.isNotEmpty) {
diff --git a/lib/codegen/rust/curl_rust.dart b/lib/codegen/rust/curl_rust.dart
index 9299554f..f80e459b 100644
--- a/lib/codegen/rust/curl_rust.dart
+++ b/lib/codegen/rust/curl_rust.dart
@@ -1,7 +1,7 @@
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, requestModelToHARJsonRequest;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
 
 class RustCurlCodeGen {
@@ -78,23 +78,22 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
 
-  String? getCode(RequestModel requestModel) {
+  String? getCode(HttpRequestModel requestModel) {
     try {
       String result = "";
-      var requestBody = requestModel.requestBody;
 
       String url = requestModel.url;
 
       result += jj.Template(kTemplateStart).render({
         "hasJsonBody": requestModel.hasJsonData,
-        "hasHeaders": (requestModel.enabledRequestHeaders != null &&
-                requestModel.enabledRequestHeaders!.isNotEmpty) ||
+        "hasHeaders": (requestModel.enabledHeaders != null &&
+                requestModel.enabledHeaders!.isNotEmpty) ||
             (requestModel.hasJsonData || requestModel.hasTextData)
       });
 
       var rec = getValidRequestUri(
         url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
 
       Uri? uri = rec.$1;
@@ -110,10 +109,10 @@ fn main() {
       if (uri != null) {
         if (requestModel.hasTextData) {
           var templateBody = jj.Template(kTemplateRawBody);
-          result += templateBody.render({"body": requestBody});
+          result += templateBody.render({"body": requestModel.body});
         } else if (requestModel.hasJsonData) {
           var templateBody = jj.Template(kTemplateJsonBody);
-          result += templateBody.render({"body": requestBody});
+          result += templateBody.render({"body": requestModel.body});
         } else if (requestModel.hasFormData) {
           var templateFormData = jj.Template(kTemplateFormData);
           result += templateFormData.render({
@@ -121,12 +120,12 @@ fn main() {
           });
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || requestModel.hasBody) {
           var headers = requestModel.enabledHeadersMap;
           if (requestModel.hasJsonData || requestModel.hasTextData) {
-            headers.putIfAbsent(kHeaderContentType,
-                () => requestModel.requestBodyContentType.header);
+            headers.putIfAbsent(
+                kHeaderContentType, () => requestModel.bodyContentType.header);
           }
           if (headers.isNotEmpty) {
             var templateHeader = jj.Template(kTemplateHeader);
diff --git a/lib/codegen/rust/reqwest.dart b/lib/codegen/rust/reqwest.dart
index 4eb0accd..0e678575 100644
--- a/lib/codegen/rust/reqwest.dart
+++ b/lib/codegen/rust/reqwest.dart
@@ -4,7 +4,7 @@ import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 
 class RustReqwestCodeGen {
   final String kTemplateStart =
@@ -81,7 +81,7 @@ class RustReqwestCodeGen {
 """;
 
   String? getCode(
-    RequestModel requestModel,
+    HttpRequestModel requestModel,
   ) {
     try {
       String result = "";
@@ -92,7 +92,7 @@ class RustReqwestCodeGen {
 
       var rec = getValidRequestUri(
         url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
       if (uri != null) {
@@ -100,15 +100,15 @@ class RustReqwestCodeGen {
         result += templateStartUrl.render({
           "url": stripUriParams(uri),
           'isFormDataRequest': requestModel.hasFormData,
-          'isJson': requestModel.requestBodyContentType == ContentType.json
+          'isJson': requestModel.bodyContentType == ContentType.json
         });
 
         var method = requestModel.method;
-        var requestBody = requestModel.requestBody;
+        var requestBody = requestModel.body;
         if (kMethodsWithBody.contains(method) && requestBody != null) {
           var contentLength = utf8.encode(requestBody).length;
           if (contentLength > 0) {
-            if (requestModel.requestBodyContentType == ContentType.json) {
+            if (requestModel.bodyContentType == ContentType.json) {
               hasJsonBody = true;
               var templateBody = jj.Template(kTemplateJson);
               result += templateBody.render({"body": requestBody});
@@ -145,12 +145,12 @@ class RustReqwestCodeGen {
           }
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || hasBody) {
           var headers = requestModel.enabledHeadersMap;
           if (hasBody) {
             headers[HttpHeaders.contentTypeHeader] =
-                requestModel.requestBodyContentType.header;
+                requestModel.bodyContentType.header;
           }
           if (headers.isNotEmpty) {
             var templateHeaders = jj.Template(kTemplateHeaders);
diff --git a/lib/codegen/rust/ureq.dart b/lib/codegen/rust/ureq.dart
index c1c170d2..f91e56a0 100644
--- a/lib/codegen/rust/ureq.dart
+++ b/lib/codegen/rust/ureq.dart
@@ -4,7 +4,7 @@ import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart'
     show getNewUuid, getValidRequestUri, stripUriParams;
-import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/models/models.dart';
 
 class RustUreqCodeGen {
   final String kTemplateStart = """
@@ -109,7 +109,7 @@ multipart/form-data; boundary={{boundary}}''';
 """;
 
   String? getCode(
-    RequestModel requestModel, {
+    HttpRequestModel requestModel, {
     String? boundary,
   }) {
     try {
@@ -122,7 +122,7 @@ multipart/form-data; boundary={{boundary}}''';
 
       var rec = getValidRequestUri(
         url,
-        requestModel.enabledRequestParams,
+        requestModel.enabledParams,
       );
       Uri? uri = rec.$1;
       if (uri != null) {
@@ -134,11 +134,11 @@ multipart/form-data; boundary={{boundary}}''';
         });
 
         var method = requestModel.method;
-        var requestBody = requestModel.requestBody;
+        var requestBody = requestModel.body;
         if (kMethodsWithBody.contains(method) && requestBody != null) {
           var contentLength = utf8.encode(requestBody).length;
           if (contentLength > 0) {
-            if (requestModel.requestBodyContentType == ContentType.json) {
+            if (requestModel.bodyContentType == ContentType.json) {
               hasJsonBody = true;
               var templateBody = jj.Template(kTemplateJson);
               result += templateBody.render({"body": requestBody});
@@ -172,7 +172,7 @@ multipart/form-data; boundary={{boundary}}''';
           }
         }
 
-        var headersList = requestModel.enabledRequestHeaders;
+        var headersList = requestModel.enabledHeaders;
         if (headersList != null || hasBody || requestModel.hasFormData) {
           var headers = requestModel.enabledHeadersMap;
           if (requestModel.hasFormData) {
@@ -183,7 +183,7 @@ multipart/form-data; boundary={{boundary}}''';
             });
           } else if (hasBody) {
             headers[HttpHeaders.contentTypeHeader] =
-                requestModel.requestBodyContentType.header;
+                requestModel.bodyContentType.header;
           }
 
           if (headers.isNotEmpty) {
diff --git a/test/codegen/c_curl_codegen_test.dart b/test/codegen/c_curl_codegen_test.dart
index 20023220..c8e7e607 100644
--- a/test/codegen/c_curl_codegen_test.dart
+++ b/test/codegen/c_curl_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/csharp_http_client_codegen_test.dart b/test/codegen/csharp_http_client_codegen_test.dart
index 4b920432..39f3d4f9 100644
--- a/test/codegen/csharp_http_client_codegen_test.dart
+++ b/test/codegen/csharp_http_client_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
@@ -22,7 +22,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet1, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet1, "https"),
+          expectedCode);
     });
 
     test('GET 2', () {
@@ -40,7 +43,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet2, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet2, "https"),
+          expectedCode);
     });
 
     test('GET 3', () {
@@ -58,7 +64,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet3, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet3, "https"),
+          expectedCode);
     });
 
     test('GET 4', () {
@@ -76,7 +85,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet4, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet4, "https"),
+          expectedCode);
     });
 
     test('GET 5', () {
@@ -96,7 +108,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet5, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet5, "https"),
+          expectedCode);
     });
 
     test('GET 6', () {
@@ -116,7 +131,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet6, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet6, "https"),
+          expectedCode);
     });
 
     test('GET 7', () {
@@ -134,7 +152,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet7, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet7, "https"),
+          expectedCode);
     });
 
     test('GET 8', () {
@@ -154,7 +175,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet8, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet8, "https"),
+          expectedCode);
     });
 
     test('GET 9', () {
@@ -172,7 +196,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet9, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet9, "https"),
+          expectedCode);
     });
 
     test('GET 10', () {
@@ -192,7 +219,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet10, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet10, "https"),
+          expectedCode);
     });
 
     test('GET 11', () {
@@ -212,7 +242,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet11, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet11, "https"),
+          expectedCode);
     });
 
     test('GET 12', () {
@@ -230,7 +263,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet12, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelGet12, "https"),
+          expectedCode);
     });
   });
 
@@ -250,7 +286,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Head, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelHead1, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelHead1, "https"),
+          expectedCode);
     });
 
     test('HEAD 2', () {
@@ -268,7 +307,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Head, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelHead2, "http"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelHead2, "http"),
+          expectedCode);
     });
   });
 
@@ -296,7 +338,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost1, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost1, "https"),
+          expectedCode);
     });
 
     test('POST 2', () {
@@ -327,7 +372,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost2, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost2, "https"),
+          expectedCode);
     });
 
     test('POST 3', () {
@@ -355,7 +403,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost3, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost3, "https"),
+          expectedCode);
     });
 
     test('POST 4', () {
@@ -382,7 +433,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost4, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost4, "https"),
+          expectedCode);
     });
 
     test('POST 5', () {
@@ -411,7 +465,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost5, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost5, "https"),
+          expectedCode);
     });
 
     test('POST 6', () {
@@ -441,7 +498,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost6, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost6, "https"),
+          expectedCode);
     });
 
     test('POST 7', () {
@@ -471,7 +531,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost7, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost7, "https"),
+          expectedCode);
     });
 
     test('POST 8', () {
@@ -498,7 +561,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost8, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost8, "https"),
+          expectedCode);
     });
 
     test('POST 9', () {
@@ -531,7 +597,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost9, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPost9, "https"),
+          expectedCode);
     });
   });
 
@@ -560,7 +629,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Put, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPut1, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPut1, "https"),
+          expectedCode);
     });
   });
 
@@ -589,7 +661,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Patch, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPatch1, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelPatch1, "https"),
+          expectedCode);
     });
   });
 
@@ -609,7 +684,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Delete, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelDelete1, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelDelete1, "https"),
+          expectedCode);
     });
 
     test('DELETE 2', () {
@@ -636,7 +714,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Delete, uri))
     Console.WriteLine(await response.Content.ReadAsStringAsync());
 }
 ''';
-      expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelDelete2, "https"), expectedCode);
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.cSharpHttpClient, requestModelDelete2, "https"),
+          expectedCode);
     });
   });
 }
diff --git a/test/codegen/csharp_rest_sharp_codgen_test.dart b/test/codegen/csharp_rest_sharp_codgen_test.dart
index 7f35beeb..6522cbee 100644
--- a/test/codegen/csharp_rest_sharp_codgen_test.dart
+++ b/test/codegen/csharp_rest_sharp_codgen_test.dart
@@ -1,8 +1,7 @@
 import 'package:apidash/consts.dart';
 import 'package:apidash/screens/home_page/editor_pane/details_card/code_pane.dart';
 import 'package:flutter_test/flutter_test.dart';
-
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   group("Get Request Test", () {
diff --git a/test/codegen/curl_codegen_test.dart b/test/codegen/curl_codegen_test.dart
index ec0df5db..faa6ac78 100644
--- a/test/codegen/curl_codegen_test.dart
+++ b/test/codegen/curl_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/dart_dio_codegen_test.dart b/test/codegen/dart_dio_codegen_test.dart
index 8f111d41..f57a7470 100644
--- a/test/codegen/dart_dio_codegen_test.dart
+++ b/test/codegen/dart_dio_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/dart_http_codegen_test.dart b/test/codegen/dart_http_codegen_test.dart
index 6bf16114..0a631746 100644
--- a/test/codegen/dart_http_codegen_test.dart
+++ b/test/codegen/dart_http_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
@@ -558,8 +558,7 @@ void main() async {
 }
 """;
       expect(
-          codeGen.getCode(
-              CodegenLanguage.dartHttp, requestModelPost4, "https"),
+          codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost4, "https"),
           expectedCode);
     });
     test('POST 5', () {
@@ -619,8 +618,7 @@ void main() async {
 }
 """;
       expect(
-          codeGen.getCode(
-              CodegenLanguage.dartHttp, requestModelPost5, "https"),
+          codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost5, "https"),
           expectedCode);
     });
     test('POST 6', () {
@@ -676,8 +674,7 @@ void main() async {
 }
 """;
       expect(
-          codeGen.getCode(
-              CodegenLanguage.dartHttp, requestModelPost6, "https"),
+          codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost6, "https"),
           expectedCode);
     });
     test('POST 7', () {
@@ -733,8 +730,7 @@ void main() async {
 }
 """;
       expect(
-          codeGen.getCode(
-              CodegenLanguage.dartHttp, requestModelPost7, "https"),
+          codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost7, "https"),
           expectedCode);
     });
     test('POST 8', () {
@@ -797,8 +793,7 @@ void main() async {
 }
 """;
       expect(
-          codeGen.getCode(
-              CodegenLanguage.dartHttp, requestModelPost8, "https"),
+          codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost8, "https"),
           expectedCode);
     });
     test('POST 9', () {
@@ -866,11 +861,9 @@ void main() async {
 }
 """;
       expect(
-          codeGen.getCode(
-              CodegenLanguage.dartHttp, requestModelPost9, "https"),
+          codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost9, "https"),
           expectedCode);
     });
-
   });
 
   group('PUT Request', () {
diff --git a/test/codegen/go_http_codegen_test.dart b/test/codegen/go_http_codegen_test.dart
index 421f8018..08492cf1 100644
--- a/test/codegen/go_http_codegen_test.dart
+++ b/test/codegen/go_http_codegen_test.dart
@@ -2,7 +2,7 @@ import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:apidash/screens/home_page/editor_pane/details_card/code_pane.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/har_codegen_test.dart b/test/codegen/har_codegen_test.dart
index 767afc98..ac9c246d 100644
--- a/test/codegen/har_codegen_test.dart
+++ b/test/codegen/har_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/java_async_http_client_codegen.dart b/test/codegen/java_async_http_client_codegen.dart
index 857ec4cf..5adf8f69 100644
--- a/test/codegen/java_async_http_client_codegen.dart
+++ b/test/codegen/java_async_http_client_codegen.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/java_httpclient_codegen_test.dart b/test/codegen/java_httpclient_codegen_test.dart
index d279f5ab..d23fb48c 100644
--- a/test/codegen/java_httpclient_codegen_test.dart
+++ b/test/codegen/java_httpclient_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/java_okhttp_codegen_test.dart b/test/codegen/java_okhttp_codegen_test.dart
index 20a8a17a..de159c29 100644
--- a/test/codegen/java_okhttp_codegen_test.dart
+++ b/test/codegen/java_okhttp_codegen_test.dart
@@ -1,9 +1,10 @@
-import 'package:apidash/codegen/java/okhttp.dart';
+import 'package:apidash/codegen/codegen.dart';
+import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
-  final javaOkHttpCodeGen = JavaOkHttpCodeGen();
+  final codeGen = Codegen();
 
   group('GET Request', () {
     test('GET 1', () {
@@ -36,7 +37,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet1), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet1, "https"),
+          expectedCode);
     });
 
     test('GET 2', () {
@@ -72,7 +75,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet2), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet2, "https"),
+          expectedCode);
     });
 
     test('GET 3', () {
@@ -108,7 +113,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet3), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet3, "https"),
+          expectedCode);
     });
 
     test('GET 4', () {
@@ -148,7 +155,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet4), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet4, "https"),
+          expectedCode);
     });
 
     test('GET 5', () {
@@ -182,7 +191,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet5), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet5, "https"),
+          expectedCode);
     });
 
     test('GET 6', () {
@@ -219,7 +230,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet6), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet6, "https"),
+          expectedCode);
     });
 
     test('GET 7', () {
@@ -252,7 +265,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet7), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet7, "https"),
+          expectedCode);
     });
 
     test('GET 8', () {
@@ -289,7 +304,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet8), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet8, "https"),
+          expectedCode);
     });
 
     test('GET 9', () {
@@ -326,7 +343,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet9), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet9, "https"),
+          expectedCode);
     });
 
     test('GET 10', () {
@@ -360,9 +379,8 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(
-            requestModelGet10,
-          ),
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet10, "https"),
           expectedCode);
     });
 
@@ -401,7 +419,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet11), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet11, "https"),
+          expectedCode);
     });
 
     test('GET 12', () {
@@ -434,7 +454,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelGet12), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelGet12, "https"),
+          expectedCode);
     });
   });
 
@@ -469,7 +491,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelHead1), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelHead1, "https"),
+          expectedCode);
     });
 
     test('HEAD 2', () {
@@ -483,7 +507,7 @@ public class Main {
     public static void main(String[] args) {
         OkHttpClient client = new OkHttpClient().newBuilder().build();
 
-        String url = "https://api.apidash.dev";
+        String url = "http://api.apidash.dev";
 
         Request request = new Request.Builder()
             .url(url)
@@ -502,7 +526,9 @@ public class Main {
 }
 """;
       expect(
-          javaOkHttpCodeGen.getCode(requestModelHead2), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelHead2, "http"),
+          expectedCode);
     });
   });
 
@@ -543,7 +569,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost1), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost1, "https"),
+          expectedCode);
     });
 
     test('POST 2', () {
@@ -582,7 +610,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost2), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost2, "https"),
+          expectedCode);
     });
 
     test('POST 3', () {
@@ -622,7 +652,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost3), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost3, "https"),
+          expectedCode);
     });
 
     test('POST 4', () {
@@ -662,7 +694,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost4), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost4, "https"),
+          expectedCode);
     });
 
     test('POST 5', () {
@@ -703,7 +737,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost5), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost5, "https"),
+          expectedCode);
     });
 
     test('POST 6', () {
@@ -742,7 +778,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost6), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost6, "https"),
+          expectedCode);
     });
 
     test('POST 7', () {
@@ -781,7 +819,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost7), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost7, "https"),
+          expectedCode);
     });
 
     test('POST 8', () {
@@ -825,7 +865,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost8), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost8, "https"),
+          expectedCode);
     });
 
     test('POST 9', () {
@@ -870,7 +912,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPost9), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPost9, "https"),
+          expectedCode);
     });
   });
 
@@ -911,7 +955,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPut1), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPut1, "https"),
+          expectedCode);
     });
   });
 
@@ -952,7 +998,9 @@ public class Main {
 }
 ''';
       expect(
-          javaOkHttpCodeGen.getCode(requestModelPatch1), expectedCode);
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelPatch1, "https"),
+          expectedCode);
     });
   });
 
@@ -986,7 +1034,9 @@ public class Main {
     }
 }
 """;
-      expect(javaOkHttpCodeGen.getCode(requestModelDelete1),
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelDelete1, "https"),
           expectedCode);
     });
 
@@ -1025,8 +1075,10 @@ public class Main {
     }
 }
 ''';
-      expect(javaOkHttpCodeGen.getCode(requestModelDelete2),
+      expect(
+          codeGen.getCode(
+              CodegenLanguage.javaOkHttp, requestModelDelete2, "https"),
           expectedCode);
     });
   });
-}
\ No newline at end of file
+}
diff --git a/test/codegen/java_unirest_codegen_test.dart b/test/codegen/java_unirest_codegen_test.dart
index c3022ecb..c7567486 100644
--- a/test/codegen/java_unirest_codegen_test.dart
+++ b/test/codegen/java_unirest_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/js_axios_codegen_test.dart b/test/codegen/js_axios_codegen_test.dart
index 15bbeff1..3ec4b913 100644
--- a/test/codegen/js_axios_codegen_test.dart
+++ b/test/codegen/js_axios_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/js_fetch_codegen_test.dart b/test/codegen/js_fetch_codegen_test.dart
index 83ee687c..7d809623 100644
--- a/test/codegen/js_fetch_codegen_test.dart
+++ b/test/codegen/js_fetch_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/julia_http_codegen_test.dart b/test/codegen/julia_http_codegen_test.dart
index eb78e63b..062a182a 100644
--- a/test/codegen/julia_http_codegen_test.dart
+++ b/test/codegen/julia_http_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/kotlin_okhttp_codegen_test.dart b/test/codegen/kotlin_okhttp_codegen_test.dart
index 7b6850f3..292e5f35 100644
--- a/test/codegen/kotlin_okhttp_codegen_test.dart
+++ b/test/codegen/kotlin_okhttp_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/nodejs_axios_codegen_test.dart b/test/codegen/nodejs_axios_codegen_test.dart
index 31f359ea..e1b2b460 100644
--- a/test/codegen/nodejs_axios_codegen_test.dart
+++ b/test/codegen/nodejs_axios_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/nodejs_fetch_codegen_test.dart b/test/codegen/nodejs_fetch_codegen_test.dart
index 88ca7072..974d73fb 100644
--- a/test/codegen/nodejs_fetch_codegen_test.dart
+++ b/test/codegen/nodejs_fetch_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/php_curl_codegen_test.dart b/test/codegen/php_curl_codegen_test.dart
index afcb8e3e..69c78cce 100644
--- a/test/codegen/php_curl_codegen_test.dart
+++ b/test/codegen/php_curl_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/php_guzzle_codegen_test.dart b/test/codegen/php_guzzle_codegen_test.dart
index 91240781..f7765cd4 100644
--- a/test/codegen/php_guzzle_codegen_test.dart
+++ b/test/codegen/php_guzzle_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/php_http_plug_codegen_test.dart b/test/codegen/php_http_plug_codegen_test.dart
index ed8532af..2fef5b78 100644
--- a/test/codegen/php_http_plug_codegen_test.dart
+++ b/test/codegen/php_http_plug_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/python_http_client_codegen_test.dart b/test/codegen/python_http_client_codegen_test.dart
index c1d68702..8e2bbe17 100644
--- a/test/codegen/python_http_client_codegen_test.dart
+++ b/test/codegen/python_http_client_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/python_requests_codegen_test.dart b/test/codegen/python_requests_codegen_test.dart
index 057c09c6..994da3ad 100644
--- a/test/codegen/python_requests_codegen_test.dart
+++ b/test/codegen/python_requests_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/ruby_faraday_codegen_test.dart b/test/codegen/ruby_faraday_codegen_test.dart
index e7cf604e..28e95ffe 100644
--- a/test/codegen/ruby_faraday_codegen_test.dart
+++ b/test/codegen/ruby_faraday_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/ruby_net_http_codegen_test.dart b/test/codegen/ruby_net_http_codegen_test.dart
index 6ac3b09b..199e6f6e 100644
--- a/test/codegen/ruby_net_http_codegen_test.dart
+++ b/test/codegen/ruby_net_http_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/rust_actix_codegen_test.dart b/test/codegen/rust_actix_codegen_test.dart
index 8e215295..f9506ca8 100644
--- a/test/codegen/rust_actix_codegen_test.dart
+++ b/test/codegen/rust_actix_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/rust_curl_codegen_test.dart b/test/codegen/rust_curl_codegen_test.dart
index badc18ba..26250882 100644
--- a/test/codegen/rust_curl_codegen_test.dart
+++ b/test/codegen/rust_curl_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
@@ -32,8 +32,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet1, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet1, "https"),
           expectedCode);
     });
     test('GET2', () {
@@ -61,8 +60,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet2, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet2, "https"),
           expectedCode);
     });
     test('GET3', () {
@@ -90,8 +88,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet3, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet3, "https"),
           expectedCode);
     });
     test('GET4', () {
@@ -119,8 +116,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet4, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet4, "https"),
           expectedCode);
     });
     test('GET5', () {
@@ -153,8 +149,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet5, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet5, "https"),
           expectedCode);
     });
     test('GET6', () {
@@ -187,8 +182,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet6, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet6, "https"),
           expectedCode);
     });
     test('GET7', () {
@@ -216,8 +210,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet7, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet7, "https"),
           expectedCode);
     });
     test('GET8', () {
@@ -250,8 +243,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet8, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet8, "https"),
           expectedCode);
     });
     test('GET9', () {
@@ -279,8 +271,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet9, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet9, "https"),
           expectedCode);
     });
     test('GET10', () {
@@ -313,8 +304,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet10, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet10, "https"),
           expectedCode);
     });
     test('GET11', () {
@@ -347,8 +337,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet11, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet11, "https"),
           expectedCode);
     });
     test('GET12', () {
@@ -376,8 +365,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelGet12, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet12, "https"),
           expectedCode);
     });
   });
@@ -408,8 +396,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelHead1, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelHead1, "https"),
           expectedCode);
     });
     test('HEAD2', () {
@@ -437,8 +424,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelHead2, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelHead2, "https"),
           expectedCode);
     });
   });
@@ -478,8 +464,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost1, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost1, "https"),
           expectedCode);
     });
     test('POST2', () {
@@ -522,8 +507,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost2, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost2, "https"),
           expectedCode);
     });
     test('POST3', () {
@@ -562,8 +546,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost3, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost3, "https"),
           expectedCode);
     });
     test('POST4', () {
@@ -606,8 +589,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost4, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost4, "https"),
           expectedCode);
     });
     test('POST5', () {
@@ -655,8 +637,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost5, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost5, "https"),
           expectedCode);
     });
     test('POST6', () {
@@ -695,8 +676,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost6, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost6, "https"),
           expectedCode);
     });
     test('POST7', () {
@@ -735,8 +715,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost7, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost7, "https"),
           expectedCode);
     });
     test('POST8', () {
@@ -779,8 +758,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost8, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost8, "https"),
           expectedCode);
     });
     test('POST9', () {
@@ -825,8 +803,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPost9, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost9, "https"),
           expectedCode);
     });
   });
@@ -868,8 +845,7 @@ fn main() {
   println!("Response code: {}", easy.response_code().unwrap());
 }""";
       expect(
-          codeGen.getCode(
-              CodegenLanguage.rustCurl, requestModelPut1, "https"),
+          codeGen.getCode(CodegenLanguage.rustCurl, requestModelPut1, "https"),
           expectedCode);
     });
   });
@@ -988,5 +964,4 @@ fn main() {
           expectedCode);
     });
   });
-
 }
diff --git a/test/codegen/rust_reqwest_codegen_test.dart b/test/codegen/rust_reqwest_codegen_test.dart
index c262a64e..b8a4b904 100644
--- a/test/codegen/rust_reqwest_codegen_test.dart
+++ b/test/codegen/rust_reqwest_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();
diff --git a/test/codegen/rust_ureq_codegen_test.dart b/test/codegen/rust_ureq_codegen_test.dart
index b6985f3f..3a31294d 100644
--- a/test/codegen/rust_ureq_codegen_test.dart
+++ b/test/codegen/rust_ureq_codegen_test.dart
@@ -1,7 +1,7 @@
 import 'package:apidash/codegen/codegen.dart';
 import 'package:apidash/consts.dart';
 import 'package:test/test.dart';
-import '../request_models.dart';
+import '../models/request_models.dart';
 
 void main() {
   final codeGen = Codegen();