diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea0878f..35518b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 This update accompanies the release of the [Telegram Bot API 6.7](https://core.telegram.org/bots/api#april-21-2023).
 
 ### Added
- * Added object `\TgBotLib\Objects\Telegram > InputTextMessageContent` to represent the content of a text message to be sent as the result of an inline query.
- * Added object `\TgBotLib\Objects\Telegram > InputLocationMessageContent` to represent the content of a location message to be sent as the result of an inline query.
- * Added object `\TgBotLib\Objects\Telegram > InputVenueMessageContent` to represent the content of a venue message to be sent as the result of an inline query.
- * Added object `\TgBotLib\Objects\Telegram > InputContactMessageContent` to represent the content of a contact message to be sent as the result of an inline query.
- * Added object `\TgBotLib\Objects\Telegram > InputInvoiceMessageContent` to represent the content of an invoice message to be sent as the result of an inline query.
+ * Added object `\TgBotLib\Objects\Telegram\InputMessageContent > InputTextMessageContent` to represent the content of a text message to be sent as the result of an inline query.
+ * Added object `\TgBotLib\Objects\Telegram\InputMessageContent > InputLocationMessageContent` to represent the content of a location message to be sent as the result of an inline query.
+ * Added object `\TgBotLib\Objects\Telegram\InputMessageContent > InputVenueMessageContent` to represent the content of a venue message to be sent as the result of an inline query.
+ * Added object `\TgBotLib\Objects\Telegram\InputMessageContent > InputContactMessageContent` to represent the content of a contact message to be sent as the result of an inline query.
+ * Added object `\TgBotLib\Objects\Telegram\InputMessageContent > InputInvoiceMessageContent` to represent the content of an invoice message to be sent as the result of an inline query.
  * Added new exception class `NotImplementedException` to represent the case when a method is not implemented yet or the method is not applicable to the current object.
 
 ## [6.6.0] - 2023-04-10
diff --git a/src/TgBotLib/Objects/Telegram/InputMessageContent.php b/src/TgBotLib/Objects/Telegram/InputMessageContent.php
new file mode 100644
index 0000000..533cc44
--- /dev/null
+++ b/src/TgBotLib/Objects/Telegram/InputMessageContent.php
@@ -0,0 +1,64 @@
+<?php
+
+    namespace TgBotLib\Objects\Telegram;
+
+    use LogLib\Log;
+    use TgBotLib\Exceptions\NotImplementedException;
+    use TgBotLib\Interfaces\ObjectTypeInterface;
+    use TgBotLib\Objects\Telegram\InputMessageContent\InputContactMessageContent;
+    use TgBotLib\Objects\Telegram\InputMessageContent\InputInvoiceMessageContent;
+    use TgBotLib\Objects\Telegram\InputMessageContent\InputLocationMessageContent;
+    use TgBotLib\Objects\Telegram\InputMessageContent\InputTextMessageContent;
+    use TgBotLib\Objects\Telegram\InputMessageContent\InputVenueMessageContent;
+
+    class InputMessageContent implements ObjectTypeInterface
+    {
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            throw new NotImplementedException('This object is abstract, you can\'t use it directly, try constructing one of the child classes with fromArray()');
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): ObjectTypeInterface
+        {
+            // You may be wondering why this is needed, it's because Telegram Developers can't
+            // actually write good software, they tend to forget the little things.
+            // Like for example, providing the type of the object in the JSON response.
+            // So this little code snippet is needed to determine the type of the object. :(
+            //
+            // Thanks Telegram!
+
+            if(isset($data['provider_token']))
+            {
+                return InputInvoiceMessageContent::fromArray($data);
+            }
+
+            if(isset($data['phone_number']))
+            {
+                return InputContactMessageContent::fromArray($data);
+            }
+
+            if(isset($data['address']))
+            {
+                return InputVenueMessageContent::fromArray($data);
+            }
+
+            if(isset($data['longitude']) && isset($data['latitude']))
+            {
+                return InputLocationMessageContent::fromArray($data);
+            }
+
+            if(isset($data['message_text']))
+            {
+                return InputTextMessageContent::fromArray($data);
+            }
+
+            Log::warning('net.nosial.tgbotlib', 'InputMessageContent::fromArray() - Unknown type of InputMessageContent, returning InputTextMessageContent (go complain to Telegram)');
+            return InputTextMessageContent::fromArray($data);
+        }
+    }
\ No newline at end of file
diff --git a/src/TgBotLib/Objects/Telegram/InputContactMessageContent.php b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputContactMessageContent.php
similarity index 97%
rename from src/TgBotLib/Objects/Telegram/InputContactMessageContent.php
rename to src/TgBotLib/Objects/Telegram/InputMessageContent/InputContactMessageContent.php
index 4ea4daa..0ad7757 100644
--- a/src/TgBotLib/Objects/Telegram/InputContactMessageContent.php
+++ b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputContactMessageContent.php
@@ -2,7 +2,7 @@
 
     /** @noinspection PhpMissingFieldTypeInspection */
 
