diff --git a/lib/messages.dart b/lib/messages.dart
index 9e2cba04..4920d80f 100644
--- a/lib/messages.dart
+++ b/lib/messages.dart
@@ -1,7 +1,7 @@
 library messages;
 
 export 'src/buffer.dart' show PgByteDataWriter;
-export 'src/client_messages.dart';
-export 'src/logical_replication_messages.dart';
-export 'src/server_messages.dart';
-export 'src/shared_messages.dart';
+export 'src/messages/client_messages.dart';
+export 'src/messages/logical_replication_messages.dart';
+export 'src/messages/server_messages.dart';
+export 'src/messages/shared_messages.dart';
diff --git a/lib/src/auth/clear_text_authenticator.dart b/lib/src/auth/clear_text_authenticator.dart
index 383909d5..2e1d9380 100644
--- a/lib/src/auth/clear_text_authenticator.dart
+++ b/lib/src/auth/clear_text_authenticator.dart
@@ -1,6 +1,6 @@
 import '../buffer.dart';
-import '../client_messages.dart';
-import '../server_messages.dart';
+import '../messages/client_messages.dart';
+import '../messages/server_messages.dart';
 import 'auth.dart';
 
 class ClearAuthenticator extends PostgresAuthenticator {
diff --git a/lib/src/auth/md5_authenticator.dart b/lib/src/auth/md5_authenticator.dart
index 390afbdc..2bcb6692 100644
--- a/lib/src/auth/md5_authenticator.dart
+++ b/lib/src/auth/md5_authenticator.dart
@@ -2,8 +2,8 @@ import 'package:buffer/buffer.dart';
 import 'package:crypto/crypto.dart';
 
 import '../buffer.dart';
-import '../client_messages.dart';
-import '../server_messages.dart';
+import '../messages/client_messages.dart';
+import '../messages/server_messages.dart';
 import 'auth.dart';
 
 class MD5Authenticator extends PostgresAuthenticator {
diff --git a/lib/src/auth/sasl_authenticator.dart b/lib/src/auth/sasl_authenticator.dart
index 7970aa9a..e247ae14 100644
--- a/lib/src/auth/sasl_authenticator.dart
+++ b/lib/src/auth/sasl_authenticator.dart
@@ -3,9 +3,9 @@ import 'dart:typed_data';
 import 'package:sasl_scram/sasl_scram.dart';
 
 import '../buffer.dart';
-import '../client_messages.dart';
 import '../exceptions.dart';
-import '../server_messages.dart';
+import '../messages/client_messages.dart';
+import '../messages/server_messages.dart';
 import 'auth.dart';
 
 /// Structure for SASL Authenticator
diff --git a/lib/src/exceptions.dart b/lib/src/exceptions.dart
index 7f667ab3..80fad385 100644
--- a/lib/src/exceptions.dart
+++ b/lib/src/exceptions.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:meta/meta.dart';
 
-import 'server_messages.dart';
+import 'messages/server_messages.dart';
 import 'types.dart';
 
 /// Exception thrown by the package (client or server side).
diff --git a/lib/src/message_window.dart b/lib/src/message_window.dart
index 2263ab25..0c96f234 100644
--- a/lib/src/message_window.dart
+++ b/lib/src/message_window.dart
@@ -6,8 +6,8 @@ import 'package:buffer/buffer.dart';
 import 'package:charcode/ascii.dart';
 
 import 'buffer.dart';
-import 'server_messages.dart';
-import 'shared_messages.dart';
+import 'messages/server_messages.dart';
+import 'messages/shared_messages.dart';
 
 const int _headerByteSize = 5;
 
diff --git a/lib/src/client_messages.dart b/lib/src/messages/client_messages.dart
similarity index 98%
rename from lib/src/client_messages.dart
rename to lib/src/messages/client_messages.dart
index 70db977b..2744b932 100644
--- a/lib/src/client_messages.dart
+++ b/lib/src/messages/client_messages.dart
@@ -4,13 +4,13 @@ import 'dart:typed_data';
 import 'package:buffer/buffer.dart';
 import 'package:charcode/ascii.dart';
 
-import 'binary_codec.dart';
-import 'buffer.dart';
-import 'replication.dart';
+import '../binary_codec.dart';
+import '../buffer.dart';
+import '../replication.dart';
+import '../text_codec.dart';
+import '../time_converters.dart';
+import '../types.dart';
 import 'shared_messages.dart';
-import 'text_codec.dart';
-import 'time_converters.dart';
-import 'types.dart';
 
 abstract class ClientMessageFormat {
   static const int text = 0;
diff --git a/lib/src/logical_replication_messages.dart b/lib/src/messages/logical_replication_messages.dart
similarity index 99%
rename from lib/src/logical_replication_messages.dart
rename to lib/src/messages/logical_replication_messages.dart
index 7a86536f..8abbc7bc 100644
--- a/lib/src/logical_replication_messages.dart
+++ b/lib/src/messages/logical_replication_messages.dart
@@ -2,12 +2,12 @@ import 'dart:typed_data';
 
 import 'package:buffer/buffer.dart';
 
-import 'binary_codec.dart';
-import 'buffer.dart';
+import '../binary_codec.dart';
+import '../buffer.dart';
+import '../time_converters.dart';
+import '../types.dart';
 import 'server_messages.dart';
 import 'shared_messages.dart';
-import 'time_converters.dart';
-import 'types.dart';
 
 /// A base class for all [Logical Replication Message Formats][] from the server
 ///
diff --git a/lib/src/server_messages.dart b/lib/src/messages/server_messages.dart
similarity index 99%
rename from lib/src/server_messages.dart
rename to lib/src/messages/server_messages.dart
index 4df4e02a..5ee0f51c 100644
--- a/lib/src/server_messages.dart
+++ b/lib/src/messages/server_messages.dart
@@ -3,11 +3,11 @@ import 'dart:typed_data';
 
 import 'package:meta/meta.dart';
 
-import 'buffer.dart';
+import '../buffer.dart';
+import '../time_converters.dart';
+import '../types.dart';
 import 'logical_replication_messages.dart';
 import 'shared_messages.dart';
-import 'time_converters.dart';
-import 'types.dart';
 
 abstract class ServerMessage extends Message {}
 
diff --git a/lib/src/shared_messages.dart b/lib/src/messages/shared_messages.dart
similarity index 98%
rename from lib/src/shared_messages.dart
rename to lib/src/messages/shared_messages.dart
index e84e52f3..76133079 100644
--- a/lib/src/shared_messages.dart
+++ b/lib/src/messages/shared_messages.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'buffer.dart';
+import '../buffer.dart';
 import 'client_messages.dart';
 import 'server_messages.dart';
 
diff --git a/lib/src/v2/connection.dart b/lib/src/v2/connection.dart
index 26c1ac5e..0b88c55e 100644
--- a/lib/src/v2/connection.dart
+++ b/lib/src/v2/connection.dart
@@ -11,13 +11,12 @@ import 'package:meta/meta.dart';
 
 import '../../postgres.dart' show ConnectionSettings, Endpoint, Notification;
 import '../auth/auth.dart';
-import '../client_messages.dart';
 import '../exceptions.dart';
 import '../message_window.dart';
+import '../messages/client_messages.dart';
+import '../messages/server_messages.dart';
 import '../replication.dart';
-import '../server_messages.dart';
 import '../types.dart' show Severity;
-
 import 'execution_context.dart';
 import 'query.dart';
 import 'query_cache.dart';
@@ -25,7 +24,6 @@ import 'query_queue.dart';
 import 'v2_v3_delegate.dart';
 
 part 'connection_fsm.dart';
-
 part 'transaction_proxy.dart';
 
 typedef PostgreSQLException = ServerException;
diff --git a/lib/src/v2/query.dart b/lib/src/v2/query.dart
index a1793850..b6c31e56 100644
--- a/lib/src/v2/query.dart
+++ b/lib/src/v2/query.dart
@@ -6,9 +6,9 @@ import 'dart:typed_data';
 import 'package:postgres/src/buffer.dart';
 
 import '../binary_codec.dart';
-import '../client_messages.dart';
 import '../exceptions.dart';
-import '../server_messages.dart';
+import '../messages/client_messages.dart';
+import '../messages/server_messages.dart';
 import '../types.dart';
 import 'connection.dart';
 import 'execution_context.dart';
diff --git a/lib/src/v3/protocol.dart b/lib/src/v3/protocol.dart
index 4d903032..50766d04 100644
--- a/lib/src/v3/protocol.dart
+++ b/lib/src/v3/protocol.dart
@@ -6,14 +6,14 @@ import 'package:async/async.dart';
 import 'package:stream_channel/stream_channel.dart';
 
 import '../buffer.dart';
-import '../client_messages.dart';
 import '../message_window.dart';
-import '../server_messages.dart';
-import '../shared_messages.dart';
+import '../messages/client_messages.dart';
+import '../messages/server_messages.dart';
+import '../messages/shared_messages.dart';
 
-export '../client_messages.dart';
-export '../server_messages.dart';
-export '../shared_messages.dart';
+export '../messages/client_messages.dart';
+export '../messages/server_messages.dart';
+export '../messages/shared_messages.dart';
 
 class AggregatedClientMessage extends ClientMessage {
   final List<ClientMessage> messages;
diff --git a/test/framer_test.dart b/test/framer_test.dart
index 1a6e6fa0..cc400108 100644
--- a/test/framer_test.dart
+++ b/test/framer_test.dart
@@ -2,10 +2,10 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:buffer/buffer.dart';
-import 'package:postgres/src/logical_replication_messages.dart';
 import 'package:postgres/src/message_window.dart';
-import 'package:postgres/src/server_messages.dart';
-import 'package:postgres/src/shared_messages.dart';
+import 'package:postgres/src/messages/logical_replication_messages.dart';
+import 'package:postgres/src/messages/server_messages.dart';
+import 'package:postgres/src/messages/shared_messages.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/server_messages_test.dart b/test/server_messages_test.dart
index 43d0734f..ffe68f40 100644
--- a/test/server_messages_test.dart
+++ b/test/server_messages_test.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:postgres/src/server_messages.dart';
+import 'package:postgres/src/messages/server_messages.dart';
 import 'package:test/test.dart';
 
 void main() {