diff --git a/src/bot/mod.rs b/src/bot.rs
similarity index 100%
rename from src/bot/mod.rs
rename to src/bot.rs
diff --git a/src/net/mod.rs b/src/net.rs
similarity index 100%
rename from src/net/mod.rs
rename to src/net.rs
diff --git a/src/payloads/mod.rs b/src/payloads.rs
similarity index 100%
rename from src/payloads/mod.rs
rename to src/payloads.rs
diff --git a/src/requests/mod.rs b/src/requests.rs
similarity index 100%
rename from src/requests/mod.rs
rename to src/requests.rs
diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index 814dc906..dcee7ef1 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -6,6 +6,9 @@
 //! ## How it works
 //!
 //! You better not know...
+//!
+//! This whole module is an awful hack and we'll probably stop using it in next
+//! versions (in favor of something less automatic, but more simple).
 
 mod serializers;
 mod unserializers;
diff --git a/src/types/mod.rs b/src/types.rs
similarity index 95%
rename from src/types/mod.rs
rename to src/types.rs
index 52bf56a2..05430052 100644
--- a/src/types/mod.rs
+++ b/src/types.rs
@@ -190,5 +190,10 @@ mod passport_data;
 mod passport_element_error;
 mod passport_file;
 
-pub use non_telegram_types::*;
-mod non_telegram_types;
+pub use non_telegram_types::{country_code::*, currency::*, non_strict_vec::*};
+mod non_telegram_types {
+    pub(super) mod country_code;
+    pub(super) mod currency;
+    pub(crate) mod mime;
+    pub(super) mod non_strict_vec;
+}
diff --git a/src/types/non_telegram_types/mod.rs b/src/types/non_telegram_types/mod.rs
deleted file mode 100644
index 49360c4f..00000000
--- a/src/types/non_telegram_types/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub use country_code::*;
-pub use currency::*;
-pub use non_strict_vec::*;
-
-mod country_code;
-mod currency;
-mod non_strict_vec;
-
-pub(crate) mod mime;