diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn
index c101bf2..c2d2bc2 100644
--- a/core/fxcodec/BUILD.gn
+++ b/core/fxcodec/BUILD.gn
@@ -131,11 +131,11 @@
 
 pdfium_unittest_source_set("unittests") {
   sources = [
-    "codec/fx_codec_a85_unittest.cpp",
-    "codec/fx_codec_jpx_unittest.cpp",
-    "codec/fx_codec_rle_unittest.cpp",
+    "basic/a85_unittest.cpp",
+    "basic/rle_unittest.cpp",
     "jbig2/JBig2_BitStream_unittest.cpp",
     "jbig2/JBig2_Image_unittest.cpp",
+    "jpx/jpx_unittest.cpp",
   ]
   deps = [
     ":fxcodec",
@@ -157,7 +157,7 @@
 
 pdfium_embeddertest_source_set("embeddertests") {
   sources = [
-    "codec/fx_codec_embeddertest.cpp",
+    "jbig2/jbig2_embeddertest.cpp",
   ]
   pdfium_root_dir = "../../"
 }
diff --git a/core/fxcodec/DEPS b/core/fxcodec/DEPS
deleted file mode 100644
index ad8cd14..0000000
--- a/core/fxcodec/DEPS
+++ /dev/null
@@ -1,5 +0,0 @@
-include_rules = [
-  '+third_party/lcms',
-  '+third_party/libopenjpeg20',
-  '+third_party/zlib',
-]
diff --git a/core/fxcodec/codec/fx_codec_a85_unittest.cpp b/core/fxcodec/basic/a85_unittest.cpp
similarity index 100%
rename from core/fxcodec/codec/fx_codec_a85_unittest.cpp
rename to core/fxcodec/basic/a85_unittest.cpp
diff --git a/core/fxcodec/codec/fx_codec_rle_unittest.cpp b/core/fxcodec/basic/rle_unittest.cpp
similarity index 100%
rename from core/fxcodec/codec/fx_codec_rle_unittest.cpp
rename to core/fxcodec/basic/rle_unittest.cpp
diff --git a/core/fxcodec/flate/DEPS b/core/fxcodec/flate/DEPS
new file mode 100644
index 0000000..784b7fb
--- /dev/null
+++ b/core/fxcodec/flate/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  '+third_party/zlib',
+]
diff --git a/core/fxcodec/icc/DEPS b/core/fxcodec/icc/DEPS
new file mode 100644
index 0000000..b1d9522
--- /dev/null
+++ b/core/fxcodec/icc/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  '+third_party/lcms',
+]
diff --git a/core/fxcodec/codec/fx_codec_embeddertest.cpp b/core/fxcodec/jbig2/jbig2_embeddertest.cpp
similarity index 86%
rename from core/fxcodec/codec/fx_codec_embeddertest.cpp
rename to core/fxcodec/jbig2/jbig2_embeddertest.cpp
index 825bcae..8acd884 100644
--- a/core/fxcodec/codec/fx_codec_embeddertest.cpp
+++ b/core/fxcodec/jbig2/jbig2_embeddertest.cpp
@@ -8,9 +8,9 @@
 #include "testing/embedder_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class FXCodecEmbedderTest : public EmbedderTest {};
+class JBig2EmbedderTest : public EmbedderTest {};
 
-TEST_F(FXCodecEmbedderTest, Bug_631912) {
+TEST_F(JBig2EmbedderTest, Bug_631912) {
   // Test jbig2 image in PDF file can be loaded successfully.
   // Should not crash.
   EXPECT_TRUE(OpenDocument("bug_631912.pdf"));
diff --git a/core/fxcodec/jpx/DEPS b/core/fxcodec/jpx/DEPS
new file mode 100644
index 0000000..d728e0f
--- /dev/null
+++ b/core/fxcodec/jpx/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  '+third_party/libopenjpeg20',
+]
diff --git a/core/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/fxcodec/jpx/jpx_unittest.cpp
similarity index 100%
rename from core/fxcodec/codec/fx_codec_jpx_unittest.cpp
rename to core/fxcodec/jpx/jpx_unittest.cpp