From af9cf93c76d9a629a8912f015cd109fbc08e26c6 Mon Sep 17 00:00:00 2001
From: Waffle <wafflewafflerov@gmail.com>
Date: Sat, 21 Sep 2019 00:02:37 +0300
Subject: [PATCH] Remove `core` module

---
 src/bot/mod.rs                                | 11 ++---
 src/core/mod.rs                               |  3 --
 src/lib.rs                                    |  5 ++-
 src/{core => }/network/mod.rs                 |  2 +-
 .../requests/answer_pre_checkout_query.rs     |  2 +-
 .../requests/answer_shipping_query.rs         |  6 +--
 .../requests/edit_message_live_location.rs    |  6 +--
 src/{core => }/requests/form_builder.rs       |  2 +-
 src/{core => }/requests/forward_message.rs    |  2 +-
 src/{core => }/requests/get_chat.rs           |  6 +--
 src/{core => }/requests/get_file.rs           |  6 +--
 src/{core => }/requests/get_me.rs             |  2 +-
 .../requests/get_user_profile_photos.rs       |  2 +-
 src/{core => }/requests/kick_chat_member.rs   |  2 +-
 src/{core => }/requests/mod.rs                |  0
 .../requests/restrict_chat_member.rs          |  2 +-
 src/{core => }/requests/send_audio.rs         |  8 ++--
 src/{core => }/requests/send_chat_action.rs   |  4 +-
 src/{core => }/requests/send_contact.rs       |  6 +--
 src/{core => }/requests/send_location.rs      |  2 +-
 src/{core => }/requests/send_media_group.rs   |  2 +-
 src/{core => }/requests/send_message.rs       |  8 ++--
 src/{core => }/requests/send_photo.rs         |  8 ++--
 src/{core => }/requests/send_poll.rs          |  6 +--
 src/{core => }/requests/send_venue.rs         |  6 +--
 .../requests/stop_message_live_location.rs    |  2 +-
 src/{core => }/requests/unban_chat_member.rs  |  2 +-
 src/{core => }/requests/utils.rs              |  0
 src/{core => }/types/animation.rs             |  2 +-
 src/{core => }/types/audio.rs                 |  6 +--
 src/{core => }/types/callback_game.rs         |  0
 src/{core => }/types/callback_query.rs        |  8 ++--
 src/{core => }/types/chat.rs                  |  4 +-
 src/{core => }/types/chat_member.rs           | 10 ++---
 src/{core => }/types/chat_permissions.rs      |  0
 src/{core => }/types/chat_photo.rs            |  0
 src/{core => }/types/chosen_inline_result.rs  |  2 +-
 src/{core => }/types/contact.rs               |  0
 src/{core => }/types/document.rs              |  2 +-
 src/{core => }/types/file.rs                  |  0
 src/{core => }/types/force_reply.rs           |  0
 src/{core => }/types/game.rs                  |  2 +-
 src/{core => }/types/game_high_score.rs       |  4 +-
 .../types/inline_keyboard_button.rs           |  2 +-
 .../types/inline_keyboard_markup.rs           |  4 +-
 src/{core => }/types/inline_query.rs          |  2 +-
 src/{core => }/types/inline_query_result.rs   |  8 ++--
 .../types/inline_query_result_article.rs      |  2 +-
 .../types/inline_query_result_audio.rs        |  4 +-
 .../types/inline_query_result_cached_audio.rs |  4 +-
 .../inline_query_result_cached_document.rs    |  4 +-
 .../types/inline_query_result_cached_gif.rs   |  4 +-
 .../inline_query_result_cached_mpeg4_gif.rs   |  4 +-
 .../types/inline_query_result_cached_photo.rs |  4 +-
 .../inline_query_result_cached_sticker.rs     |  2 +-
 .../types/inline_query_result_cached_video.rs |  4 +-
 .../types/inline_query_result_cached_voice.rs |  4 +-
 .../types/inline_query_result_contact.rs      |  2 +-
 .../types/inline_query_result_document.rs     |  4 +-
 .../types/inline_query_result_game.rs         |  2 +-
 .../types/inline_query_result_gif.rs          |  4 +-
 .../types/inline_query_result_location.rs     |  2 +-
 .../types/inline_query_result_mpeg4_gif.rs    |  4 +-
 .../types/inline_query_result_photo.rs        |  4 +-
 .../types/inline_query_result_venue.rs        |  2 +-
 .../types/inline_query_result_video.rs        |  4 +-
 .../types/inline_query_result_voice.rs        |  4 +-
 src/{core => }/types/input_file.rs            |  0
 src/{core => }/types/input_media.rs           | 40 +++++++++----------
 src/{core => }/types/input_message_content.rs |  8 ++--
 src/{core => }/types/invoice.rs               |  0
 src/{core => }/types/keyboard_button.rs       |  0
 src/{core => }/types/label_price.rs           |  0
 src/{core => }/types/location.rs              |  0
 src/{core => }/types/login_url.rs             |  0
 src/{core => }/types/mask_position.rs         |  0
 src/{core => }/types/message.rs               | 11 ++---
 src/{core => }/types/message_entity.rs        |  2 +-
 src/{core => }/types/mod.rs                   |  0
 src/{core => }/types/not_implemented_types.rs |  0
 src/{core => }/types/order_info.rs            |  2 +-
 src/{core => }/types/parse_mode.rs            |  0
 src/{core => }/types/photo_size.rs            |  0
 src/{core => }/types/poll.rs                  |  0
 src/{core => }/types/pre_checkout_query.rs    |  2 +-
 src/{core => }/types/reply_keyboard_markup.rs |  2 +-
 src/{core => }/types/reply_keyboard_remove.rs |  0
 src/{core => }/types/reply_markup.rs          |  2 +-
 src/{core => }/types/response_parameters.rs   |  0
 src/{core => }/types/send_invoice.rs          |  4 +-
 src/{core => }/types/shipping_address.rs      |  0
 src/{core => }/types/shipping_option.rs       |  2 +-
 src/{core => }/types/shipping_query.rs        |  2 +-
 src/{core => }/types/sticker.rs               |  2 +-
 src/{core => }/types/sticker_set.rs           |  2 +-
 src/{core => }/types/successful_payment.rs    |  2 +-
 src/{core => }/types/update.rs                |  2 +-
 src/{core => }/types/user.rs                  |  0
 src/{core => }/types/user_profile_photos.rs   |  4 +-
 src/{core => }/types/venue.rs                 |  2 +-
 src/{core => }/types/video.rs                 |  2 +-
 src/{core => }/types/video_note.rs            |  2 +-
 src/{core => }/types/voice.rs                 |  0
 src/{core => }/types/webhook_info.rs          |  0
 104 files changed, 153 insertions(+), 179 deletions(-)
 delete mode 100644 src/core/mod.rs
 rename src/{core => }/network/mod.rs (99%)
 rename src/{core => }/requests/answer_pre_checkout_query.rs (99%)
 rename src/{core => }/requests/answer_shipping_query.rs (96%)
 rename src/{core => }/requests/edit_message_live_location.rs (96%)
 rename src/{core => }/requests/form_builder.rs (99%)
 rename src/{core => }/requests/forward_message.rs (99%)
 rename src/{core => }/requests/get_chat.rs (87%)
 rename src/{core => }/requests/get_file.rs (94%)
 rename src/{core => }/requests/get_me.rs (97%)
 rename src/{core => }/requests/get_user_profile_photos.rs (93%)
 rename src/{core => }/requests/kick_chat_member.rs (92%)
 rename src/{core => }/requests/mod.rs (100%)
 rename src/{core => }/requests/restrict_chat_member.rs (78%)
 rename src/{core => }/requests/send_audio.rs (97%)
 rename src/{core => }/requests/send_chat_action.rs (97%)
 rename src/{core => }/requests/send_contact.rs (97%)
 rename src/{core => }/requests/send_location.rs (99%)
 rename src/{core => }/requests/send_media_group.rs (99%)
 rename src/{core => }/requests/send_message.rs (95%)
 rename src/{core => }/requests/send_photo.rs (96%)
 rename src/{core => }/requests/send_poll.rs (96%)
 rename src/{core => }/requests/send_venue.rs (97%)
 rename src/{core => }/requests/stop_message_live_location.rs (99%)
 rename src/{core => }/requests/unban_chat_member.rs (78%)
 rename src/{core => }/requests/utils.rs (100%)
 rename src/{core => }/types/animation.rs (98%)
 rename src/{core => }/types/audio.rs (93%)
 rename src/{core => }/types/callback_game.rs (100%)
 rename src/{core => }/types/callback_query.rs (88%)
 rename src/{core => }/types/chat.rs (97%)
 rename src/{core => }/types/chat_member.rs (97%)
 rename src/{core => }/types/chat_permissions.rs (100%)
 rename src/{core => }/types/chat_photo.rs (100%)
 rename src/{core => }/types/chosen_inline_result.rs (95%)
 rename src/{core => }/types/contact.rs (100%)
 rename src/{core => }/types/document.rs (87%)
 rename src/{core => }/types/file.rs (100%)
 rename src/{core => }/types/force_reply.rs (100%)
 rename src/{core => }/types/game.rs (94%)
 rename src/{core => }/types/game_high_score.rs (89%)
 rename src/{core => }/types/inline_keyboard_button.rs (98%)
 rename src/{core => }/types/inline_keyboard_markup.rs (97%)
 rename src/{core => }/types/inline_query.rs (91%)
 rename src/{core => }/types/inline_query_result.rs (95%)
 rename src/{core => }/types/inline_query_result_article.rs (94%)
 rename src/{core => }/types/inline_query_result_audio.rs (89%)
 rename src/{core => }/types/inline_query_result_cached_audio.rs (86%)
 rename src/{core => }/types/inline_query_result_cached_document.rs (88%)
 rename src/{core => }/types/inline_query_result_cached_gif.rs (87%)
 rename src/{core => }/types/inline_query_result_cached_mpeg4_gif.rs (87%)
 rename src/{core => }/types/inline_query_result_cached_photo.rs (89%)
 rename src/{core => }/types/inline_query_result_cached_sticker.rs (84%)
 rename src/{core => }/types/inline_query_result_cached_video.rs (88%)
 rename src/{core => }/types/inline_query_result_cached_voice.rs (86%)
 rename src/{core => }/types/inline_query_result_contact.rs (92%)
 rename src/{core => }/types/inline_query_result_document.rs (91%)
 rename src/{core => }/types/inline_query_result_game.rs (84%)
 rename src/{core => }/types/inline_query_result_gif.rs (91%)
 rename src/{core => }/types/inline_query_result_location.rs (91%)
 rename src/{core => }/types/inline_query_result_mpeg4_gif.rs (91%)
 rename src/{core => }/types/inline_query_result_photo.rs (92%)
 rename src/{core => }/types/inline_query_result_venue.rs (92%)
 rename src/{core => }/types/inline_query_result_video.rs (91%)
 rename src/{core => }/types/inline_query_result_voice.rs (88%)
 rename src/{core => }/types/input_file.rs (100%)
 rename src/{core => }/types/input_media.rs (89%)
 rename src/{core => }/types/input_message_content.rs (96%)
 rename src/{core => }/types/invoice.rs (100%)
 rename src/{core => }/types/keyboard_button.rs (100%)
 rename src/{core => }/types/label_price.rs (100%)
 rename src/{core => }/types/location.rs (100%)
 rename src/{core => }/types/login_url.rs (100%)
 rename src/{core => }/types/mask_position.rs (100%)
 rename src/{core => }/types/message.rs (98%)
 rename src/{core => }/types/message_entity.rs (96%)
 rename src/{core => }/types/mod.rs (100%)
 rename src/{core => }/types/not_implemented_types.rs (100%)
 rename src/{core => }/types/order_info.rs (83%)
 rename src/{core => }/types/parse_mode.rs (100%)
 rename src/{core => }/types/photo_size.rs (100%)
 rename src/{core => }/types/poll.rs (100%)
 rename src/{core => }/types/pre_checkout_query.rs (87%)
 rename src/{core => }/types/reply_keyboard_markup.rs (97%)
 rename src/{core => }/types/reply_keyboard_remove.rs (100%)
 rename src/{core => }/types/reply_markup.rs (92%)
 rename src/{core => }/types/response_parameters.rs (100%)
 rename src/{core => }/types/send_invoice.rs (90%)
 rename src/{core => }/types/shipping_address.rs (100%)
 rename src/{core => }/types/shipping_option.rs (95%)
 rename src/{core => }/types/shipping_query.rs (80%)
 rename src/{core => }/types/sticker.rs (86%)
 rename src/{core => }/types/sticker_set.rs (86%)
 rename src/{core => }/types/successful_payment.rs (91%)
 rename src/{core => }/types/update.rs (88%)
 rename src/{core => }/types/user.rs (100%)
 rename src/{core => }/types/user_profile_photos.rs (64%)
 rename src/{core => }/types/venue.rs (95%)
 rename src/{core => }/types/video.rs (94%)
 rename src/{core => }/types/video_note.rs (94%)
 rename src/{core => }/types/voice.rs (100%)
 rename src/{core => }/types/webhook_info.rs (100%)

diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index bb55f28a..5f048744 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -1,8 +1,8 @@
 use reqwest::r#async::Client;
 
-use crate::core::network::{download_file, download_file_stream};
-use crate::core::requests::get_file::GetFile;
-use crate::core::{
+use crate::network::{download_file, download_file_stream};
+use crate::requests::get_file::GetFile;
+use crate::{
     requests::{
         edit_message_live_location::EditMessageLiveLocation,
         forward_message::ForwardMessage, get_me::GetMe, send_audio::SendAudio,
@@ -58,10 +58,11 @@ impl Bot {
     /// ```no_run
     /// use async_telegram_bot::{
     ///     bot::Bot,
-    ///     core::{requests::Request, types::File as TgFile},
+    ///     requests::Request,
+    ///     types::File as TgFile,
     /// };
     /// use tokio::fs::File;
-    /// # use async_telegram_bot::core::requests::RequestError;
+    /// # use async_telegram_bot::requests::RequestError;
     ///
     /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
     /// let bot = Bot::new("TOKEN");
diff --git a/src/core/mod.rs b/src/core/mod.rs
deleted file mode 100644
index bf462606..00000000
--- a/src/core/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub(crate) mod network;
-pub mod requests;
-pub mod types;
diff --git a/src/lib.rs b/src/lib.rs
index b916367d..a81abb4d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,8 +3,11 @@ extern crate derive_more;
 #[macro_use]
 extern crate serde;
 
+mod network;
+
 pub mod bot;
-pub mod core;
 pub mod errors;
+pub mod requests;
+pub mod types;
 
 pub use errors::DownloadError;
diff --git a/src/core/network/mod.rs b/src/network/mod.rs
similarity index 99%
rename from src/core/network/mod.rs
rename to src/network/mod.rs
index 47d9f245..d45333d2 100644
--- a/src/core/network/mod.rs
+++ b/src/network/mod.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     requests::{RequestError, ResponseResult},
     types::ResponseParameters,
 };
diff --git a/src/core/requests/answer_pre_checkout_query.rs b/src/requests/answer_pre_checkout_query.rs
similarity index 99%
rename from src/core/requests/answer_pre_checkout_query.rs
rename to src/requests/answer_pre_checkout_query.rs
index f494ead8..03a26263 100644
--- a/src/core/requests/answer_pre_checkout_query.rs
+++ b/src/requests/answer_pre_checkout_query.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::{Request, RequestContext, RequestFuture, ResponseResult},
 };
diff --git a/src/core/requests/answer_shipping_query.rs b/src/requests/answer_shipping_query.rs
similarity index 96%
rename from src/core/requests/answer_shipping_query.rs
rename to src/requests/answer_shipping_query.rs
index c66860c9..b0c26841 100644
--- a/src/core/requests/answer_shipping_query.rs
+++ b/src/requests/answer_shipping_query.rs
@@ -1,8 +1,8 @@
-use crate::core::network;
-use crate::core::requests::{
+use crate::network;
+use crate::requests::{
     Request, RequestContext, RequestFuture, ResponseResult,
 };
-use crate::core::types::ShippingOption;
+use crate::types::ShippingOption;
 
 #[derive(Debug, Clone, Serialize)]
 /// If you sent an invoice requesting a shipping address and the parameter
diff --git a/src/core/requests/edit_message_live_location.rs b/src/requests/edit_message_live_location.rs
similarity index 96%
rename from src/core/requests/edit_message_live_location.rs
rename to src/requests/edit_message_live_location.rs
index 3d1171d8..8f43c504 100644
--- a/src/core/requests/edit_message_live_location.rs
+++ b/src/requests/edit_message_live_location.rs
@@ -1,8 +1,8 @@
-use crate::core::network;
-use crate::core::requests::{
+use crate::network;
+use crate::requests::{
     ChatId, Request, RequestContext, RequestFuture, ResponseResult,
 };
-use crate::core::types::{Message, ReplyMarkup};
+use crate::types::{Message, ReplyMarkup};
 use serde::Serialize;
 
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/core/requests/form_builder.rs b/src/requests/form_builder.rs
similarity index 99%
rename from src/core/requests/form_builder.rs
rename to src/requests/form_builder.rs
index d9bd8b69..36ffe440 100644
--- a/src/core/requests/form_builder.rs
+++ b/src/requests/form_builder.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use crate::core::{
+use crate::{
     requests::{utils, ChatId},
     types::{InputMedia, ParseMode},
 };
diff --git a/src/core/requests/forward_message.rs b/src/requests/forward_message.rs
similarity index 99%
rename from src/core/requests/forward_message.rs
rename to src/requests/forward_message.rs
index ec24a7e3..c7091738 100644
--- a/src/core/requests/forward_message.rs
+++ b/src/requests/forward_message.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::{
         ChatId, Request, RequestContext, RequestFuture, ResponseResult,
diff --git a/src/core/requests/get_chat.rs b/src/requests/get_chat.rs
similarity index 87%
rename from src/core/requests/get_chat.rs
rename to src/requests/get_chat.rs
index eecf2711..60651b6f 100644
--- a/src/core/requests/get_chat.rs
+++ b/src/requests/get_chat.rs
@@ -1,6 +1,6 @@
-use crate::core::requests::{ChatId, RequestContext, RequestFuture, ResponseResult, Request};
-use crate::core::types::Chat;
-use crate::core::network;
+use crate::requests::{ChatId, RequestContext, RequestFuture, ResponseResult, Request};
+use crate::types::Chat;
+use crate::network;
 
 /// Use this method to get up to date information about the chat 
 /// (current name of the user for one-on-one conversations, 
diff --git a/src/core/requests/get_file.rs b/src/requests/get_file.rs
similarity index 94%
rename from src/core/requests/get_file.rs
rename to src/requests/get_file.rs
index 9ab0788d..79995532 100644
--- a/src/core/requests/get_file.rs
+++ b/src/requests/get_file.rs
@@ -1,8 +1,8 @@
-use crate::core::network;
-use crate::core::requests::{
+use crate::network;
+use crate::requests::{
     Request, RequestContext, RequestFuture, ResponseResult,
 };
-use crate::core::types::File;
+use crate::types::File;
 
 /// Use this method to get basic info about a file and prepare it for
 /// downloading. For the moment, bots can download files of up to 20MB in size.
diff --git a/src/core/requests/get_me.rs b/src/requests/get_me.rs
similarity index 97%
rename from src/core/requests/get_me.rs
rename to src/requests/get_me.rs
index 343b36e4..c933db9e 100644
--- a/src/core/requests/get_me.rs
+++ b/src/requests/get_me.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::{Request, RequestContext, RequestFuture, ResponseResult},
     types::User,
diff --git a/src/core/requests/get_user_profile_photos.rs b/src/requests/get_user_profile_photos.rs
similarity index 93%
rename from src/core/requests/get_user_profile_photos.rs
rename to src/requests/get_user_profile_photos.rs
index 0c6311ec..7123151b 100644
--- a/src/core/requests/get_user_profile_photos.rs
+++ b/src/requests/get_user_profile_photos.rs
@@ -1,4 +1,4 @@
-use crate::core::requests::RequestContext;
+use crate::requests::RequestContext;
 
 //TODO: complete implementation after user_profile_fotos will be added to
 // types/mod.rs
diff --git a/src/core/requests/kick_chat_member.rs b/src/requests/kick_chat_member.rs
similarity index 92%
rename from src/core/requests/kick_chat_member.rs
rename to src/requests/kick_chat_member.rs
index 41d6dbc5..b33616ce 100644
--- a/src/core/requests/kick_chat_member.rs
+++ b/src/requests/kick_chat_member.rs
@@ -1,4 +1,4 @@
-use crate::core::requests::RequestContext;
+use crate::requests::RequestContext;
 //TODO:: need implementation
 /// Use this method to kick a user from a group, a supergroup or a channel. In
 /// the case of supergroups and channels, the user will not be able to return to
diff --git a/src/core/requests/mod.rs b/src/requests/mod.rs
similarity index 100%
rename from src/core/requests/mod.rs
rename to src/requests/mod.rs
diff --git a/src/core/requests/restrict_chat_member.rs b/src/requests/restrict_chat_member.rs
similarity index 78%
rename from src/core/requests/restrict_chat_member.rs
rename to src/requests/restrict_chat_member.rs
index 161f45ab..6957922b 100644
--- a/src/core/requests/restrict_chat_member.rs
+++ b/src/requests/restrict_chat_member.rs
@@ -1,4 +1,4 @@
-use crate::core::requests::RequestContext;
+use crate::requests::RequestContext;
 //TODO:: need implementation
 
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/core/requests/send_audio.rs b/src/requests/send_audio.rs
similarity index 97%
rename from src/core/requests/send_audio.rs
rename to src/requests/send_audio.rs
index 7580b7ce..77bc7da1 100644
--- a/src/core/requests/send_audio.rs
+++ b/src/requests/send_audio.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::form_builder::FormBuilder,
     requests::{
@@ -32,10 +32,10 @@ pub struct SendAudio<'a> {
     /// if you want Telegram apps to show [bold, italic, fixed-width text
     /// or inline URLs] in the media caption.
     ///
-    /// [Markdown]: crate::core::types::ParseMode::Markdown
-    /// [Html]: crate::core::types::ParseMode::Html
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [Html]: crate::types::ParseMode::Html
     /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::core::types::ParseMode
+    /// crate::types::ParseMode
     pub parse_mode: Option<ParseMode>,
     /// Duration of the audio in seconds
     pub duration: Option<i32>,
diff --git a/src/core/requests/send_chat_action.rs b/src/requests/send_chat_action.rs
similarity index 97%
rename from src/core/requests/send_chat_action.rs
rename to src/requests/send_chat_action.rs
index 9b9bf940..67abc758 100644
--- a/src/core/requests/send_chat_action.rs
+++ b/src/requests/send_chat_action.rs
@@ -1,5 +1,5 @@
-use crate::core::network;
-use crate::core::requests::{
+use crate::network;
+use crate::requests::{
     ChatId, Request, RequestContext, RequestFuture, ResponseResult,
 };
 
diff --git a/src/core/requests/send_contact.rs b/src/requests/send_contact.rs
similarity index 97%
rename from src/core/requests/send_contact.rs
rename to src/requests/send_contact.rs
index a064dd21..4631b00b 100644
--- a/src/core/requests/send_contact.rs
+++ b/src/requests/send_contact.rs
@@ -1,8 +1,8 @@
-use crate::core::network;
-use crate::core::requests::{
+use crate::network;
+use crate::requests::{
     ChatId, Request, RequestContext, RequestFuture, ResponseResult,
 };
-use crate::core::types::{Message, ReplyMarkup};
+use crate::types::{Message, ReplyMarkup};
 
 /// Use this method to send phone contacts.
 /// returned.
diff --git a/src/core/requests/send_location.rs b/src/requests/send_location.rs
similarity index 99%
rename from src/core/requests/send_location.rs
rename to src/requests/send_location.rs
index 9dd8af1b..0596a32f 100644
--- a/src/core/requests/send_location.rs
+++ b/src/requests/send_location.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::{
         ChatId, Request, RequestContext, RequestFuture, ResponseResult,
diff --git a/src/core/requests/send_media_group.rs b/src/requests/send_media_group.rs
similarity index 99%
rename from src/core/requests/send_media_group.rs
rename to src/requests/send_media_group.rs
index d95d4234..360dfc84 100644
--- a/src/core/requests/send_media_group.rs
+++ b/src/requests/send_media_group.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network::request_multipart,
     requests::{
         form_builder::FormBuilder, ChatId, Request, RequestContext,
diff --git a/src/core/requests/send_message.rs b/src/requests/send_message.rs
similarity index 95%
rename from src/core/requests/send_message.rs
rename to src/requests/send_message.rs
index 2539c04d..f4f04636 100644
--- a/src/core/requests/send_message.rs
+++ b/src/requests/send_message.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::{
         ChatId, Request, RequestContext, RequestFuture, ResponseResult,
@@ -23,10 +23,10 @@ pub struct SendMessage<'a> {
     /// if you want Telegram apps to show [bold, italic, fixed-width text
     /// or inline URLs] in the media caption.
     ///
-    /// [Markdown]: crate::core::types::ParseMode::Markdown
-    /// [Html]: crate::core::types::ParseMode::Html
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [Html]: crate::types::ParseMode::Html
     /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::core::types::ParseMode
+    /// crate::types::ParseMode
     #[serde(skip_serializing_if = "Option::is_none")]
     pub parse_mode: Option<ParseMode>,
     /// Disables link previews for links in this message
diff --git a/src/core/requests/send_photo.rs b/src/requests/send_photo.rs
similarity index 96%
rename from src/core/requests/send_photo.rs
rename to src/requests/send_photo.rs
index 69f1e5d7..b4e09152 100644
--- a/src/core/requests/send_photo.rs
+++ b/src/requests/send_photo.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::{
         form_builder::FormBuilder, ChatId, Request, RequestContext,
@@ -30,10 +30,10 @@ pub struct SendPhoto<'a> {
     /// if you want Telegram apps to show [bold, italic, fixed-width text
     /// or inline URLs] in the media caption.
     ///
-    /// [Markdown]: crate::core::types::ParseMode::Markdown
-    /// [Html]: crate::core::types::ParseMode::Html
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [Html]: crate::types::ParseMode::Html
     /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::core::types::ParseMode
+    /// crate::types::ParseMode
     pub parse_mode: Option<ParseMode>,
     /// Sends the message silently. Users will receive a notification with no
     /// sound.
diff --git a/src/core/requests/send_poll.rs b/src/requests/send_poll.rs
similarity index 96%
rename from src/core/requests/send_poll.rs
rename to src/requests/send_poll.rs
index 92a11901..b20e527b 100644
--- a/src/core/requests/send_poll.rs
+++ b/src/requests/send_poll.rs
@@ -1,8 +1,8 @@
-use crate::core::network;
-use crate::core::requests::{
+use crate::network;
+use crate::requests::{
     ChatId, Request, RequestContext, RequestFuture, ResponseResult,
 };
-use crate::core::types::{Message, ReplyMarkup};
+use crate::types::{Message, ReplyMarkup};
 
 /// Use this method to send a native poll. A native poll can't be sent to a
 /// private chat. On success, the sent Message is returned.
diff --git a/src/core/requests/send_venue.rs b/src/requests/send_venue.rs
similarity index 97%
rename from src/core/requests/send_venue.rs
rename to src/requests/send_venue.rs
index cdb5fb90..14bfe1e6 100644
--- a/src/core/requests/send_venue.rs
+++ b/src/requests/send_venue.rs
@@ -1,8 +1,8 @@
-use crate::core::network;
-use crate::core::requests::{
+use crate::network;
+use crate::requests::{
     ChatId, Request, RequestContext, RequestFuture, ResponseResult,
 };
-use crate::core::types::{Message, ReplyMarkup};
+use crate::types::{Message, ReplyMarkup};
 
 /// Use this method to send information about a venue.
 /// Message is returned.
diff --git a/src/core/requests/stop_message_live_location.rs b/src/requests/stop_message_live_location.rs
similarity index 99%
rename from src/core/requests/stop_message_live_location.rs
rename to src/requests/stop_message_live_location.rs
index 5fb62a54..809200d7 100644
--- a/src/core/requests/stop_message_live_location.rs
+++ b/src/requests/stop_message_live_location.rs
@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
     network,
     requests::{
         ChatId, Request, RequestContext, RequestFuture, ResponseResult,
diff --git a/src/core/requests/unban_chat_member.rs b/src/requests/unban_chat_member.rs
similarity index 78%
rename from src/core/requests/unban_chat_member.rs
rename to src/requests/unban_chat_member.rs
index 8f833b9b..d7a9b436 100644
--- a/src/core/requests/unban_chat_member.rs
+++ b/src/requests/unban_chat_member.rs
@@ -1,4 +1,4 @@
-use crate::core::requests::RequestContext;
+use crate::requests::RequestContext;
 //TODO:: need implementation
 
 #[derive(Debug, Clone, Serialize)]
diff --git a/src/core/requests/utils.rs b/src/requests/utils.rs
similarity index 100%
rename from src/core/requests/utils.rs
rename to src/requests/utils.rs
diff --git a/src/core/types/animation.rs b/src/types/animation.rs
similarity index 98%
rename from src/core/types/animation.rs
rename to src/types/animation.rs
index 5d2ceff1..ec3b92f9 100644
--- a/src/core/types/animation.rs
+++ b/src/types/animation.rs
@@ -1,4 +1,4 @@
-use crate::core::types::PhotoSize;
+use crate::types::PhotoSize;
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 /// This object represents an animation file (GIF or H.264/MPEG-4 AVC video
diff --git a/src/core/types/audio.rs b/src/types/audio.rs
similarity index 93%
rename from src/core/types/audio.rs
rename to src/types/audio.rs
index 66cc0878..fa17e27d 100644
--- a/src/core/types/audio.rs
+++ b/src/types/audio.rs
@@ -1,4 +1,4 @@
-use crate::core::types::PhotoSize;
+use crate::types::PhotoSize;
 
 #[derive(Debug, Deserialize, Eq, Hash, PartialEq, Clone)]
 pub struct Audio {
@@ -42,8 +42,8 @@ mod tests {
                 file_id: "id".to_string(),
                 width: 320,
                 height: 320,
-                file_size: Some(3452)
-            })
+                file_size: Some(3452),
+            }),
         };
         let actual = serde_json::from_str::<Audio>(&json).unwrap();
         assert_eq!(actual, expected)
diff --git a/src/core/types/callback_game.rs b/src/types/callback_game.rs
similarity index 100%
rename from src/core/types/callback_game.rs
rename to src/types/callback_game.rs
diff --git a/src/core/types/callback_query.rs b/src/types/callback_query.rs
similarity index 88%
rename from src/core/types/callback_query.rs
rename to src/types/callback_query.rs
index 3207bf02..3048ebfa 100644
--- a/src/core/types/callback_query.rs
+++ b/src/types/callback_query.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{Message, User};
+use crate::types::{Message, User};
 
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 pub struct CallbackQuery {
@@ -8,7 +8,7 @@ pub struct CallbackQuery {
     pub message: Option<Message>,
     pub inline_message_id: Option<String>,
     pub data: Option<String>,
-    pub game_short_name: Option<String>
+    pub game_short_name: Option<String>,
 }
 
 #[cfg(test)]
@@ -37,13 +37,13 @@ mod tests {
                 first_name: "firstName".to_string(),
                 last_name: None,
                 username: None,
-                language_code: None
+                language_code: None,
             },
             chat_instance: "123456".to_string(),
             message: None,
             inline_message_id: Some("i_m_id".to_string()),
             data: Some("some_data".to_string()),
-            game_short_name: Some("game_name".to_string())
+            game_short_name: Some("game_name".to_string()),
         };
         let actual = serde_json::from_str::<CallbackQuery>(json).unwrap();
         assert_eq!(actual, expected);
diff --git a/src/core/types/chat.rs b/src/types/chat.rs
similarity index 97%
rename from src/core/types/chat.rs
rename to src/types/chat.rs
index 34469b48..4f9573a9 100644
--- a/src/core/types/chat.rs
+++ b/src/types/chat.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{ChatPermissions, ChatPhoto, Message};
+use crate::types::{ChatPermissions, ChatPhoto, Message};
 
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 pub struct Chat {
@@ -80,7 +80,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use crate::core::types::*;
+    use crate::types::*;
     use serde_json::from_str;
 
     #[test]
diff --git a/src/core/types/chat_member.rs b/src/types/chat_member.rs
similarity index 97%
rename from src/core/types/chat_member.rs
rename to src/types/chat_member.rs
index cee60bc6..b386963e 100644
--- a/src/core/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -1,4 +1,4 @@
-use crate::core::types::User;
+use crate::types::User;
 
 /// This object contains information about one member of the chat.
 #[derive(Debug, Deserialize, Hash, PartialEq, Eq, Clone)]
@@ -63,7 +63,7 @@ pub enum ChatMemberStatus {
     Member,
     Restricted,
     Left,
-    Kicked
+    Kicked,
 }
 
 #[cfg(test)]
@@ -103,7 +103,7 @@ mod tests {
                 first_name: "firstName".to_string(),
                 last_name: None,
                 username: None,
-                language_code: None
+                language_code: None,
             },
             status: ChatMemberStatus::Creator,
             until_date: Some(123456),
@@ -119,9 +119,9 @@ mod tests {
             can_send_messages: Some(true),
             can_send_media_messages: Some(true),
             can_send_other_messages: Some(true),
-            can_add_web_page_previews: Some(true)
+            can_add_web_page_previews: Some(true),
         };
         let actual = serde_json::from_str::<ChatMember>(&json).unwrap();
         assert_eq!(actual, expected)
     }
-}
\ No newline at end of file
+}
diff --git a/src/core/types/chat_permissions.rs b/src/types/chat_permissions.rs
similarity index 100%
rename from src/core/types/chat_permissions.rs
rename to src/types/chat_permissions.rs
diff --git a/src/core/types/chat_photo.rs b/src/types/chat_photo.rs
similarity index 100%
rename from src/core/types/chat_photo.rs
rename to src/types/chat_photo.rs
diff --git a/src/core/types/chosen_inline_result.rs b/src/types/chosen_inline_result.rs
similarity index 95%
rename from src/core/types/chosen_inline_result.rs
rename to src/types/chosen_inline_result.rs
index 800c0a44..7ba9a0d1 100644
--- a/src/core/types/chosen_inline_result.rs
+++ b/src/types/chosen_inline_result.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{Location, User};
+use crate::types::{Location, User};
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 /// Represents a result of an inline query that was chosen by the user and
diff --git a/src/core/types/contact.rs b/src/types/contact.rs
similarity index 100%
rename from src/core/types/contact.rs
rename to src/types/contact.rs
diff --git a/src/core/types/document.rs b/src/types/document.rs
similarity index 87%
rename from src/core/types/document.rs
rename to src/types/document.rs
index 9c3e805b..12553463 100644
--- a/src/core/types/document.rs
+++ b/src/types/document.rs
@@ -1,4 +1,4 @@
-use crate::core::types::PhotoSize;
+use crate::types::PhotoSize;
 
 #[derive(Debug, Deserialize, Eq, Hash, PartialEq, Clone, Serialize)]
 pub struct Document {
diff --git a/src/core/types/file.rs b/src/types/file.rs
similarity index 100%
rename from src/core/types/file.rs
rename to src/types/file.rs
diff --git a/src/core/types/force_reply.rs b/src/types/force_reply.rs
similarity index 100%
rename from src/core/types/force_reply.rs
rename to src/types/force_reply.rs
diff --git a/src/core/types/game.rs b/src/types/game.rs
similarity index 94%
rename from src/core/types/game.rs
rename to src/types/game.rs
index 6fc488ac..0e1968bb 100644
--- a/src/core/types/game.rs
+++ b/src/types/game.rs
@@ -1,6 +1,6 @@
 use serde::Deserialize;
 
-use crate::core::types::{Animation, MessageEntity, PhotoSize};
+use crate::types::{Animation, MessageEntity, PhotoSize};
 
 #[derive(Debug, Deserialize, Clone, PartialEq, Eq, Hash)]
 /// This object represents a game. Use BotFather to create and edit games, their
diff --git a/src/core/types/game_high_score.rs b/src/types/game_high_score.rs
similarity index 89%
rename from src/core/types/game_high_score.rs
rename to src/types/game_high_score.rs
index 34767284..f417a085 100644
--- a/src/core/types/game_high_score.rs
+++ b/src/types/game_high_score.rs
@@ -1,6 +1,6 @@
 use serde::Deserialize;
 
-use crate::core::types::user::User;
+use crate::types::user::User;
 
 #[derive(Debug, Deserialize, Clone)]
 /// This object represents one row of the high scores table for a game.
@@ -11,4 +11,4 @@ pub struct GameHighScore {
     pub user: User,
     /// Score
     pub score: u32,
-}
\ No newline at end of file
+}
diff --git a/src/core/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
similarity index 98%
rename from src/core/types/inline_keyboard_button.rs
rename to src/types/inline_keyboard_button.rs
index 228f83f7..5d5b2ee7 100644
--- a/src/core/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -45,7 +45,7 @@ pub enum InlineKeyboardButtonKind {
 ///
 /// Example:
 /// ```edition2018
-/// use async_telegram_bot::core::types::InlineKeyboardButton;
+/// use async_telegram_bot::types::InlineKeyboardButton;
 ///
 /// fn main() {
 ///     let url_button = InlineKeyboardButton::url(
diff --git a/src/core/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
similarity index 97%
rename from src/core/types/inline_keyboard_markup.rs
rename to src/types/inline_keyboard_markup.rs
index 9e02ed2e..89eb625e 100644
--- a/src/core/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -1,4 +1,4 @@
-use crate::core::types::InlineKeyboardButton;
+use crate::types::InlineKeyboardButton;
 
 /// This object represents an inline keyboard that appears right next to the
 /// message it belongs to.
@@ -16,7 +16,7 @@ pub struct InlineKeyboardMarkup {
 ///
 /// Example:
 /// ```
-/// use async_telegram_bot::core::types::{
+/// use async_telegram_bot::types::{
 ///     InlineKeyboardButton, InlineKeyboardMarkup,
 /// };
 ///
diff --git a/src/core/types/inline_query.rs b/src/types/inline_query.rs
similarity index 91%
rename from src/core/types/inline_query.rs
rename to src/types/inline_query.rs
index c3e99ae7..6c145dc0 100644
--- a/src/core/types/inline_query.rs
+++ b/src/types/inline_query.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{Location, User};
+use crate::types::{Location, User};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQuery {
diff --git a/src/core/types/inline_query_result.rs b/src/types/inline_query_result.rs
similarity index 95%
rename from src/core/types/inline_query_result.rs
rename to src/types/inline_query_result.rs
index f2151a06..f4644b79 100644
--- a/src/core/types/inline_query_result.rs
+++ b/src/types/inline_query_result.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{
+use crate::types::{
     InlineQueryResultArticle, InlineQueryResultAudio,
     InlineQueryResultCachedAudio, InlineQueryResultCachedDocument,
     InlineQueryResultCachedGif, InlineQueryResultCachedMpeg4Gif,
@@ -49,9 +49,9 @@ pub enum InlineQueryResult {
 
 #[cfg(test)]
 mod tests {
-    use crate::core::types::inline_keyboard_markup::InlineKeyboardMarkup;
-    use crate::core::types::parse_mode::ParseMode;
-    use crate::core::types::{
+    use crate::types::inline_keyboard_markup::InlineKeyboardMarkup;
+    use crate::types::parse_mode::ParseMode;
+    use crate::types::{
         InlineQueryResult, InlineQueryResultCachedAudio, InputMessageContent,
     };
 
diff --git a/src/core/types/inline_query_result_article.rs b/src/types/inline_query_result_article.rs
similarity index 94%
rename from src/core/types/inline_query_result_article.rs
rename to src/types/inline_query_result_article.rs
index 1edda355..ac463446 100644
--- a/src/core/types/inline_query_result_article.rs
+++ b/src/types/inline_query_result_article.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{InlineKeyboardMarkup, InputMessageContent};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultArticle {
diff --git a/src/core/types/inline_query_result_audio.rs b/src/types/inline_query_result_audio.rs
similarity index 89%
rename from src/core/types/inline_query_result_audio.rs
rename to src/types/inline_query_result_audio.rs
index 867cb237..cc88d645 100644
--- a/src/core/types/inline_query_result_audio.rs
+++ b/src/types/inline_query_result_audio.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultAudio {
diff --git a/src/core/types/inline_query_result_cached_audio.rs b/src/types/inline_query_result_cached_audio.rs
similarity index 86%
rename from src/core/types/inline_query_result_cached_audio.rs
rename to src/types/inline_query_result_cached_audio.rs
index 89b7944e..cb34eb23 100644
--- a/src/core/types/inline_query_result_cached_audio.rs
+++ b/src/types/inline_query_result_cached_audio.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedAudio {
diff --git a/src/core/types/inline_query_result_cached_document.rs b/src/types/inline_query_result_cached_document.rs
similarity index 88%
rename from src/core/types/inline_query_result_cached_document.rs
rename to src/types/inline_query_result_cached_document.rs
index f79487bc..7be70ceb 100644
--- a/src/core/types/inline_query_result_cached_document.rs
+++ b/src/types/inline_query_result_cached_document.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedDocument {
diff --git a/src/core/types/inline_query_result_cached_gif.rs b/src/types/inline_query_result_cached_gif.rs
similarity index 87%
rename from src/core/types/inline_query_result_cached_gif.rs
rename to src/types/inline_query_result_cached_gif.rs
index c81170c4..06fd162d 100644
--- a/src/core/types/inline_query_result_cached_gif.rs
+++ b/src/types/inline_query_result_cached_gif.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedGif {
diff --git a/src/core/types/inline_query_result_cached_mpeg4_gif.rs b/src/types/inline_query_result_cached_mpeg4_gif.rs
similarity index 87%
rename from src/core/types/inline_query_result_cached_mpeg4_gif.rs
rename to src/types/inline_query_result_cached_mpeg4_gif.rs
index cbc46c75..2599ee28 100644
--- a/src/core/types/inline_query_result_cached_mpeg4_gif.rs
+++ b/src/types/inline_query_result_cached_mpeg4_gif.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedMpeg4Gif {
diff --git a/src/core/types/inline_query_result_cached_photo.rs b/src/types/inline_query_result_cached_photo.rs
similarity index 89%
rename from src/core/types/inline_query_result_cached_photo.rs
rename to src/types/inline_query_result_cached_photo.rs
index d5317a17..97d7ec23 100644
--- a/src/core/types/inline_query_result_cached_photo.rs
+++ b/src/types/inline_query_result_cached_photo.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedPhoto {
diff --git a/src/core/types/inline_query_result_cached_sticker.rs b/src/types/inline_query_result_cached_sticker.rs
similarity index 84%
rename from src/core/types/inline_query_result_cached_sticker.rs
rename to src/types/inline_query_result_cached_sticker.rs
index 703ea199..7c7f0c89 100644
--- a/src/core/types/inline_query_result_cached_sticker.rs
+++ b/src/types/inline_query_result_cached_sticker.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{InlineKeyboardMarkup, InputMessageContent};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedSticker {
diff --git a/src/core/types/inline_query_result_cached_video.rs b/src/types/inline_query_result_cached_video.rs
similarity index 88%
rename from src/core/types/inline_query_result_cached_video.rs
rename to src/types/inline_query_result_cached_video.rs
index 216ffe8a..ca2e1c1d 100644
--- a/src/core/types/inline_query_result_cached_video.rs
+++ b/src/types/inline_query_result_cached_video.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedVideo {
diff --git a/src/core/types/inline_query_result_cached_voice.rs b/src/types/inline_query_result_cached_voice.rs
similarity index 86%
rename from src/core/types/inline_query_result_cached_voice.rs
rename to src/types/inline_query_result_cached_voice.rs
index e15b75bc..e0b58b37 100644
--- a/src/core/types/inline_query_result_cached_voice.rs
+++ b/src/types/inline_query_result_cached_voice.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedVoice {
diff --git a/src/core/types/inline_query_result_contact.rs b/src/types/inline_query_result_contact.rs
similarity index 92%
rename from src/core/types/inline_query_result_contact.rs
rename to src/types/inline_query_result_contact.rs
index 4f9c704d..1b239069 100644
--- a/src/core/types/inline_query_result_contact.rs
+++ b/src/types/inline_query_result_contact.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{InlineKeyboardMarkup, InputMessageContent};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultContact {
diff --git a/src/core/types/inline_query_result_document.rs b/src/types/inline_query_result_document.rs
similarity index 91%
rename from src/core/types/inline_query_result_document.rs
rename to src/types/inline_query_result_document.rs
index d65a735d..38e365de 100644
--- a/src/core/types/inline_query_result_document.rs
+++ b/src/types/inline_query_result_document.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultDocument {
diff --git a/src/core/types/inline_query_result_game.rs b/src/types/inline_query_result_game.rs
similarity index 84%
rename from src/core/types/inline_query_result_game.rs
rename to src/types/inline_query_result_game.rs
index 9a01d158..899ceaaa 100644
--- a/src/core/types/inline_query_result_game.rs
+++ b/src/types/inline_query_result_game.rs
@@ -1,4 +1,4 @@
-use crate::core::types::InlineKeyboardMarkup;
+use crate::types::InlineKeyboardMarkup;
 
 #[derive(Debug, Serialize, Hash, PartialEq, Eq, Clone)]
 pub struct InlineQueryResultGame {
diff --git a/src/core/types/inline_query_result_gif.rs b/src/types/inline_query_result_gif.rs
similarity index 91%
rename from src/core/types/inline_query_result_gif.rs
rename to src/types/inline_query_result_gif.rs
index 7131d35a..3c3f35dd 100644
--- a/src/core/types/inline_query_result_gif.rs
+++ b/src/types/inline_query_result_gif.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultGif {
diff --git a/src/core/types/inline_query_result_location.rs b/src/types/inline_query_result_location.rs
similarity index 91%
rename from src/core/types/inline_query_result_location.rs
rename to src/types/inline_query_result_location.rs
index 846a3f04..108d684d 100644
--- a/src/core/types/inline_query_result_location.rs
+++ b/src/types/inline_query_result_location.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{InlineKeyboardMarkup, InputMessageContent};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultLocation {
diff --git a/src/core/types/inline_query_result_mpeg4_gif.rs b/src/types/inline_query_result_mpeg4_gif.rs
similarity index 91%
rename from src/core/types/inline_query_result_mpeg4_gif.rs
rename to src/types/inline_query_result_mpeg4_gif.rs
index b690746f..60ecc9cd 100644
--- a/src/core/types/inline_query_result_mpeg4_gif.rs
+++ b/src/types/inline_query_result_mpeg4_gif.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultMpeg4Gif {
diff --git a/src/core/types/inline_query_result_photo.rs b/src/types/inline_query_result_photo.rs
similarity index 92%
rename from src/core/types/inline_query_result_photo.rs
rename to src/types/inline_query_result_photo.rs
index c752ae8a..ff9cf416 100644
--- a/src/core/types/inline_query_result_photo.rs
+++ b/src/types/inline_query_result_photo.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 /// Represents a link to a photo. By default, this photo will be sent by the
 /// user with optional caption. Alternatively, you can use input_message_content
diff --git a/src/core/types/inline_query_result_venue.rs b/src/types/inline_query_result_venue.rs
similarity index 92%
rename from src/core/types/inline_query_result_venue.rs
rename to src/types/inline_query_result_venue.rs
index e018a55c..72d5a5af 100644
--- a/src/core/types/inline_query_result_venue.rs
+++ b/src/types/inline_query_result_venue.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{InlineKeyboardMarkup, InputMessageContent};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVenue {
diff --git a/src/core/types/inline_query_result_video.rs b/src/types/inline_query_result_video.rs
similarity index 91%
rename from src/core/types/inline_query_result_video.rs
rename to src/types/inline_query_result_video.rs
index bc8660db..693c1651 100644
--- a/src/core/types/inline_query_result_video.rs
+++ b/src/types/inline_query_result_video.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVideo {
diff --git a/src/core/types/inline_query_result_voice.rs b/src/types/inline_query_result_voice.rs
similarity index 88%
rename from src/core/types/inline_query_result_voice.rs
rename to src/types/inline_query_result_voice.rs
index b4493fc1..e5365f4f 100644
--- a/src/core/types/inline_query_result_voice.rs
+++ b/src/types/inline_query_result_voice.rs
@@ -1,6 +1,4 @@
-use crate::core::types::{
-    InlineKeyboardMarkup, InputMessageContent, ParseMode,
-};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVoice {
diff --git a/src/core/types/input_file.rs b/src/types/input_file.rs
similarity index 100%
rename from src/core/types/input_file.rs
rename to src/types/input_file.rs
diff --git a/src/core/types/input_media.rs b/src/types/input_media.rs
similarity index 89%
rename from src/core/types/input_media.rs
rename to src/types/input_media.rs
index 02239d69..5ba0ce46 100644
--- a/src/core/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{InputFile, ParseMode};
+use crate::types::{InputFile, ParseMode};
 
 // TODO: should variants use new-type?
 #[derive(Debug, Serialize, PartialEq, Eq, Clone)]
@@ -18,10 +18,10 @@ pub enum InputMedia {
         /// if you want Telegram apps to show [bold, italic, fixed-width text
         /// or inline URLs] in the media caption.
         ///
-        /// [Markdown]: crate::core::types::ParseMode::Markdown
-        /// [Html]: crate::core::types::ParseMode::Html
+        /// [Markdown]: crate::types::ParseMode::Markdown
+        /// [Html]: crate::types::ParseMode::Html
         /// [bold, italic, fixed-width text or inline URLs]:
-        /// crate::core::types::ParseMode
+        /// crate::types::ParseMode
         #[serde(skip_serializing_if = "Option::is_none")]
         parse_mode: Option<ParseMode>,
     },
@@ -35,7 +35,7 @@ pub enum InputMedia {
         /// size. A thumbnail‘s width and height should not exceed 320.
         /// Ignored if the file is not uploaded using [InputFile::File].
         ///
-        /// [InputFile::File]: crate::core::types::InputFile::File
+        /// [InputFile::File]: crate::types::InputFile::File
         thumb: Option<InputFile>,
         /// Caption of the video to be sent, 0-1024 characters.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -44,10 +44,10 @@ pub enum InputMedia {
         /// if you want Telegram apps to show [bold, italic, fixed-width text
         /// or inline URLs] in the media caption.
         ///
-        /// [Markdown]: crate::core::types::ParseMode::Markdown
-        /// [Html]: crate::core::types::ParseMode::Html
+        /// [Markdown]: crate::types::ParseMode::Markdown
+        /// [Html]: crate::types::ParseMode::Html
         /// [bold, italic, fixed-width text or inline URLs]:
-        /// crate::core::types::ParseMode
+        /// crate::types::ParseMode
         #[serde(skip_serializing_if = "Option::is_none")]
         parse_mode: Option<ParseMode>,
         /// Video width
@@ -74,7 +74,7 @@ pub enum InputMedia {
         /// size. A thumbnail‘s width and height should not exceed 320.
         /// Ignored if the file is not uploaded using [InputFile::File].
         ///
-        /// [InputFile::File]: crate::core::types::InputFile::File
+        /// [InputFile::File]: crate::types::InputFile::File
         #[serde(skip_serializing_if = "Option::is_none")]
         thumb: Option<InputFile>,
         /// Caption of the animation to be sent, 0-1024 characters
@@ -84,10 +84,10 @@ pub enum InputMedia {
         /// if you want Telegram apps to show [bold, italic, fixed-width text
         /// or inline URLs] in the media caption.
         ///
-        /// [Markdown]: crate::core::types::ParseMode::Markdown
-        /// [Html]: crate::core::types::ParseMode::Html
+        /// [Markdown]: crate::types::ParseMode::Markdown
+        /// [Html]: crate::types::ParseMode::Html
         /// [bold, italic, fixed-width text or inline URLs]:
-        /// crate::core::types::ParseMode
+        /// crate::types::ParseMode
         #[serde(skip_serializing_if = "Option::is_none")]
         parse_mode: Option<ParseMode>,
         /// Animation width
@@ -110,7 +110,7 @@ pub enum InputMedia {
         /// size. A thumbnail‘s width and height should not exceed 320.
         /// Ignored if the file is not uploaded using [InputFile::File].
         ///
-        /// [InputFile::File]: crate::core::types::InputFile::File
+        /// [InputFile::File]: crate::types::InputFile::File
         #[serde(skip_serializing_if = "Option::is_none")]
         thumb: Option<InputFile>,
         /// Caption of the audio to be sent, 0-1024 characters
@@ -120,10 +120,10 @@ pub enum InputMedia {
         /// if you want Telegram apps to show [bold, italic, fixed-width text
         /// or inline URLs] in the media caption.
         ///
-        /// [Markdown]: crate::core::types::ParseMode::Markdown
-        /// [Html]: crate::core::types::ParseMode::Html
+        /// [Markdown]: crate::types::ParseMode::Markdown
+        /// [Html]: crate::types::ParseMode::Html
         /// [bold, italic, fixed-width text or inline URLs]:
-        /// crate::core::types::ParseMode
+        /// crate::types::ParseMode
         #[serde(skip_serializing_if = "Option::is_none")]
         parse_mode: Option<String>,
         /// Duration of the audio in seconds
@@ -146,7 +146,7 @@ pub enum InputMedia {
         /// size. A thumbnail‘s width and height should not exceed 320.
         /// Ignored if the file is not uploaded using [InputFile::File].
         ///
-        /// [InputFile::File]: crate::core::types::InputFile::File
+        /// [InputFile::File]: crate::types::InputFile::File
         #[serde(skip_serializing_if = "Option::is_none")]
         thumb: Option<InputFile>,
         /// Caption of the document to be sent, 0-1024 characters
@@ -156,10 +156,10 @@ pub enum InputMedia {
         /// if you want Telegram apps to show [bold, italic, fixed-width text
         /// or inline URLs] in the media caption.
         ///
-        /// [Markdown]: crate::core::types::ParseMode::Markdown
-        /// [Html]: crate::core::types::ParseMode::Html
+        /// [Markdown]: crate::types::ParseMode::Markdown
+        /// [Html]: crate::types::ParseMode::Html
         /// [bold, italic, fixed-width text or inline URLs]:
-        /// crate::core::types::ParseMode
+        /// crate::types::ParseMode
         #[serde(skip_serializing_if = "Option::is_none")]
         parse_mode: Option<ParseMode>,
     },
diff --git a/src/core/types/input_message_content.rs b/src/types/input_message_content.rs
similarity index 96%
rename from src/core/types/input_message_content.rs
rename to src/types/input_message_content.rs
index 2c60ac5a..60035735 100644
--- a/src/core/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -1,6 +1,6 @@
 use serde::Serialize;
 
-use crate::core::types::ParseMode;
+use crate::types::ParseMode;
 
 #[derive(Debug, Serialize, Clone, PartialEq)]
 #[serde(untagged)]
@@ -18,10 +18,10 @@ pub enum InputMessageContent {
         /// if you want Telegram apps to show [bold, italic, fixed-width text
         /// or inline URLs] in the media caption.
         ///
-        /// [Markdown]: crate::core::types::ParseMode::Markdown
-        /// [Html]: crate::core::types::ParseMode::Html
+        /// [Markdown]: crate::types::ParseMode::Markdown
+        /// [Html]: crate::types::ParseMode::Html
         /// [bold, italic, fixed-width text or inline URLs]:
-        /// crate::core::types::ParseMode
+        /// crate::types::ParseMode
         #[serde(skip_serializing_if = "Option::is_none")]
         parse_mode: Option<ParseMode>,
 
diff --git a/src/core/types/invoice.rs b/src/types/invoice.rs
similarity index 100%
rename from src/core/types/invoice.rs
rename to src/types/invoice.rs
diff --git a/src/core/types/keyboard_button.rs b/src/types/keyboard_button.rs
similarity index 100%
rename from src/core/types/keyboard_button.rs
rename to src/types/keyboard_button.rs
diff --git a/src/core/types/label_price.rs b/src/types/label_price.rs
similarity index 100%
rename from src/core/types/label_price.rs
rename to src/types/label_price.rs
diff --git a/src/core/types/location.rs b/src/types/location.rs
similarity index 100%
rename from src/core/types/location.rs
rename to src/types/location.rs
diff --git a/src/core/types/login_url.rs b/src/types/login_url.rs
similarity index 100%
rename from src/core/types/login_url.rs
rename to src/types/login_url.rs
diff --git a/src/core/types/mask_position.rs b/src/types/mask_position.rs
similarity index 100%
rename from src/core/types/mask_position.rs
rename to src/types/mask_position.rs
diff --git a/src/core/types/message.rs b/src/types/message.rs
similarity index 98%
rename from src/core/types/message.rs
rename to src/types/message.rs
index 8caf1fea..905d79d4 100644
--- a/src/core/types/message.rs
+++ b/src/types/message.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{
+use crate::types::{
     Animation, Audio, Chat, Contact, Document, Game, InlineKeyboardMarkup,
     Invoice, Location, MessageEntity, PassportData, PhotoSize, Poll, Sticker,
     SuccessfulPayment, User, Venue, Video, VideoNote, Voice,
@@ -17,9 +17,10 @@ pub struct Message {
 impl Message {
     fn text(&self) -> Option<&str> {
         if let MessageKind::Common {
-                media_kind: MediaKind::Text {
-                    ref text, ..
-                }, .. } = self.kind {
+            media_kind: MediaKind::Text { ref text, .. },
+            ..
+        } = self.kind
+        {
             Some(text)
         } else {
             None
@@ -202,7 +203,7 @@ pub enum MediaKind {
 
 #[cfg(test)]
 mod tests {
-    use crate::core::types::*;
+    use crate::types::*;
     use serde_json::from_str;
 
     #[test]
diff --git a/src/core/types/message_entity.rs b/src/types/message_entity.rs
similarity index 96%
rename from src/core/types/message_entity.rs
rename to src/types/message_entity.rs
index e10661ac..56921f09 100644
--- a/src/core/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -1,4 +1,4 @@
-use crate::core::types::User;
+use crate::types::User;
 
 #[derive(Debug, Deserialize, Eq, Hash, PartialEq, Clone, Serialize)]
 pub struct MessageEntity {
diff --git a/src/core/types/mod.rs b/src/types/mod.rs
similarity index 100%
rename from src/core/types/mod.rs
rename to src/types/mod.rs
diff --git a/src/core/types/not_implemented_types.rs b/src/types/not_implemented_types.rs
similarity index 100%
rename from src/core/types/not_implemented_types.rs
rename to src/types/not_implemented_types.rs
diff --git a/src/core/types/order_info.rs b/src/types/order_info.rs
similarity index 83%
rename from src/core/types/order_info.rs
rename to src/types/order_info.rs
index dfc78c6f..c0bba2a6 100644
--- a/src/core/types/order_info.rs
+++ b/src/types/order_info.rs
@@ -1,4 +1,4 @@
-use crate::core::types::ShippingAddress;
+use crate::types::ShippingAddress;
 
 #[derive(Debug, Deserialize, Hash, PartialEq, Eq, Clone, Serialize)]
 pub struct OrderInfo {
diff --git a/src/core/types/parse_mode.rs b/src/types/parse_mode.rs
similarity index 100%
rename from src/core/types/parse_mode.rs
rename to src/types/parse_mode.rs
diff --git a/src/core/types/photo_size.rs b/src/types/photo_size.rs
similarity index 100%
rename from src/core/types/photo_size.rs
rename to src/types/photo_size.rs
diff --git a/src/core/types/poll.rs b/src/types/poll.rs
similarity index 100%
rename from src/core/types/poll.rs
rename to src/types/poll.rs
diff --git a/src/core/types/pre_checkout_query.rs b/src/types/pre_checkout_query.rs
similarity index 87%
rename from src/core/types/pre_checkout_query.rs
rename to src/types/pre_checkout_query.rs
index 2d136e52..dbd2154a 100644
--- a/src/core/types/pre_checkout_query.rs
+++ b/src/types/pre_checkout_query.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{OrderInfo, User};
+use crate::types::{OrderInfo, User};
 
 #[derive(Debug, Deserialize, Hash, PartialEq, Eq, Clone)]
 pub struct PreCheckoutQuery {
diff --git a/src/core/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
similarity index 97%
rename from src/core/types/reply_keyboard_markup.rs
rename to src/types/reply_keyboard_markup.rs
index 458c6c3a..d1a0212c 100644
--- a/src/core/types/reply_keyboard_markup.rs
+++ b/src/types/reply_keyboard_markup.rs
@@ -1,4 +1,4 @@
-use crate::core::types::KeyboardButton;
+use crate::types::KeyboardButton;
 
 /// This object represents a custom keyboard with reply options.
 #[derive(Debug, Serialize, Deserialize, Hash, PartialEq, Eq, Clone)]
diff --git a/src/core/types/reply_keyboard_remove.rs b/src/types/reply_keyboard_remove.rs
similarity index 100%
rename from src/core/types/reply_keyboard_remove.rs
rename to src/types/reply_keyboard_remove.rs
diff --git a/src/core/types/reply_markup.rs b/src/types/reply_markup.rs
similarity index 92%
rename from src/core/types/reply_markup.rs
rename to src/types/reply_markup.rs
index 5da72b2e..82ceeb77 100644
--- a/src/core/types/reply_markup.rs
+++ b/src/types/reply_markup.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{
+use crate::types::{
     ForceReply, InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove,
 };
 
diff --git a/src/core/types/response_parameters.rs b/src/types/response_parameters.rs
similarity index 100%
rename from src/core/types/response_parameters.rs
rename to src/types/response_parameters.rs
diff --git a/src/core/types/send_invoice.rs b/src/types/send_invoice.rs
similarity index 90%
rename from src/core/types/send_invoice.rs
rename to src/types/send_invoice.rs
index 9ca27201..889606a7 100644
--- a/src/core/types/send_invoice.rs
+++ b/src/types/send_invoice.rs
@@ -1,5 +1,5 @@
-use crate::core::requests::ChatId;
-use crate::core::types::{InlineKeyboardMarkup, LabeledPrice};
+use crate::requests::ChatId;
+use crate::types::{InlineKeyboardMarkup, LabeledPrice};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct SendInvoice {
diff --git a/src/core/types/shipping_address.rs b/src/types/shipping_address.rs
similarity index 100%
rename from src/core/types/shipping_address.rs
rename to src/types/shipping_address.rs
diff --git a/src/core/types/shipping_option.rs b/src/types/shipping_option.rs
similarity index 95%
rename from src/core/types/shipping_option.rs
rename to src/types/shipping_option.rs
index b5e0c11d..b37efc4a 100644
--- a/src/core/types/shipping_option.rs
+++ b/src/types/shipping_option.rs
@@ -1,4 +1,4 @@
-use crate::core::types::LabeledPrice;
+use crate::types::LabeledPrice;
 
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Serialize)]
 /// This object represents one shipping option.
diff --git a/src/core/types/shipping_query.rs b/src/types/shipping_query.rs
similarity index 80%
rename from src/core/types/shipping_query.rs
rename to src/types/shipping_query.rs
index 1939572c..139973d6 100644
--- a/src/core/types/shipping_query.rs
+++ b/src/types/shipping_query.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{ShippingAddress, User};
+use crate::types::{ShippingAddress, User};
 
 #[derive(Debug, Deserialize, Hash, PartialEq, Eq, Clone)]
 pub struct ShippingQuery {
diff --git a/src/core/types/sticker.rs b/src/types/sticker.rs
similarity index 86%
rename from src/core/types/sticker.rs
rename to src/types/sticker.rs
index 22e25c10..75717231 100644
--- a/src/core/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{MaskPosition, PhotoSize};
+use crate::types::{MaskPosition, PhotoSize};
 
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 pub struct Sticker {
diff --git a/src/core/types/sticker_set.rs b/src/types/sticker_set.rs
similarity index 86%
rename from src/core/types/sticker_set.rs
rename to src/types/sticker_set.rs
index 7c6b2339..310c0652 100644
--- a/src/core/types/sticker_set.rs
+++ b/src/types/sticker_set.rs
@@ -1,4 +1,4 @@
-use crate::core::types::Sticker;
+use crate::types::Sticker;
 
 #[derive(Debug, Deserialize, Hash, PartialEq, Eq, Clone)]
 pub struct Sticker {
diff --git a/src/core/types/successful_payment.rs b/src/types/successful_payment.rs
similarity index 91%
rename from src/core/types/successful_payment.rs
rename to src/types/successful_payment.rs
index c544499b..38bf7a52 100644
--- a/src/core/types/successful_payment.rs
+++ b/src/types/successful_payment.rs
@@ -1,4 +1,4 @@
-use crate::core::types::OrderInfo;
+use crate::types::OrderInfo;
 
 #[derive(Debug, Deserialize, Hash, PartialEq, Eq, Clone, Serialize)]
 pub struct SuccessfulPayment {
diff --git a/src/core/types/update.rs b/src/types/update.rs
similarity index 88%
rename from src/core/types/update.rs
rename to src/types/update.rs
index edb2626b..df9d2a4b 100644
--- a/src/core/types/update.rs
+++ b/src/types/update.rs
@@ -1,4 +1,4 @@
-use crate::core::types::{CallbackQuery, ChosenInlineResult, Message};
+use crate::types::{CallbackQuery, ChosenInlineResult, Message};
 
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 pub struct Update {
diff --git a/src/core/types/user.rs b/src/types/user.rs
similarity index 100%
rename from src/core/types/user.rs
rename to src/types/user.rs
diff --git a/src/core/types/user_profile_photos.rs b/src/types/user_profile_photos.rs
similarity index 64%
rename from src/core/types/user_profile_photos.rs
rename to src/types/user_profile_photos.rs
index 6364706e..2d869910 100644
--- a/src/core/types/user_profile_photos.rs
+++ b/src/types/user_profile_photos.rs
@@ -1,7 +1,7 @@
-use crate::core::types::PhotoSize;
+use crate::types::PhotoSize;
 
 #[derive(Debug, Deserialize, Eq, Hash, PartialEq, Clone, Serialize)]
 pub struct UserProfilePhotos {
     pub total_count: u32,
-    pub photos: Vec<Vec<PhotoSize>>
+    pub photos: Vec<Vec<PhotoSize>>,
 }
diff --git a/src/core/types/venue.rs b/src/types/venue.rs
similarity index 95%
rename from src/core/types/venue.rs
rename to src/types/venue.rs
index 75d26820..df34a98e 100644
--- a/src/core/types/venue.rs
+++ b/src/types/venue.rs
@@ -1,4 +1,4 @@
-use crate::core::types::Location;
+use crate::types::Location;
 
 /// This object represents a venue.
 #[derive(Debug, Deserialize, PartialEq, Serialize, Clone)]
diff --git a/src/core/types/video.rs b/src/types/video.rs
similarity index 94%
rename from src/core/types/video.rs
rename to src/types/video.rs
index 8860a372..c3086833 100644
--- a/src/core/types/video.rs
+++ b/src/types/video.rs
@@ -1,4 +1,4 @@
-use crate::core::types::PhotoSize;
+use crate::types::PhotoSize;
 
 /// This object represents a video file.
 #[derive(Debug, Deserialize, Eq, Hash, PartialEq, Serialize, Clone)]
diff --git a/src/core/types/video_note.rs b/src/types/video_note.rs
similarity index 94%
rename from src/core/types/video_note.rs
rename to src/types/video_note.rs
index 711af479..2f09357f 100644
--- a/src/core/types/video_note.rs
+++ b/src/types/video_note.rs
@@ -1,4 +1,4 @@
-use crate::core::types::PhotoSize;
+use crate::types::PhotoSize;
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq, Eq, Hash)]
diff --git a/src/core/types/voice.rs b/src/types/voice.rs
similarity index 100%
rename from src/core/types/voice.rs
rename to src/types/voice.rs
diff --git a/src/core/types/webhook_info.rs b/src/types/webhook_info.rs
similarity index 100%
rename from src/core/types/webhook_info.rs
rename to src/types/webhook_info.rs