diff --git a/serde.nim b/serde.nim
index 5579b8b..db31316 100644
--- a/serde.nim
+++ b/serde.nim
@@ -1,13 +1,3 @@
-import ./serde/common
-import ./serde/deserializer
-import ./serde/stdjson
-import ./serde/pragmas
-import ./serde/serializer
-import ./serde/types
+import ./serde/json
 
-export common
-export deserializer
-export stdjson
-export pragmas
-export serializer
-export types
+export json
diff --git a/serde/json.nim b/serde/json.nim
new file mode 100644
index 0000000..bd0a738
--- /dev/null
+++ b/serde/json.nim
@@ -0,0 +1,13 @@
+import ./json/common
+import ./json/deserializer
+import ./json/stdjson
+import ./json/pragmas
+import ./json/serializer
+import ./json/types
+
+export common
+export deserializer
+export stdjson
+export pragmas
+export serializer
+export types
\ No newline at end of file
diff --git a/serde/common.nim b/serde/json/common.nim
similarity index 100%
rename from serde/common.nim
rename to serde/json/common.nim
diff --git a/serde/deserializer.nim b/serde/json/deserializer.nim
similarity index 100%
rename from serde/deserializer.nim
rename to serde/json/deserializer.nim
diff --git a/serde/errors.nim b/serde/json/errors.nim
similarity index 100%
rename from serde/errors.nim
rename to serde/json/errors.nim
diff --git a/serde/pragmas.nim b/serde/json/pragmas.nim
similarity index 100%
rename from serde/pragmas.nim
rename to serde/json/pragmas.nim
diff --git a/serde/serializer.nim b/serde/json/serializer.nim
similarity index 100%
rename from serde/serializer.nim
rename to serde/json/serializer.nim
diff --git a/serde/stdjson.nim b/serde/json/stdjson.nim
similarity index 100%
rename from serde/stdjson.nim
rename to serde/json/stdjson.nim
diff --git a/serde/types.nim b/serde/json/types.nim
similarity index 100%
rename from serde/types.nim
rename to serde/json/types.nim
diff --git a/tests/testDeserialize.nim b/tests/json/testDeserialize.nim
similarity index 100%
rename from tests/testDeserialize.nim
rename to tests/json/testDeserialize.nim
diff --git a/tests/testDeserializeModes.nim b/tests/json/testDeserializeModes.nim
similarity index 100%
rename from tests/testDeserializeModes.nim
rename to tests/json/testDeserializeModes.nim
diff --git a/tests/testPragmas.nim b/tests/json/testPragmas.nim
similarity index 100%
rename from tests/testPragmas.nim
rename to tests/json/testPragmas.nim
diff --git a/tests/testSerialize.nim b/tests/json/testSerialize.nim
similarity index 99%
rename from tests/testSerialize.nim
rename to tests/json/testSerialize.nim
index 5d130bd..a97c895 100644
--- a/tests/testSerialize.nim
+++ b/tests/json/testSerialize.nim
@@ -5,7 +5,7 @@ import pkg/stint
 import pkg/serde
 import pkg/questionable
 
-import ./helpers
+import ../helpers
 
 suite "json serialization - serialize":
 
diff --git a/tests/testSerializeModes.nim b/tests/json/testSerializeModes.nim
similarity index 100%
rename from tests/testSerializeModes.nim
rename to tests/json/testSerializeModes.nim
diff --git a/tests/test.nim b/tests/test.nim
index 0707642..760b01b 100644
--- a/tests/test.nim
+++ b/tests/test.nim
@@ -1,7 +1,7 @@
-import ./testPragmas
-import ./testSerialize
-import ./testSerializeModes
-import ./testDeserialize
-import ./testDeserializeModes
+import ./json/testDeserialize
+import ./json/testDeserializeModes
+import ./json/testPragmas
+import ./json/testSerialize
+import ./json/testSerializeModes
 
 {.warning[UnusedImport]:off.}