diff --git a/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php b/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
index 9f9e6c6..2280f12 100644
--- a/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
+++ b/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
@@ -16,11 +16,11 @@
 use Threema\MsgApi\Helpers\EncryptResult;
 use Threema\MsgApi\Helpers\FileAnalysisResult;
 use Threema\MsgApi\Helpers\KeyPair;
-use Threema\MsgApi\Messages\DeliveryReceipt;
-use Threema\MsgApi\Messages\FileMessage;
-use Threema\MsgApi\Messages\ImageMessage;
-use Threema\MsgApi\Messages\TextMessage;
-use Threema\MsgApi\Messages\AbstractMessage;
+use Threema\MsgApi\Message\DeliveryReceipt;
+use Threema\MsgApi\Message\FileMessage;
+use Threema\MsgApi\Message\ImageMessage;
+use Threema\MsgApi\Message\TextMessage;
+use Threema\MsgApi\Message\AbstractMessage;
 
 /**
  * Contains static methods to do various Threema cryptography related tasks.
diff --git a/src/Threema/MsgApi/Helpers/E2EHelper.php b/src/Threema/MsgApi/Helpers/E2EHelper.php
index c1b8fe1..d4642e5 100644
--- a/src/Threema/MsgApi/Helpers/E2EHelper.php
+++ b/src/Threema/MsgApi/Helpers/E2EHelper.php
@@ -17,9 +17,9 @@
 use Threema\MsgApi\Exceptions\HttpException;
 use Threema\MsgApi\Exceptions\InvalidArgumentException;
 use Threema\MsgApi\Exceptions\UnsupportedMessageTypeException;
-use Threema\MsgApi\Messages\FileMessage;
-use Threema\MsgApi\Messages\ImageMessage;
-use Threema\MsgApi\Messages\AbstractMessage;
+use Threema\MsgApi\Message\FileMessage;
+use Threema\MsgApi\Message\ImageMessage;
+use Threema\MsgApi\Message\AbstractMessage;
 
 /**
  * Splits some of the bulky code out of the Connection class to keep the Connection small / clean
diff --git a/src/Threema/MsgApi/Helpers/ReceiveMessageResult.php b/src/Threema/MsgApi/Helpers/ReceiveMessageResult.php
index 79575c0..e436c1d 100644
--- a/src/Threema/MsgApi/Helpers/ReceiveMessageResult.php
+++ b/src/Threema/MsgApi/Helpers/ReceiveMessageResult.php
@@ -8,7 +8,7 @@
 
 namespace Threema\MsgApi\Helpers;
 
-use Threema\MsgApi\Messages\AbstractMessage;
+use Threema\MsgApi\Message\AbstractMessage;
 
 class ReceiveMessageResult
 {
diff --git a/src/Threema/MsgApi/Messages/AbstractMessage.php b/src/Threema/MsgApi/Message/AbstractMessage.php
similarity index 93%
rename from src/Threema/MsgApi/Messages/AbstractMessage.php
rename to src/Threema/MsgApi/Message/AbstractMessage.php
index 9f348e8..4da5f49 100644
--- a/src/Threema/MsgApi/Messages/AbstractMessage.php
+++ b/src/Threema/MsgApi/Message/AbstractMessage.php
@@ -4,7 +4,7 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 /**
  * Abstract base class of messages that can be sent with end-to-end encryption via Threema.
diff --git a/src/Threema/MsgApi/Messages/DeliveryReceipt.php b/src/Threema/MsgApi/Message/DeliveryReceipt.php
similarity index 98%
rename from src/Threema/MsgApi/Messages/DeliveryReceipt.php
rename to src/Threema/MsgApi/Message/DeliveryReceipt.php
index b726124..7cbfe3a 100644
--- a/src/Threema/MsgApi/Messages/DeliveryReceipt.php
+++ b/src/Threema/MsgApi/Message/DeliveryReceipt.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class DeliveryReceipt extends AbstractMessage
 {
diff --git a/src/Threema/MsgApi/Messages/FileMessage.php b/src/Threema/MsgApi/Message/FileMessage.php
similarity index 98%
rename from src/Threema/MsgApi/Messages/FileMessage.php
rename to src/Threema/MsgApi/Message/FileMessage.php
index 7c4bc31..97242bd 100644
--- a/src/Threema/MsgApi/Messages/FileMessage.php
+++ b/src/Threema/MsgApi/Message/FileMessage.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class FileMessage extends AbstractMessage
 {
diff --git a/src/Threema/MsgApi/Messages/ImageMessage.php b/src/Threema/MsgApi/Message/ImageMessage.php
similarity index 97%
rename from src/Threema/MsgApi/Messages/ImageMessage.php
rename to src/Threema/MsgApi/Message/ImageMessage.php
index c432287..2c42930 100644
--- a/src/Threema/MsgApi/Messages/ImageMessage.php
+++ b/src/Threema/MsgApi/Message/ImageMessage.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class ImageMessage extends AbstractMessage
 {
diff --git a/src/Threema/MsgApi/Messages/TextMessage.php b/src/Threema/MsgApi/Message/TextMessage.php
similarity index 95%
rename from src/Threema/MsgApi/Messages/TextMessage.php
rename to src/Threema/MsgApi/Message/TextMessage.php
index b15d300..2309716 100644
--- a/src/Threema/MsgApi/Messages/TextMessage.php
+++ b/src/Threema/MsgApi/Message/TextMessage.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class TextMessage extends AbstractMessage
 {
diff --git a/tests/Threema/MsgApi/EncryptorTest.php b/tests/Threema/MsgApi/EncryptorTest.php
index 887e439..560357a 100644
--- a/tests/Threema/MsgApi/EncryptorTest.php
+++ b/tests/Threema/MsgApi/EncryptorTest.php
@@ -11,7 +11,7 @@
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
 use Threema\MsgApi\Encryptor\SodiumEncryptor;
 use Threema\MsgApi\Helpers\KeyPrefix;
-use Threema\MsgApi\Messages\TextMessage;
+use Threema\MsgApi\Message\TextMessage;
 
 class EncryptorTest extends TestCase
 {