-    namespace TgBotLib\Objects\Telegram;
+    namespace TgBotLib\Objects\Telegram\InputMessageContent;
 
     use TgBotLib\Interfaces\ObjectTypeInterface;
 
diff --git a/src/TgBotLib/Objects/Telegram/InputInvoiceMessageContent.php b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputInvoiceMessageContent.php
similarity index 99%
rename from src/TgBotLib/Objects/Telegram/InputInvoiceMessageContent.php
rename to src/TgBotLib/Objects/Telegram/InputMessageContent/InputInvoiceMessageContent.php
index 94cc545..0a6fb56 100644
--- a/src/TgBotLib/Objects/Telegram/InputInvoiceMessageContent.php
+++ b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputInvoiceMessageContent.php
@@ -3,9 +3,10 @@
     /** @noinspection PhpMissingFieldTypeInspection */
     /** @noinspection PhpUnused */
 
-    namespace TgBotLib\Objects\Telegram;
+    namespace TgBotLib\Objects\Telegram\InputMessageContent;
 
     use TgBotLib\Interfaces\ObjectTypeInterface;
+    use TgBotLib\Objects\Telegram\LabeledPrice;
 
     class InputInvoiceMessageContent implements \TgBotLib\Interfaces\ObjectTypeInterface
     {
diff --git a/src/TgBotLib/Objects/Telegram/InputLocationMessageContent.php b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputLocationMessageContent.php
similarity index 96%
rename from src/TgBotLib/Objects/Telegram/InputLocationMessageContent.php
rename to src/TgBotLib/Objects/Telegram/InputMessageContent/InputLocationMessageContent.php
index f3d5776..34f2357 100644
--- a/src/TgBotLib/Objects/Telegram/InputLocationMessageContent.php
+++ b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputLocationMessageContent.php
@@ -2,11 +2,12 @@
 
     /** @noinspection PhpMissingFieldTypeInspection */
 
-    namespace TgBotLib\Objects\Telegram;
+    namespace TgBotLib\Objects\Telegram\InputMessageContent;
 
     use TgBotLib\Interfaces\ObjectTypeInterface;
 
-    class InputLocationMessageContent implements ObjectTypeInterface
+    class
+    InputLocationMessageContent implements ObjectTypeInterface
     {
         /**
          * @var float
diff --git a/src/TgBotLib/Objects/Telegram/InputTextMessageContent.php b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputTextMessageContent.php
similarity index 96%
rename from src/TgBotLib/Objects/Telegram/InputTextMessageContent.php
rename to src/TgBotLib/Objects/Telegram/InputMessageContent/InputTextMessageContent.php
index f7ba609..d2a4850 100644
--- a/src/TgBotLib/Objects/Telegram/InputTextMessageContent.php
+++ b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputTextMessageContent.php
@@ -2,9 +2,10 @@
 
     /** @noinspection PhpMissingFieldTypeInspection */
 
-    namespace TgBotLib\Objects\Telegram;
+    namespace TgBotLib\Objects\Telegram\InputMessageContent;
 
     use TgBotLib\Interfaces\ObjectTypeInterface;
+    use TgBotLib\Objects\Telegram\MessageEntity;
 
     class InputTextMessageContent implements ObjectTypeInterface
     {
diff --git a/src/TgBotLib/Objects/Telegram/InputVenueMessageContent.php b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputVenueMessageContent.php
similarity index 97%
rename from src/TgBotLib/Objects/Telegram/InputVenueMessageContent.php
rename to src/TgBotLib/Objects/Telegram/InputMessageContent/InputVenueMessageContent.php
index e2ec0b5..b2c1122 100644
--- a/src/TgBotLib/Objects/Telegram/InputVenueMessageContent.php
+++ b/src/TgBotLib/Objects/Telegram/InputMessageContent/InputVenueMessageContent.php
@@ -3,11 +3,12 @@
     /** @noinspection PhpUnused */
     /** @noinspection PhpMissingFieldTypeInspection */
 
-    namespace TgBotLib\Objects\Telegram;
+    namespace TgBotLib\Objects\Telegram\InputMessageContent;
 
     use TgBotLib\Interfaces\ObjectTypeInterface;
 
-    class InputVenueMessageContent implements ObjectTypeInterface
+    class
+    InputVenueMessageContent implements ObjectTypeInterface
     {
         /**
          * @var float