diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
index 6e1c952f2a4..38174b4681c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -187,7 +187,7 @@ public class RustClientCodegen extends AbstractRustCodegen implements CodegenCon
         // I tried to map as "std::io::File", but Reqwest multipart file requires a "AsRef<Path>" param.
         // Getting a file from a Path is simple, but the opposite is difficult. So I map as "std::path::Path".
         typeMapping.put("file", "std::path::PathBuf");
-        typeMapping.put("binary", "crate::models::File");
+        typeMapping.put("binary", "super::super::models::File");
         typeMapping.put("ByteArray", "String");
         typeMapping.put("object", "serde_json::Value");
         typeMapping.put("AnyType", "serde_json::Value");
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache
index d2a4b3fcc25..1d4c65c9064 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-imports.mustache
@@ -29,7 +29,7 @@ use hyper_0_10::header::{Headers, ContentType};
 use mime_multipart::{Node, Part, write_multipart};
 {{/apiUsesMultipartRelated}}
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/modules/openapi-generator/src/main/resources/rust-server/models.mustache b/modules/openapi-generator/src/main/resources/rust-server/models.mustache
index 9cdd4a1a580..b1f0e52a851 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/models.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/models.mustache
@@ -2,7 +2,7 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;
 {{! Don't "use" structs here - they can conflict with the names of models, and mean that the code won't compile }}
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache
index ad0410bc9e4..b6eb01b2998 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache
@@ -9,7 +9,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper0x/api.mustache b/modules/openapi-generator/src/main/resources/rust/hyper0x/api.mustache
index f59705ea7b7..2132d352415 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper0x/api.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper0x/api.mustache
@@ -8,7 +8,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache
index a4970abf429..93d0041024d 100644
--- a/modules/openapi-generator/src/main/resources/rust/model.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/model.mustache
@@ -1,5 +1,5 @@
 {{>partial_header}}
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 {{#models}}
 {{#model}}
diff --git a/samples/client/others/rust/hyper/api-with-ref-param/src/apis/default_api.rs b/samples/client/others/rust/hyper/api-with-ref-param/src/apis/default_api.rs
index 8d86606eb1c..b459b9e9432 100644
--- a/samples/client/others/rust/hyper/api-with-ref-param/src/apis/default_api.rs
+++ b/samples/client/others/rust/hyper/api-with-ref-param/src/apis/default_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs b/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs
index 7fcd2768c20..bced3c7d420 100644
--- a/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs
+++ b/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// 
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/apis/default_api.rs b/samples/client/others/rust/hyper/composed-oneof/src/apis/default_api.rs
index fb068549f49..ebe15f9f44c 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/apis/default_api.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/apis/default_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs
index 7e3701b8c96..3da95bc15e1 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
index 2b3c27f0d4e..6894d18c0e5 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs
index c4f53db183d..9b97b0def10 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs
index aeee0c377e4..523002c83da 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs
index 0d581be15d9..75d812a8e8e 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs
index d0c508338d8..cbf5d5f5ddd 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs
index df21df238a3..2e1200ae322 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs
index 37640c7b418..b8d043e3721 100644
--- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs
+++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/emptyObject/src/apis/default_api.rs b/samples/client/others/rust/hyper/emptyObject/src/apis/default_api.rs
index cc1fc0d583f..dbde7808de2 100644
--- a/samples/client/others/rust/hyper/emptyObject/src/apis/default_api.rs
+++ b/samples/client/others/rust/hyper/emptyObject/src/apis/default_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs b/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs
index ed5bffc2d37..a7b39884500 100644
--- a/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs
+++ b/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/apis/default_api.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/apis/default_api.rs
index ba864fa834f..a10e5518721 100644
--- a/samples/client/others/rust/hyper/oneOf-array-map/src/apis/default_api.rs
+++ b/samples/client/others/rust/hyper/oneOf-array-map/src/apis/default_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs
index a9f47c5e029..5f08df66b89 100644
--- a/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs
+++ b/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs
index 827f9e47063..40e7aaf1813 100644
--- a/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs
+++ b/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs
index 50b1144cd1d..e320f28f3e8 100644
--- a/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs
+++ b/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/default_api.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/default_api.rs
index 866bb2606db..1a3a075c43d 100644
--- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/default_api.rs
+++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/default_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs
index 6a7c03c3bc1..2eaa08058ae 100644
--- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs
+++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs
index a80f3d23e0f..16620fb3f50 100644
--- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs
+++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs
index cd28f15520c..8953ebcfe0c 100644
--- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs
+++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/apis/bar_api.rs b/samples/client/others/rust/hyper/oneOf/src/apis/bar_api.rs
index d70aa52bef2..6ea9f68df4e 100644
--- a/samples/client/others/rust/hyper/oneOf/src/apis/bar_api.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/apis/bar_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/others/rust/hyper/oneOf/src/apis/foo_api.rs b/samples/client/others/rust/hyper/oneOf/src/apis/foo_api.rs
index 94e2007b910..94e5060808e 100644
--- a/samples/client/others/rust/hyper/oneOf/src/apis/foo_api.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/apis/foo_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs b/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs
index bbca8e7e923..91c9728d2a5 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Addressable : Base schema for addressable entities
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/apple.rs b/samples/client/others/rust/hyper/oneOf/src/models/apple.rs
index 3796fb213f4..3afa4df0a27 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/apple.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/apple.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/banana.rs b/samples/client/others/rust/hyper/oneOf/src/models/banana.rs
index 4bfe4182257..5b5143c264f 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/banana.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/banana.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar.rs
index 2499fb3a586..9a0a6a5a97b 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/bar.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/bar.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs
index 6eb81b99033..ce325812e98 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs
index 8533dd933f5..cb3192c89e7 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs
index 6d1977d5ba0..4b9c3d89915 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/entity.rs b/samples/client/others/rust/hyper/oneOf/src/models/entity.rs
index bfb1aac3382..1872ca5c9ba 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/entity.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/entity.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs
index 01272ef9fad..9ffec259348 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EntityRef : Entity reference schema to be use for all entityRef class.
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs b/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs
index 23875ef0c6e..a88e5accc38 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/foo.rs b/samples/client/others/rust/hyper/oneOf/src/models/foo.rs
index ea618695d0b..27a16599e8c 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/foo.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/foo.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs
index d0b425044b7..30f35e63835 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs
index fbbbd13150e..bea22c793c8 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs b/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs
index 56d7f1eba28..583256d27ef 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs b/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs
index 6548af28e3f..5e48b82a1c1 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// 
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs b/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs
index 8ba2efce083..8b88ee15afc 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs b/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs
index bfe6de64826..91926970fbe 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs b/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs
index a294e07dfdb..bd5c4b9285a 100644
--- a/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs
+++ b/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs b/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs
index 31d1ea44857..866977037a0 100644
--- a/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs
+++ b/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs b/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs
index 7fcd2768c20..bced3c7d420 100644
--- a/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs
+++ b/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// 
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs
index 7e3701b8c96..3da95bc15e1 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
index 2b3c27f0d4e..6894d18c0e5 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs
index c4f53db183d..9b97b0def10 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs
index aeee0c377e4..523002c83da 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs
index 0d581be15d9..75d812a8e8e 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs
index d0c508338d8..cbf5d5f5ddd 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs
index df21df238a3..2e1200ae322 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs
index 37640c7b418..b8d043e3721 100644
--- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs
+++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs b/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs
index ed5bffc2d37..a7b39884500 100644
--- a/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs
+++ b/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs
index a9f47c5e029..5f08df66b89 100644
--- a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs
+++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs
index 827f9e47063..40e7aaf1813 100644
--- a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs
+++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs
index 50b1144cd1d..e320f28f3e8 100644
--- a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs
+++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs
index 6a7c03c3bc1..2eaa08058ae 100644
--- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs
+++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs
index a80f3d23e0f..16620fb3f50 100644
--- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs
+++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs
index cd28f15520c..8953ebcfe0c 100644
--- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs
+++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs b/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs
index bbca8e7e923..91c9728d2a5 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Addressable : Base schema for addressable entities
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs b/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs
index 3796fb213f4..3afa4df0a27 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs b/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs
index 4bfe4182257..5b5143c264f 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs
index 2499fb3a586..9a0a6a5a97b 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs
index 6eb81b99033..ce325812e98 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs
index 8533dd933f5..cb3192c89e7 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs
index 6d1977d5ba0..4b9c3d89915 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs b/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs
index bfb1aac3382..1872ca5c9ba 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs b/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs
index 01272ef9fad..9ffec259348 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EntityRef : Entity reference schema to be use for all entityRef class.
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs b/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs
index 23875ef0c6e..a88e5accc38 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs b/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs
index ea618695d0b..27a16599e8c 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs
index d0b425044b7..30f35e63835 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs
index fbbbd13150e..bea22c793c8 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs b/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs
index 56d7f1eba28..583256d27ef 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs b/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs
index 6548af28e3f..5e48b82a1c1 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// 
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs b/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs
index 8ba2efce083..8b88ee15afc 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs b/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs
index bfe6de64826..91926970fbe 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs b/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs
index a294e07dfdb..bd5c4b9285a 100644
--- a/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs
+++ b/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/fake_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/fake_api.rs
index 8e422ef9d4b..da5751a3823 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/apis/fake_api.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/apis/fake_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/pet_api.rs
index eff676820f4..8abc9848ff9 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/apis/pet_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/store_api.rs
index df714e9528e..656fc8d4ab8 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/apis/store_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/testing_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/testing_api.rs
index 1e16186bd20..681a83a8a58 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/apis/testing_api.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/apis/testing_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/user_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/user_api.rs
index 174d2ae9ff5..acef37e59fb 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/apis/user_api.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/apis/user_api.rs
@@ -18,7 +18,7 @@ use hyper;
 use hyper_util::client::legacy::connect::Connect;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/hyper/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs b/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/any_type_test.rs b/samples/client/petstore/rust/hyper/petstore/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs b/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs b/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/category.rs b/samples/client/petstore/rust/hyper/petstore/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/category.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs b/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs b/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs b/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/order.rs b/samples/client/petstore/rust/hyper/petstore/src/models/order.rs
index e81f64a2980..cb3eea3cd49 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/order.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/person.rs b/samples/client/petstore/rust/hyper/petstore/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/person.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs b/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs b/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs b/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/user.rs b/samples/client/petstore/rust/hyper/petstore/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/user.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/vehicle.rs b/samples/client/petstore/rust/hyper/petstore/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/hyper/petstore/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/hyper/petstore/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/apis/fake_api.rs b/samples/client/petstore/rust/hyper0x/petstore/src/apis/fake_api.rs
index 099602bb22a..aeb3152f3e4 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/apis/fake_api.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/apis/fake_api.rs
@@ -17,7 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/hyper0x/petstore/src/apis/pet_api.rs
index ff4fadea86a..861aa4351af 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/apis/pet_api.rs
@@ -17,7 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/hyper0x/petstore/src/apis/store_api.rs
index d1984b9e698..768f6d4b042 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/apis/store_api.rs
@@ -17,7 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/apis/testing_api.rs b/samples/client/petstore/rust/hyper0x/petstore/src/apis/testing_api.rs
index 118c17f212a..c52ed8149dc 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/apis/testing_api.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/apis/testing_api.rs
@@ -17,7 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/apis/user_api.rs b/samples/client/petstore/rust/hyper0x/petstore/src/apis/user_api.rs
index 3511933ac8b..88350437cfd 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/apis/user_api.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/apis/user_api.rs
@@ -17,7 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
-use crate::models;
+use super::super::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/action_container.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/action_container.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/any_type_test.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/api_response.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/api_response.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/baz.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/baz.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/category.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/category.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/enum_array_testing.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/model_ref.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/model_return.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/model_return.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/nullable_array.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/optional_testing.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/order.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/order.rs
index e81f64a2980..cb3eea3cd49 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/order.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/person.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/person.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/pet.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/pet.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/property_test.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/property_test.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/tag.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/tag.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/type_testing.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/user.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/user.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/hyper0x/petstore/src/models/vehicle.rs b/samples/client/petstore/rust/hyper0x/petstore/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/hyper0x/petstore/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/hyper0x/petstore/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/action_container.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/action_container.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/any_type_test.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/api_response.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/api_response.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/baz.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/baz.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/category.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/category.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_return.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_return.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/order.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/order.rs
index a66e7dbb568..dce6a7b21dc 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/order.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/person.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/person.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/pet.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/pet.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/property_test.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/property_test.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/tag.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/tag.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/user.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/user.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/vehicle.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/reqwest-trait/petstore/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs b/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs
index caf948339e0..9be82c05881 100644
--- a/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs
+++ b/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/any_type_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs
index e81f64a2980..cb3eea3cd49 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/person.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/person.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/vehicle.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/action_container.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/any_type_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/api_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/baz.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/category.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_return.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/order.rs
index e81f64a2980..cb3eea3cd49 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/order.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/person.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/person.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/pet.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/property_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/tag.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/user.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/vehicle.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/any_type_test.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs
index e81f64a2980..cb3eea3cd49 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/person.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/person.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/vehicle.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/any_type_test.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs
index e81f64a2980..cb3eea3cd49 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/person.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/person.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs
index 9d5606d017f..e607a596be0 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/vehicle.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/any_type_test.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs
index e81f64a2980..cb3eea3cd49 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/person.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/person.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/vehicle.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo__tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo__tests_discriminator_duplicate_enums_get_200_response.rs
index 10653b9911a..1b821d771c2 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo__tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo__tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_action_container.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_action_container.rs
index 25ba31f646e..5a897934e7b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_action_container.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_any_type_test.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_any_type_test.rs
index 6f0cbd7a74a..0bafcbb0ec9 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_api_response.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_api_response.rs
index aa2d9292b3b..fc72edcb616 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_api_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_array_item_ref_test.rs
index 4f2cf2bbf05..3f4b3498ade 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_baz.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_baz.rs
index 44566e73afc..9b46141ad25 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_baz.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooBaz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_category.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_category.rs
index 93d078290b2..1dd64e862b1 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_category.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooCategory : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_enum_array_testing.rs
index 7ef4f239d9b..ed6e984d3ad 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooEnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_nullable_array.rs
index bce4ae0c95b..aad3c5c6003 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_numeric_enum_testing.rs
index 9c006d9d238..0b3b62b4b19 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_optional_testing.rs
index 624898a78d4..88a0c4d6f35 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooOptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_order.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_order.rs
index 1b504b7a984..22e2de8548e 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_order.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooOrder : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_person.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_person.rs
index f9cf485e6ba..baacef15b23 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_person.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_pet.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_pet.rs
index f5758f22283..77e4e431d19 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_pet.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooPet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_property_test.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_property_test.rs
index 8dae0d43d74..d257c7ed913 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_property_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooPropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_ref.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_ref.rs
index a5ff541e6a6..89acdfb05ac 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_ref.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooRef : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_return.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_return.rs
index b886d6e6d86..2000032bc03 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_return.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooReturn : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_tag.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_tag.rs
index 017acd986d5..d27679c0939 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_tag.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooTag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_type_testing.rs
index facf71f65c7..f64f06a4445 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_type_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs
index 22ab4a0d71e..267e9a07e19 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooUniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_user.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_user.rs
index 33680ecfdf8..6175792bf3b 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_user.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// FooUser : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_vehicle.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_vehicle.rs
index 3647e46f8a6..3e363a7f425 100644
--- a/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_vehicle.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/models/foo_vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
index 5f777674594..5e4aa7067eb 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/_tests_discriminator_duplicate_enums_get_200_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs
index 0dd27c0e5c8..a1027fa1cc7 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/any_type_test.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/any_type_test.rs
index 8a873991fd4..dd8cba86a74 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/any_type_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/any_type_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs
index 0a60da0f477..916d4279233 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ApiResponse : Describes the result of uploading an image resource
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs
index 4ac1e8a2fe9..46b583e472f 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// ArrayItemRefTest : Test handling of object reference in arrays
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs
index 17b42c0bd4f..6c2a881a451 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Baz : Test handling of empty variants
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs
index 9ecf89d354d..26cb656eed3 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Category : A category for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs
index 2ac40c30775..b20f8092847 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// EnumArrayTesting : Test of enum array
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs
index 9862cb1a48e..75facba327d 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Ref : using reserved word as model name
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs
index 07d9268e6e6..9a7a91a4ef2 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Return : Test using keywords
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs
index a155ea1176a..6843952fa0b 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/numeric_enum_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/numeric_enum_testing.rs
index e3681aa6177..7181ce182fe 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/numeric_enum_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/numeric_enum_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_repr::{Serialize_repr,Deserialize_repr};
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs
index 72e5a009a62..6edfc8a1bed 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// OptionalTesting : Test handling of optional and nullable fields
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs
index a66e7dbb568..dce6a7b21dc 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Order : An order for a pets from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/person.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/person.rs
index 67c2da45b5c..8e4d63a05ad 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/person.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/person.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs
index 785fb5390be..6dcd7d14b9f 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Pet : A pet for sale in the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs
index c98e7c762b5..ced9c23e96b 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// PropertyTest : A model to test various formats, e.g. UUID
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs
index 8fe4eebd723..ec5f2b665f8 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// Tag : A tag for a pet
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs
index 1c406069fec..1b1382764e7 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 use serde_with::serde_as;
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs
index bddcf9d5c19..0a1510f78f4 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// UniqueItemArrayTesting : Test handling of enum array with unique items
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs
index c88c469a4eb..8b58352d602 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 /// User : A User who is purchasing from the pet store
diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/vehicle.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/vehicle.rs
index 45cf0f72115..d8011b5cd10 100644
--- a/samples/client/petstore/rust/reqwest/petstore/src/models/vehicle.rs
+++ b/samples/client/petstore/rust/reqwest/petstore/src/models/vehicle.rs
@@ -8,7 +8,7 @@
  * Generated by: https://openapi-generator.tech
  */
 
-use crate::models;
+use super::super::models;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
index 42a5fbc96b8..31a615b7bd3 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
@@ -25,7 +25,7 @@ use multipart::client::lazy::Multipart;
 use hyper_0_10::header::{Headers, ContentType};
 use mime_multipart::{Node, Part, write_multipart};
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
index e4d230e6faf..c03871acdb7 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
@@ -2,7 +2,7 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;
 
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
index 218967ec7a6..d3e42577c9e 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
@@ -20,7 +20,7 @@ use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, X
 use url::form_urlencoded;
 
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs b/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs
index 6d87b86882f..eaf70df72c5 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/no-example-v3/src/models.rs
@@ -2,7 +2,7 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;
 
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
index d90cd75e2e2..aa0c71ac85e 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
@@ -20,7 +20,7 @@ use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, X
 use url::form_urlencoded;
 
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
index df40ebcf12a..2b294be83e4 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
@@ -2,7 +2,7 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;
 
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs
index 5bda72e889d..2939bd91caa 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/server/callbacks.rs
@@ -20,7 +20,7 @@ use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, X
 use url::form_urlencoded;
 
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
index f3dbc73c989..f5bd5716b20 100644
--- a/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
@@ -20,7 +20,7 @@ use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, X
 use url::form_urlencoded;
 
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/ops-v3/src/models.rs b/samples/server/petstore/rust-server/output/ops-v3/src/models.rs
index f0f5817e64e..2818a68801d 100644
--- a/samples/server/petstore/rust-server/output/ops-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/ops-v3/src/models.rs
@@ -2,6 +2,6 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
index 8c35448de11..a6f66af5a66 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
@@ -23,7 +23,7 @@ use mime::Mime;
 use std::io::Cursor;
 use multipart::client::lazy::Multipart;
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
index 0be12ebcc51..9dad335ac4d 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
@@ -2,7 +2,7 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;
 
diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/src/client/mod.rs b/samples/server/petstore/rust-server/output/ping-bearer-auth/src/client/mod.rs
index 9e6dfec94b3..6cb77441bdf 100644
--- a/samples/server/petstore/rust-server/output/ping-bearer-auth/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/src/client/mod.rs
@@ -20,7 +20,7 @@ use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, X
 use url::form_urlencoded;
 
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/src/models.rs b/samples/server/petstore/rust-server/output/ping-bearer-auth/src/models.rs
index f0f5817e64e..2818a68801d 100644
--- a/samples/server/petstore/rust-server/output/ping-bearer-auth/src/models.rs
+++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/src/models.rs
@@ -2,6 +2,6 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
index a88ea9dea0a..4e134468bc2 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
@@ -20,7 +20,7 @@ use swagger::{ApiError, AuthData, BodyExt, Connector, DropContextService, Has, X
 use url::form_urlencoded;
 
 
-use crate::models;
+use super::super::models;
 use crate::header;
 
 /// https://url.spec.whatwg.org/#fragment-percent-encode-set
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs
index 0e86f9a1267..340da7044f9 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/models.rs
@@ -2,7 +2,7 @@
 
 use validator::Validate;
 
-use crate::models;
+use super::super::models;
 #[cfg(any(feature = "client", feature = "server"))]
 use crate::header;