diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c42bd24..d336d3de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Set compressed flag correctly for grpc-encoding = identity. Fixes [#669](https://github.com/grpc/grpc-dart/issues/669) (https://github.com/grpc/grpc-dart/pull/693)
 * Remove generated status codes.
 * Remove dependency on `package:archive`.
+* Move `codec.dart`.
 
 ## 3.2.4
 
diff --git a/lib/grpc.dart b/lib/grpc.dart
index 59c90198..1c9593fa 100644
--- a/lib/grpc.dart
+++ b/lib/grpc.dart
@@ -55,7 +55,7 @@ export 'src/server/server.dart'
 export 'src/server/server_keepalive.dart' show ServerKeepAliveOptions;
 export 'src/server/service.dart' show ServiceMethod, Service;
 export 'src/shared/api.dart';
-export 'src/shared/codec/codec.dart' show Codec, IdentityCodec, GzipCodec;
+export 'src/shared/codec.dart' show Codec, IdentityCodec, GzipCodec;
 export 'src/shared/codec_registry.dart';
 export 'src/shared/message.dart'
     show GrpcMessage, GrpcMetadata, GrpcData, grpcDecompressor;
diff --git a/lib/grpc_connection_interface.dart b/lib/grpc_connection_interface.dart
index da9c879b..c0e3176a 100644
--- a/lib/grpc_connection_interface.dart
+++ b/lib/grpc_connection_interface.dart
@@ -25,7 +25,7 @@ export 'src/client/options.dart' show ChannelOptions;
 export 'src/client/transport/transport.dart'
     show GrpcTransportStream, ErrorHandler;
 
-export 'src/shared/codec/codec.dart';
+export 'src/shared/codec.dart';
 export 'src/shared/codec_registry.dart';
 export 'src/shared/message.dart' show frame, GrpcMessage, grpcDecompressor;
 export 'src/shared/status.dart' show GrpcError;
diff --git a/lib/src/client/call.dart b/lib/src/client/call.dart
index 5da2703b..8d5918f8 100644
--- a/lib/src/client/call.dart
+++ b/lib/src/client/call.dart
@@ -16,7 +16,7 @@
 import 'dart:async';
 import 'dart:developer';
 
-import '../shared/codec/codec.dart';
+import '../shared/codec.dart';
 import '../shared/message.dart';
 import '../shared/profiler.dart';
 import '../shared/status.dart';
diff --git a/lib/src/client/http2_connection.dart b/lib/src/client/http2_connection.dart
index 15293333..998410a1 100644
--- a/lib/src/client/http2_connection.dart
+++ b/lib/src/client/http2_connection.dart
@@ -20,7 +20,7 @@ import 'dart:typed_data';
 
 import 'package:http2/transport.dart';
 
-import '../shared/codec/codec.dart';
+import '../shared/codec.dart';
 import '../shared/timeout.dart';
 import 'call.dart';
 import 'client_keepalive.dart';
diff --git a/lib/src/client/transport/http2_transport.dart b/lib/src/client/transport/http2_transport.dart
index fcb7c5d9..a55c5396 100644
--- a/lib/src/client/transport/http2_transport.dart
+++ b/lib/src/client/transport/http2_transport.dart
@@ -17,7 +17,7 @@ import 'dart:async';
 
 import 'package:http2/transport.dart';
 
-import '../../shared/codec/codec.dart';
+import '../../shared/codec.dart';
 import '../../shared/codec_registry.dart';
 import '../../shared/message.dart';
 import '../../shared/streams.dart';
diff --git a/lib/src/server/handler.dart b/lib/src/server/handler.dart
index 72d92b1f..f28963cc 100644
--- a/lib/src/server/handler.dart
+++ b/lib/src/server/handler.dart
@@ -18,7 +18,7 @@ import 'dart:convert';
 
 import 'package:http2/transport.dart';
 
-import '../shared/codec/codec.dart';
+import '../shared/codec.dart';
 import '../shared/codec_registry.dart';
 import '../shared/io_bits/io_bits.dart' show InternetAddress, X509Certificate;
 import '../shared/message.dart';
diff --git a/lib/src/shared/codec/codec.dart b/lib/src/shared/codec.dart
similarity index 82%
rename from lib/src/shared/codec/codec.dart
rename to lib/src/shared/codec.dart
index 6e29a48a..eae77496 100644
--- a/lib/src/shared/codec/codec.dart
+++ b/lib/src/shared/codec.dart
@@ -13,6 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-export 'codec_all.dart';
-export 'codec_io.dart'
-    if (dart.library.js_interop) 'codec_web.dart'; // package:web implementation
+export 'codec/codec_all.dart';
+export 'codec/codec_io.dart'
+    if (dart.library.js_interop) 'codec/codec_web.dart'; // package:web implementation
diff --git a/lib/src/shared/codec_registry.dart b/lib/src/shared/codec_registry.dart
index afd1636d..73c05581 100644
--- a/lib/src/shared/codec_registry.dart
+++ b/lib/src/shared/codec_registry.dart
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'codec/codec.dart';
+import 'codec.dart';
 
 /// Encloses classes related to the compression and decompression of messages.
 class CodecRegistry {
diff --git a/lib/src/shared/message.dart b/lib/src/shared/message.dart
index 685a2324..0533c555 100644
--- a/lib/src/shared/message.dart
+++ b/lib/src/shared/message.dart
@@ -16,7 +16,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'codec/codec.dart';
+import 'codec.dart';
 import 'codec_registry.dart';
 import 'status.dart';
 
diff --git a/test/grpc_compression_flag_test.dart b/test/grpc_compression_flag_test.dart
index 51e0b21a..97ece918 100644
--- a/test/grpc_compression_flag_test.dart
+++ b/test/grpc_compression_flag_test.dart
@@ -15,7 +15,7 @@
 
 @TestOn('vm')
 
-import 'package:grpc/src/shared/codec/codec.dart';
+import 'package:grpc/src/shared/codec.dart';
 import 'package:grpc/src/shared/message.dart';
 import 'package:test/test.dart';
 
diff --git a/test/shared_tests/codec_registry_test.dart b/test/shared_tests/codec_registry_test.dart
index 13381c2b..55de10ee 100644
--- a/test/shared_tests/codec_registry_test.dart
+++ b/test/shared_tests/codec_registry_test.dart
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'package:grpc/src/shared/codec/codec.dart';
+import 'package:grpc/src/shared/codec.dart';
 import 'package:grpc/src/shared/codec_registry.dart';
 import 'package:test/test.dart';