diff --git a/pyrogram/client/types/media/__init__.py b/pyrogram/client/types/messages_and_media/__init__.py
similarity index 92%
rename from pyrogram/client/types/media/__init__.py
rename to pyrogram/client/types/messages_and_media/__init__.py
index 07d1280c..3ab359ae 100644
--- a/pyrogram/client/types/media/__init__.py
+++ b/pyrogram/client/types/messages_and_media/__init__.py
@@ -21,6 +21,9 @@ from .audio import Audio
 from .contact import Contact
 from .document import Document
 from .location import Location
+from .message import Message
+from .message_entity import MessageEntity
+from .messages import Messages
 from .photo import Photo
 from .photo_size import PhotoSize
 from .sticker import Sticker
diff --git a/pyrogram/client/types/media/animation.py b/pyrogram/client/types/messages_and_media/animation.py
similarity index 100%
rename from pyrogram/client/types/media/animation.py
rename to pyrogram/client/types/messages_and_media/animation.py
diff --git a/pyrogram/client/types/media/audio.py b/pyrogram/client/types/messages_and_media/audio.py
similarity index 100%
rename from pyrogram/client/types/media/audio.py
rename to pyrogram/client/types/messages_and_media/audio.py
diff --git a/pyrogram/client/types/media/contact.py b/pyrogram/client/types/messages_and_media/contact.py
similarity index 100%
rename from pyrogram/client/types/media/contact.py
rename to pyrogram/client/types/messages_and_media/contact.py
diff --git a/pyrogram/client/types/media/document.py b/pyrogram/client/types/messages_and_media/document.py
similarity index 100%
rename from pyrogram/client/types/media/document.py
rename to pyrogram/client/types/messages_and_media/document.py
diff --git a/pyrogram/client/types/media/location.py b/pyrogram/client/types/messages_and_media/location.py
similarity index 100%
rename from pyrogram/client/types/media/location.py
rename to pyrogram/client/types/messages_and_media/location.py
diff --git a/pyrogram/client/types/message.py b/pyrogram/client/types/messages_and_media/message.py
similarity index 100%
rename from pyrogram/client/types/message.py
rename to pyrogram/client/types/messages_and_media/message.py
diff --git a/pyrogram/client/types/message_entity.py b/pyrogram/client/types/messages_and_media/message_entity.py
similarity index 100%
rename from pyrogram/client/types/message_entity.py
rename to pyrogram/client/types/messages_and_media/message_entity.py
diff --git a/pyrogram/client/types/messages.py b/pyrogram/client/types/messages_and_media/messages.py
similarity index 100%
rename from pyrogram/client/types/messages.py
rename to pyrogram/client/types/messages_and_media/messages.py
diff --git a/pyrogram/client/types/media/photo.py b/pyrogram/client/types/messages_and_media/photo.py
similarity index 100%
rename from pyrogram/client/types/media/photo.py
rename to pyrogram/client/types/messages_and_media/photo.py
diff --git a/pyrogram/client/types/media/photo_size.py b/pyrogram/client/types/messages_and_media/photo_size.py
similarity index 100%
rename from pyrogram/client/types/media/photo_size.py
rename to pyrogram/client/types/messages_and_media/photo_size.py
diff --git a/pyrogram/client/types/media/sticker.py b/pyrogram/client/types/messages_and_media/sticker.py
similarity index 100%
rename from pyrogram/client/types/media/sticker.py
rename to pyrogram/client/types/messages_and_media/sticker.py
diff --git a/pyrogram/client/types/media/user_profile_photos.py b/pyrogram/client/types/messages_and_media/user_profile_photos.py
similarity index 100%
rename from pyrogram/client/types/media/user_profile_photos.py
rename to pyrogram/client/types/messages_and_media/user_profile_photos.py
diff --git a/pyrogram/client/types/media/venue.py b/pyrogram/client/types/messages_and_media/venue.py
similarity index 100%
rename from pyrogram/client/types/media/venue.py
rename to pyrogram/client/types/messages_and_media/venue.py
diff --git a/pyrogram/client/types/media/video.py b/pyrogram/client/types/messages_and_media/video.py
similarity index 100%
rename from pyrogram/client/types/media/video.py
rename to pyrogram/client/types/messages_and_media/video.py
diff --git a/pyrogram/client/types/media/video_note.py b/pyrogram/client/types/messages_and_media/video_note.py
similarity index 100%
rename from pyrogram/client/types/media/video_note.py
rename to pyrogram/client/types/messages_and_media/video_note.py
diff --git a/pyrogram/client/types/media/voice.py b/pyrogram/client/types/messages_and_media/voice.py
similarity index 100%
rename from pyrogram/client/types/media/voice.py
rename to pyrogram/client/types/messages_and_media/voice.py