diff --git a/marshal.go b/marshal.go
index 8cc46251a..1c239a162 100644
--- a/marshal.go
+++ b/marshal.go
@@ -20,11 +20,11 @@ import (
 
 	"gopkg.in/inf.v0"
 
-	"github.com/gocql/gocql/marshal/bigint"
-	"github.com/gocql/gocql/marshal/counter"
-	"github.com/gocql/gocql/marshal/cqlint"
-	"github.com/gocql/gocql/marshal/smallint"
-	"github.com/gocql/gocql/marshal/tinyint"
+	"github.com/gocql/gocql/serialization/bigint"
+	"github.com/gocql/gocql/serialization/counter"
+	"github.com/gocql/gocql/serialization/cqlint"
+	"github.com/gocql/gocql/serialization/smallint"
+	"github.com/gocql/gocql/serialization/tinyint"
 )
 
 var (
diff --git a/marshal/bigint/marshal.go b/serialization/bigint/marshal.go
similarity index 100%
rename from marshal/bigint/marshal.go
rename to serialization/bigint/marshal.go
diff --git a/marshal/bigint/marshal_utils.go b/serialization/bigint/marshal_utils.go
similarity index 100%
rename from marshal/bigint/marshal_utils.go
rename to serialization/bigint/marshal_utils.go
diff --git a/marshal/bigint/unmarshal.go b/serialization/bigint/unmarshal.go
similarity index 100%
rename from marshal/bigint/unmarshal.go
rename to serialization/bigint/unmarshal.go
diff --git a/marshal/bigint/unmarshal_utils.go b/serialization/bigint/unmarshal_utils.go
similarity index 100%
rename from marshal/bigint/unmarshal_utils.go
rename to serialization/bigint/unmarshal_utils.go
diff --git a/marshal/counter/marshal.go b/serialization/counter/marshal.go
similarity index 100%
rename from marshal/counter/marshal.go
rename to serialization/counter/marshal.go
diff --git a/marshal/counter/marshal_utils.go b/serialization/counter/marshal_utils.go
similarity index 100%
rename from marshal/counter/marshal_utils.go
rename to serialization/counter/marshal_utils.go
diff --git a/marshal/counter/unmarshal.go b/serialization/counter/unmarshal.go
similarity index 100%
rename from marshal/counter/unmarshal.go
rename to serialization/counter/unmarshal.go
diff --git a/marshal/counter/unmarshal_utils.go b/serialization/counter/unmarshal_utils.go
similarity index 100%
rename from marshal/counter/unmarshal_utils.go
rename to serialization/counter/unmarshal_utils.go
diff --git a/marshal/cqlint/marshal.go b/serialization/cqlint/marshal.go
similarity index 100%
rename from marshal/cqlint/marshal.go
rename to serialization/cqlint/marshal.go
diff --git a/marshal/cqlint/marshal_utils.go b/serialization/cqlint/marshal_utils.go
similarity index 100%
rename from marshal/cqlint/marshal_utils.go
rename to serialization/cqlint/marshal_utils.go
diff --git a/marshal/cqlint/unmarshal.go b/serialization/cqlint/unmarshal.go
similarity index 100%
rename from marshal/cqlint/unmarshal.go
rename to serialization/cqlint/unmarshal.go
diff --git a/marshal/cqlint/unmarshal_utils.go b/serialization/cqlint/unmarshal_utils.go
similarity index 100%
rename from marshal/cqlint/unmarshal_utils.go
rename to serialization/cqlint/unmarshal_utils.go
diff --git a/marshal/smallint/marshal.go b/serialization/smallint/marshal.go
similarity index 100%
rename from marshal/smallint/marshal.go
rename to serialization/smallint/marshal.go
diff --git a/marshal/smallint/marshal_utils.go b/serialization/smallint/marshal_utils.go
similarity index 100%
rename from marshal/smallint/marshal_utils.go
rename to serialization/smallint/marshal_utils.go
diff --git a/marshal/smallint/unmarshal.go b/serialization/smallint/unmarshal.go
similarity index 100%
rename from marshal/smallint/unmarshal.go
rename to serialization/smallint/unmarshal.go
diff --git a/marshal/smallint/unmarshal_utils.go b/serialization/smallint/unmarshal_utils.go
similarity index 100%
rename from marshal/smallint/unmarshal_utils.go
rename to serialization/smallint/unmarshal_utils.go
diff --git a/marshal/tinyint/marshal.go b/serialization/tinyint/marshal.go
similarity index 100%
rename from marshal/tinyint/marshal.go
rename to serialization/tinyint/marshal.go
diff --git a/marshal/tinyint/marshal_utils.go b/serialization/tinyint/marshal_utils.go
similarity index 100%
rename from marshal/tinyint/marshal_utils.go
rename to serialization/tinyint/marshal_utils.go
diff --git a/marshal/tinyint/unmarshal.go b/serialization/tinyint/unmarshal.go
similarity index 100%
rename from marshal/tinyint/unmarshal.go
rename to serialization/tinyint/unmarshal.go
diff --git a/marshal/tinyint/unmarshal_utils.go b/serialization/tinyint/unmarshal_utils.go
similarity index 100%
rename from marshal/tinyint/unmarshal_utils.go
rename to serialization/tinyint/unmarshal_utils.go
diff --git a/tests/serialization/marshal_2_tinyint_corrupt_test.go b/tests/serialization/marshal_2_tinyint_corrupt_test.go
index 2d53d4e71..ef6157e6a 100644
--- a/tests/serialization/marshal_2_tinyint_corrupt_test.go
+++ b/tests/serialization/marshal_2_tinyint_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/tinyint"
+	"github.com/gocql/gocql/serialization/tinyint"
 )
 
 func TestMarshalTinyintCorrupt(t *testing.T) {
diff --git a/tests/serialization/marshal_2_tinyint_test.go b/tests/serialization/marshal_2_tinyint_test.go
index 98897b547..bc49ddb66 100644
--- a/tests/serialization/marshal_2_tinyint_test.go
+++ b/tests/serialization/marshal_2_tinyint_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/tinyint"
+	"github.com/gocql/gocql/serialization/tinyint"
 )
 
 func TestMarshalTinyint(t *testing.T) {
diff --git a/tests/serialization/marshal_3_smallint_corrupt_test.go b/tests/serialization/marshal_3_smallint_corrupt_test.go
index 3345c6850..ee9289e3d 100644
--- a/tests/serialization/marshal_3_smallint_corrupt_test.go
+++ b/tests/serialization/marshal_3_smallint_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/smallint"
+	"github.com/gocql/gocql/serialization/smallint"
 )
 
 func TestMarshalSmallintCorrupt(t *testing.T) {
diff --git a/tests/serialization/marshal_3_smallint_test.go b/tests/serialization/marshal_3_smallint_test.go
index 46d917d81..999e8fc35 100644
--- a/tests/serialization/marshal_3_smallint_test.go
+++ b/tests/serialization/marshal_3_smallint_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/smallint"
+	"github.com/gocql/gocql/serialization/smallint"
 )
 
 func TestMarshalSmallint(t *testing.T) {
diff --git a/tests/serialization/marshal_4_int_corrupt_test.go b/tests/serialization/marshal_4_int_corrupt_test.go
index 392b138ef..13e1a67aa 100644
--- a/tests/serialization/marshal_4_int_corrupt_test.go
+++ b/tests/serialization/marshal_4_int_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/cqlint"
+	"github.com/gocql/gocql/serialization/cqlint"
 )
 
 func TestMarshalIntCorrupt(t *testing.T) {
diff --git a/tests/serialization/marshal_4_int_test.go b/tests/serialization/marshal_4_int_test.go
index fb5733a7e..3d20d7f9f 100644
--- a/tests/serialization/marshal_4_int_test.go
+++ b/tests/serialization/marshal_4_int_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/cqlint"
+	"github.com/gocql/gocql/serialization/cqlint"
 )
 
 func TestMarshalInt(t *testing.T) {
diff --git a/tests/serialization/marshal_5_bigint_corrupt_test.go b/tests/serialization/marshal_5_bigint_corrupt_test.go
index 99df75ed5..20031928c 100644
--- a/tests/serialization/marshal_5_bigint_corrupt_test.go
+++ b/tests/serialization/marshal_5_bigint_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/bigint"
+	"github.com/gocql/gocql/serialization/bigint"
 )
 
 func TestMarshalBigIntCorrupt(t *testing.T) {
diff --git a/tests/serialization/marshal_5_bigint_test.go b/tests/serialization/marshal_5_bigint_test.go
index 5ac33854b..84e7b7970 100644
--- a/tests/serialization/marshal_5_bigint_test.go
+++ b/tests/serialization/marshal_5_bigint_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/bigint"
+	"github.com/gocql/gocql/serialization/bigint"
 )
 
 func TestMarshalBigInt(t *testing.T) {
diff --git a/tests/serialization/marshal_6_counter_corrupt_test.go b/tests/serialization/marshal_6_counter_corrupt_test.go
index ee3210e65..0ec3e1417 100644
--- a/tests/serialization/marshal_6_counter_corrupt_test.go
+++ b/tests/serialization/marshal_6_counter_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/counter"
+	"github.com/gocql/gocql/serialization/counter"
 )
 
 func TestMarshalCounterCorrupt(t *testing.T) {
diff --git a/tests/serialization/marshal_6_counter_test.go b/tests/serialization/marshal_6_counter_test.go
index f315d9226..50e51955b 100644
--- a/tests/serialization/marshal_6_counter_test.go
+++ b/tests/serialization/marshal_6_counter_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/counter"
+	"github.com/gocql/gocql/serialization/counter"
 )
 
 func TestMarshalCounter(t *testing.T) {