diff --git a/netlib/encoding.py b/netlib/http/encoding.py
similarity index 100%
rename from netlib/encoding.py
rename to netlib/http/encoding.py
diff --git a/netlib/http/message.py b/netlib/http/message.py
index 62c3aa382..772a124e6 100644
--- a/netlib/http/message.py
+++ b/netlib/http/message.py
@@ -3,7 +3,7 @@ import warnings
 from typing import Optional
 
 from mitmproxy.utils import strutils
-from netlib import encoding
+from netlib.http import encoding
 from mitmproxy.types import serializable
 from netlib.http import headers
 
diff --git a/test/netlib/test_encoding.py b/test/netlib/http/test_encoding.py
similarity index 97%
rename from test/netlib/test_encoding.py
rename to test/netlib/http/test_encoding.py
index e1175ef09..681f9bfcf 100644
--- a/test/netlib/test_encoding.py
+++ b/test/netlib/http/test_encoding.py
@@ -1,7 +1,8 @@
 import mock
 import pytest
 
-from netlib import encoding, tutils
+from netlib.http import encoding
+from netlib import tutils
 
 
 @pytest.mark.parametrize("encoder", [