diff --git a/README.md b/README.md
index 365637bef8..a1e7bc3955 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Here are the dedicated documentations of modules:
 - [prettier](prettier/README.md)
 - [strings](strings/README.md)
 - [testing](testing/README.md)
-- [toml](toml/README.md)
+- [toml](encoding/toml/README.md)
 - [ws](ws/README.md)
 
 ## Contributing
diff --git a/toml/README.md b/encoding/README.md
similarity index 100%
rename from toml/README.md
rename to encoding/README.md
diff --git a/toml/test.ts b/encoding/test.ts
similarity index 73%
rename from toml/test.ts
rename to encoding/test.ts
index 16be28c8d2..4ee03572dc 100644
--- a/toml/test.ts
+++ b/encoding/test.ts
@@ -1,2 +1,2 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import "./parser_test.ts";
+import "./toml_test.ts";
diff --git a/toml/testdata/CRLF.toml b/encoding/testdata/CRLF.toml
similarity index 100%
rename from toml/testdata/CRLF.toml
rename to encoding/testdata/CRLF.toml
diff --git a/toml/testdata/arrayTable.toml b/encoding/testdata/arrayTable.toml
similarity index 100%
rename from toml/testdata/arrayTable.toml
rename to encoding/testdata/arrayTable.toml
diff --git a/toml/testdata/arrays.toml b/encoding/testdata/arrays.toml
similarity index 100%
rename from toml/testdata/arrays.toml
rename to encoding/testdata/arrays.toml
diff --git a/toml/testdata/boolean.toml b/encoding/testdata/boolean.toml
similarity index 100%
rename from toml/testdata/boolean.toml
rename to encoding/testdata/boolean.toml
diff --git a/toml/testdata/cargo.toml b/encoding/testdata/cargo.toml
similarity index 100%
rename from toml/testdata/cargo.toml
rename to encoding/testdata/cargo.toml
diff --git a/toml/testdata/cargoTest.toml b/encoding/testdata/cargoTest.toml
similarity index 100%
rename from toml/testdata/cargoTest.toml
rename to encoding/testdata/cargoTest.toml
diff --git a/toml/testdata/datetime.toml b/encoding/testdata/datetime.toml
similarity index 100%
rename from toml/testdata/datetime.toml
rename to encoding/testdata/datetime.toml
diff --git a/toml/testdata/float.toml b/encoding/testdata/float.toml
similarity index 100%
rename from toml/testdata/float.toml
rename to encoding/testdata/float.toml
diff --git a/toml/testdata/inlineTable.toml b/encoding/testdata/inlineTable.toml
similarity index 100%
rename from toml/testdata/inlineTable.toml
rename to encoding/testdata/inlineTable.toml
diff --git a/toml/testdata/integer.toml b/encoding/testdata/integer.toml
similarity index 100%
rename from toml/testdata/integer.toml
rename to encoding/testdata/integer.toml
diff --git a/toml/testdata/simple.toml b/encoding/testdata/simple.toml
similarity index 100%
rename from toml/testdata/simple.toml
rename to encoding/testdata/simple.toml
diff --git a/toml/testdata/string.toml b/encoding/testdata/string.toml
similarity index 100%
rename from toml/testdata/string.toml
rename to encoding/testdata/string.toml
diff --git a/toml/testdata/table.toml b/encoding/testdata/table.toml
similarity index 100%
rename from toml/testdata/table.toml
rename to encoding/testdata/table.toml
diff --git a/toml/parser.ts b/encoding/toml.ts
similarity index 100%
rename from toml/parser.ts
rename to encoding/toml.ts
diff --git a/toml/parser_test.ts b/encoding/toml_test.ts
similarity index 98%
rename from toml/parser_test.ts
rename to encoding/toml_test.ts
index 4b53945f4c..13d4f0b145 100644
--- a/toml/parser_test.ts
+++ b/encoding/toml_test.ts
@@ -3,9 +3,10 @@ import { test } from "../testing/mod.ts";
 import { assertEquals } from "../testing/asserts.ts";
 import { existsSync } from "../fs/exists.ts";
 import { readFileStrSync } from "../fs/read_file_str.ts";
-import { parse, stringify } from "./parser.ts";
+import { parse, stringify } from "./toml.ts";
 import * as path from "../fs/path/mod.ts";
-const testFilesDir = path.resolve("toml", "testdata");
+
+const testFilesDir = path.resolve("encoding", "testdata");
 
 function parseFile(filePath: string): object {
   if (!existsSync(filePath)) {
diff --git a/test.ts b/test.ts
index fa44c30444..6bd3c17a7a 100755
--- a/test.ts
+++ b/test.ts
@@ -3,6 +3,7 @@
 import "./archive/tar_test.ts";
 import "./colors/test.ts";
 import "./datetime/test.ts";
+import "./encoding/test.ts";
 import "./examples/test.ts";
 import "./flags/test.ts";
 import "./fs/test.ts";
@@ -16,7 +17,6 @@ import "./prettier/test.ts";
 import "./strings/test.ts";
 import "./testing/test.ts";
 import "./textproto/test.ts";
-import "./toml/test.ts";
 import "./util/test.ts";
 import "./ws/test.ts";