diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index 15e772f..20adc6a 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -28,8 +28,8 @@
 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
-#include "core/fxcodec/codec/iccmodule.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/icc/iccmodule.h"
 #include "core/fxcrt/fx_memory.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/maybe_owned.h"
diff --git a/core/fpdfapi/page/cpdf_iccprofile.cpp b/core/fpdfapi/page/cpdf_iccprofile.cpp
index ce522f2..f8d40e4 100644
--- a/core/fpdfapi/page/cpdf_iccprofile.cpp
+++ b/core/fpdfapi/page/cpdf_iccprofile.cpp
@@ -7,7 +7,7 @@
 #include "core/fpdfapi/page/cpdf_iccprofile.h"
 
 #include "core/fpdfapi/parser/cpdf_stream.h"
-#include "core/fxcodec/codec/iccmodule.h"
+#include "core/fxcodec/icc/iccmodule.h"
 
 namespace {
 
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index e3d46c2..d405113 100644
--- a/core/fpdfapi/page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -24,8 +24,8 @@
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fpdfapi/render/cpdf_dibbase.h"
 #include "core/fpdfapi/render/cpdf_pagerendercache.h"
-#include "core/fxcodec/codec/jpegmodule.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/jpeg/jpegmodule.h"
 #include "core/fxcrt/fx_stream.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
 #include "core/fxge/fx_dib.h"
diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp
index 6e8aaaf..0838a53 100644
--- a/core/fpdfapi/page/cpdf_streamparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamparser.cpp
@@ -26,9 +26,9 @@
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
-#include "core/fxcodec/codec/jpegmodule.h"
 #include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/jpeg/jpegmodule.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp
index 67e2058..47024a4 100644
--- a/core/fpdfapi/parser/cpdf_document.cpp
+++ b/core/fpdfapi/parser/cpdf_document.cpp
@@ -22,7 +22,7 @@
 #include "core/fpdfapi/parser/cpdf_stream.h"
 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
-#include "core/fxcodec/JBig2_DocumentContext.h"
+#include "core/fxcodec/jbig2/JBig2_DocumentContext.h"
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxge/fx_font.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp
index 60692af..138c44e 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp
@@ -17,9 +17,9 @@
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
-#include "core/fxcodec/codec/faxmodule.h"
-#include "core/fxcodec/codec/flatemodule.h"
 #include "core/fxcodec/codec/scanlinedecoder.h"
+#include "core/fxcodec/fax/faxmodule.h"
+#include "core/fxcodec/flate/flatemodule.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_safe_types.h"
diff --git a/core/fpdfapi/render/cpdf_dibbase.cpp b/core/fpdfapi/render/cpdf_dibbase.cpp
index efbade6..9ca46f8 100644
--- a/core/fpdfapi/render/cpdf_dibbase.cpp
+++ b/core/fpdfapi/render/cpdf_dibbase.cpp
@@ -23,13 +23,13 @@
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
 #include "core/fpdfapi/render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/render/cpdf_renderstatus.h"
-#include "core/fxcodec/codec/basicmodule.h"
-#include "core/fxcodec/codec/cjpx_decoder.h"
-#include "core/fxcodec/codec/jbig2module.h"
-#include "core/fxcodec/codec/jpegmodule.h"
-#include "core/fxcodec/codec/jpxmodule.h"
+#include "core/fxcodec/basic/basicmodule.h"
 #include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/jbig2/jbig2module.h"
+#include "core/fxcodec/jpeg/jpegmodule.h"
+#include "core/fxcodec/jpx/cjpx_decoder.h"
+#include "core/fxcodec/jpx/jpxmodule.h"
 #include "core/fxcrt/cfx_fixedbufgrow.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn
index 4a012fe..cab5d9e 100644
--- a/core/fxcodec/BUILD.gn
+++ b/core/fxcodec/BUILD.gn
@@ -8,33 +8,23 @@
 
 jumbo_source_set("fxcodec") {
   sources = [
-    "JBig2_DocumentContext.cpp",
-    "JBig2_DocumentContext.h",
-    "codec/basicmodule.cpp",
-    "codec/basicmodule.h",
+    "basic/basicmodule.cpp",
+    "basic/basicmodule.h",
     "codec/cfx_codec_memory.cpp",
     "codec/cfx_codec_memory.h",
-    "codec/cjpx_decoder.cpp",
-    "codec/cjpx_decoder.h",
     "codec/codec_int.h",
     "codec/codec_module_iface.h",
-    "codec/faxmodule.cpp",
-    "codec/faxmodule.h",
-    "codec/flatemodule.cpp",
-    "codec/flatemodule.h",
-    "codec/iccmodule.cpp",
-    "codec/iccmodule.h",
-    "codec/jbig2module.cpp",
-    "codec/jbig2module.h",
-    "codec/jpegmodule.cpp",
-    "codec/jpegmodule.h",
-    "codec/jpxmodule.cpp",
-    "codec/jpxmodule.h",
     "codec/scanlinedecoder.cpp",
     "codec/scanlinedecoder.h",
+    "fax/faxmodule.cpp",
+    "fax/faxmodule.h",
+    "flate/flatemodule.cpp",
+    "flate/flatemodule.h",
     "fx_codec.cpp",
     "fx_codec.h",
     "fx_codec_def.h",
+    "icc/iccmodule.cpp",
+    "icc/iccmodule.h",
     "jbig2/JBig2_ArithDecoder.cpp",
     "jbig2/JBig2_ArithDecoder.h",
     "jbig2/JBig2_ArithIntDecoder.cpp",
@@ -44,6 +34,8 @@
     "jbig2/JBig2_Context.cpp",
     "jbig2/JBig2_Context.h",
     "jbig2/JBig2_Define.h",
+    "jbig2/JBig2_DocumentContext.cpp",
+    "jbig2/JBig2_DocumentContext.h",
     "jbig2/JBig2_GrdProc.cpp",
     "jbig2/JBig2_GrdProc.h",
     "jbig2/JBig2_GrrdProc.cpp",
@@ -69,6 +61,14 @@
     "jbig2/JBig2_SymbolDict.h",
     "jbig2/JBig2_TrdProc.cpp",
     "jbig2/JBig2_TrdProc.h",
+    "jbig2/jbig2module.cpp",
+    "jbig2/jbig2module.h",
+    "jpeg/jpegmodule.cpp",
+    "jpeg/jpegmodule.h",
+    "jpx/cjpx_decoder.cpp",
+    "jpx/cjpx_decoder.h",
+    "jpx/jpxmodule.cpp",
+    "jpx/jpxmodule.h",
   ]
   configs += [ "../../:pdfium_core_config" ]
   include_dirs = []
diff --git a/core/fxcodec/codec/basicmodule.cpp b/core/fxcodec/basic/basicmodule.cpp
similarity index 99%
rename from core/fxcodec/codec/basicmodule.cpp
rename to core/fxcodec/basic/basicmodule.cpp
index 7de2944..7bae674 100644
--- a/core/fxcodec/codec/basicmodule.cpp
+++ b/core/fxcodec/basic/basicmodule.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcodec/codec/basicmodule.h"
+#include "core/fxcodec/basic/basicmodule.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/core/fxcodec/codec/basicmodule.h b/core/fxcodec/basic/basicmodule.h
similarity index 90%
rename from core/fxcodec/codec/basicmodule.h
rename to core/fxcodec/basic/basicmodule.h
index 92c5ea5..6b70d89 100644
--- a/core/fxcodec/codec/basicmodule.h
+++ b/core/fxcodec/basic/basicmodule.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_BASICMODULE_H_
-#define CORE_FXCODEC_CODEC_BASICMODULE_H_
+#ifndef CORE_FXCODEC_BASIC_BASICMODULE_H_
+#define CORE_FXCODEC_BASIC_BASICMODULE_H_
 
 #include <memory>
 
@@ -43,4 +43,4 @@
 
 using BasicModule = fxcodec::BasicModule;
 
-#endif  // CORE_FXCODEC_CODEC_BASICMODULE_H_
+#endif  // CORE_FXCODEC_BASIC_BASICMODULE_H_
diff --git a/core/fxcodec/codec/fx_codec_a85_unittest.cpp b/core/fxcodec/codec/fx_codec_a85_unittest.cpp
index 0449ed4..fd52bb2 100644
--- a/core/fxcodec/codec/fx_codec_a85_unittest.cpp
+++ b/core/fxcodec/codec/fx_codec_a85_unittest.cpp
@@ -7,7 +7,7 @@
 #include <limits>
 #include <memory>
 
-#include "core/fxcodec/codec/basicmodule.h"
+#include "core/fxcodec/basic/basicmodule.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fxcodec, A85TestBadInputs) {
diff --git a/core/fxcodec/codec/fx_codec_rle_unittest.cpp b/core/fxcodec/codec/fx_codec_rle_unittest.cpp
index 2aecaaf..c8141ca 100644
--- a/core/fxcodec/codec/fx_codec_rle_unittest.cpp
+++ b/core/fxcodec/codec/fx_codec_rle_unittest.cpp
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
-#include "core/fxcodec/codec/basicmodule.h"
+#include "core/fxcodec/basic/basicmodule.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fxcodec, RLETestBadInputs) {
diff --git a/core/fxcodec/codec/progressivedecoder.h b/core/fxcodec/codec/progressivedecoder.h
index 24817d6..2a836d0 100644
--- a/core/fxcodec/codec/progressivedecoder.h
+++ b/core/fxcodec/codec/progressivedecoder.h
@@ -11,8 +11,8 @@
 #include <utility>
 #include <vector>
 
-#include "core/fxcodec/codec/jpegmodule.h"
 #include "core/fxcodec/fx_codec_def.h"
+#include "core/fxcodec/jpeg/jpegmodule.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxcrt/unowned_ptr.h"
diff --git a/core/fxcodec/codec/faxmodule.cpp b/core/fxcodec/fax/faxmodule.cpp
similarity index 99%
rename from core/fxcodec/codec/faxmodule.cpp
rename to core/fxcodec/fax/faxmodule.cpp
index 89b60ec..75e79a2c 100644
--- a/core/fxcodec/codec/faxmodule.cpp
+++ b/core/fxcodec/fax/faxmodule.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/faxmodule.h"
+#include "core/fxcodec/fax/faxmodule.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/core/fxcodec/codec/faxmodule.h b/core/fxcodec/fax/faxmodule.h
similarity index 92%
rename from core/fxcodec/codec/faxmodule.h
rename to core/fxcodec/fax/faxmodule.h
index f665c08..ba37bfb 100644
--- a/core/fxcodec/codec/faxmodule.h
+++ b/core/fxcodec/fax/faxmodule.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_FAXMODULE_H_
-#define CORE_FXCODEC_CODEC_FAXMODULE_H_
+#ifndef CORE_FXCODEC_FAX_FAXMODULE_H_
+#define CORE_FXCODEC_FAX_FAXMODULE_H_
 
 #include <memory>
 
@@ -58,4 +58,4 @@
 
 using FaxModule = fxcodec::FaxModule;
 
-#endif  // CORE_FXCODEC_CODEC_FAXMODULE_H_
+#endif  // CORE_FXCODEC_FAX_FAXMODULE_H_
diff --git a/core/fxcodec/codec/flatemodule.cpp b/core/fxcodec/flate/flatemodule.cpp
similarity index 99%
rename from core/fxcodec/codec/flatemodule.cpp
rename to core/fxcodec/flate/flatemodule.cpp
index eb51421..45613b9 100644
--- a/core/fxcodec/codec/flatemodule.cpp
+++ b/core/fxcodec/flate/flatemodule.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/flatemodule.h"
+#include "core/fxcodec/flate/flatemodule.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/core/fxcodec/codec/flatemodule.h b/core/fxcodec/flate/flatemodule.h
similarity index 91%
rename from core/fxcodec/codec/flatemodule.h
rename to core/fxcodec/flate/flatemodule.h
index eef1c06..5a34b6a 100644
--- a/core/fxcodec/codec/flatemodule.h
+++ b/core/fxcodec/flate/flatemodule.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_FLATEMODULE_H_
-#define CORE_FXCODEC_CODEC_FLATEMODULE_H_
+#ifndef CORE_FXCODEC_FLATE_FLATEMODULE_H_
+#define CORE_FXCODEC_FLATE_FLATEMODULE_H_
 
 #include <memory>
 
@@ -56,4 +56,4 @@
 
 using FlateModule = fxcodec::FlateModule;
 
-#endif  // CORE_FXCODEC_CODEC_FLATEMODULE_H_
+#endif  // CORE_FXCODEC_FLATE_FLATEMODULE_H_
diff --git a/core/fxcodec/fx_codec.cpp b/core/fxcodec/fx_codec.cpp
index 5ed6f01..18c745e 100644
--- a/core/fxcodec/fx_codec.cpp
+++ b/core/fxcodec/fx_codec.cpp
@@ -12,8 +12,8 @@
 #include <utility>
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/fxcodec/codec/jbig2module.h"
-#include "core/fxcodec/codec/jpegmodule.h"
+#include "core/fxcodec/jbig2/jbig2module.h"
+#include "core/fxcodec/jpeg/jpegmodule.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "third_party/base/logging.h"
diff --git a/core/fxcodec/codec/iccmodule.cpp b/core/fxcodec/icc/iccmodule.cpp
similarity index 98%
rename from core/fxcodec/codec/iccmodule.cpp
rename to core/fxcodec/icc/iccmodule.cpp
index 83eebc7..6927749 100644
--- a/core/fxcodec/codec/iccmodule.cpp
+++ b/core/fxcodec/icc/iccmodule.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/iccmodule.h"
+#include "core/fxcodec/icc/iccmodule.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/core/fxcodec/codec/iccmodule.h b/core/fxcodec/icc/iccmodule.h
similarity index 93%
rename from core/fxcodec/codec/iccmodule.h
rename to core/fxcodec/icc/iccmodule.h
index c09b32f..a031172 100644
--- a/core/fxcodec/codec/iccmodule.h
+++ b/core/fxcodec/icc/iccmodule.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_ICCMODULE_H_
-#define CORE_FXCODEC_CODEC_ICCMODULE_H_
+#ifndef CORE_FXCODEC_ICC_ICCMODULE_H_
+#define CORE_FXCODEC_ICC_ICCMODULE_H_
 
 #include <memory>
 
@@ -65,4 +65,4 @@
 using CLcmsCmm = fxcodec::CLcmsCmm;
 using IccModule = fxcodec::IccModule;
 
-#endif  // CORE_FXCODEC_CODEC_ICCMODULE_H_
+#endif  // CORE_FXCODEC_ICC_ICCMODULE_H_
diff --git a/core/fxcodec/JBig2_DocumentContext.cpp b/core/fxcodec/jbig2/JBig2_DocumentContext.cpp
similarity index 89%
rename from core/fxcodec/JBig2_DocumentContext.cpp
rename to core/fxcodec/jbig2/JBig2_DocumentContext.cpp
index 6e29259..bca92fe 100644
--- a/core/fxcodec/JBig2_DocumentContext.cpp
+++ b/core/fxcodec/jbig2/JBig2_DocumentContext.cpp
@@ -4,7 +4,7 @@
 //
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/JBig2_DocumentContext.h"
+#include "core/fxcodec/jbig2/JBig2_DocumentContext.h"
 
 #include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/fxcodec/jbig2/JBig2_SymbolDict.h"
diff --git a/core/fxcodec/JBig2_DocumentContext.h b/core/fxcodec/jbig2/JBig2_DocumentContext.h
similarity index 82%
rename from core/fxcodec/JBig2_DocumentContext.h
rename to core/fxcodec/jbig2/JBig2_DocumentContext.h
index 9e5d3b3..9bcdd37 100644
--- a/core/fxcodec/JBig2_DocumentContext.h
+++ b/core/fxcodec/jbig2/JBig2_DocumentContext.h
@@ -4,8 +4,8 @@
 //
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_JBIG2_DOCUMENTCONTEXT_H_
-#define CORE_FXCODEC_JBIG2_DOCUMENTCONTEXT_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
+#define CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
 
 #include <list>
 #include <memory>
@@ -31,4 +31,4 @@
   std::list<CJBig2_CachePair> m_SymbolDictCache;
 };
 
-#endif  // CORE_FXCODEC_JBIG2_DOCUMENTCONTEXT_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
index 9a95c8f..df6e207 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
@@ -10,7 +10,7 @@
 #include <memory>
 #include <utility>
 
-#include "core/fxcodec/codec/faxmodule.h"
+#include "core/fxcodec/fax/faxmodule.h"
 #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
 #include "core/fxcodec/jbig2/JBig2_BitStream.h"
 #include "core/fxcodec/jbig2/JBig2_Image.h"
diff --git a/core/fxcodec/codec/jbig2module.cpp b/core/fxcodec/jbig2/jbig2module.cpp
similarity index 96%
rename from core/fxcodec/codec/jbig2module.cpp
rename to core/fxcodec/jbig2/jbig2module.cpp
index bf47288..6f99143 100644
--- a/core/fxcodec/codec/jbig2module.cpp
+++ b/core/fxcodec/jbig2/jbig2module.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/jbig2module.h"
+#include "core/fxcodec/jbig2/jbig2module.h"
 
-#include "core/fxcodec/JBig2_DocumentContext.h"
 #include "core/fxcodec/jbig2/JBig2_Context.h"
+#include "core/fxcodec/jbig2/JBig2_DocumentContext.h"
 #include "third_party/base/ptr_util.h"
 
 namespace fxcodec {
diff --git a/core/fxcodec/codec/jbig2module.h b/core/fxcodec/jbig2/jbig2module.h
similarity index 92%
rename from core/fxcodec/codec/jbig2module.h
rename to core/fxcodec/jbig2/jbig2module.h
index 18cb127..6f9b0bb 100644
--- a/core/fxcodec/codec/jbig2module.h
+++ b/core/fxcodec/jbig2/jbig2module.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_JBIG2MODULE_H_
-#define CORE_FXCODEC_CODEC_JBIG2MODULE_H_
+#ifndef CORE_FXCODEC_JBIG2_JBIG2MODULE_H_
+#define CORE_FXCODEC_JBIG2_JBIG2MODULE_H_
 
 #include <memory>
 
@@ -65,4 +65,4 @@
 using Jbig2Context = fxcodec::Jbig2Context;
 using Jbig2Module = fxcodec::Jbig2Module;
 
-#endif  // CORE_FXCODEC_CODEC_JBIG2MODULE_H_
+#endif  // CORE_FXCODEC_JBIG2_JBIG2MODULE_H_
diff --git a/core/fxcodec/codec/DEPS b/core/fxcodec/jpeg/DEPS
similarity index 100%
rename from core/fxcodec/codec/DEPS
rename to core/fxcodec/jpeg/DEPS
diff --git a/core/fxcodec/codec/jpegmodule.cpp b/core/fxcodec/jpeg/jpegmodule.cpp
similarity index 99%
rename from core/fxcodec/codec/jpegmodule.cpp
rename to core/fxcodec/jpeg/jpegmodule.cpp
index c1b0025..b7401af 100644
--- a/core/fxcodec/codec/jpegmodule.cpp
+++ b/core/fxcodec/jpeg/jpegmodule.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/jpegmodule.h"
+#include "core/fxcodec/jpeg/jpegmodule.h"
 
 #include <setjmp.h>
 
diff --git a/core/fxcodec/codec/jpegmodule.h b/core/fxcodec/jpeg/jpegmodule.h
similarity index 93%
rename from core/fxcodec/codec/jpegmodule.h
rename to core/fxcodec/jpeg/jpegmodule.h
index 243f869..ee5658a 100644
--- a/core/fxcodec/codec/jpegmodule.h
+++ b/core/fxcodec/jpeg/jpegmodule.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_JPEGMODULE_H_
-#define CORE_FXCODEC_CODEC_JPEGMODULE_H_
+#ifndef CORE_FXCODEC_JPEG_JPEGMODULE_H_
+#define CORE_FXCODEC_JPEG_JPEGMODULE_H_
 
 #include <csetjmp>
 #include <memory>
@@ -68,4 +68,4 @@
 
 using JpegModule = fxcodec::JpegModule;
 
-#endif  // CORE_FXCODEC_CODEC_JPEGMODULE_H_
+#endif  // CORE_FXCODEC_JPEG_JPEGMODULE_H_
diff --git a/core/fxcodec/codec/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp
similarity index 99%
rename from core/fxcodec/codec/cjpx_decoder.cpp
rename to core/fxcodec/jpx/cjpx_decoder.cpp
index 9367b6c..118aaf2 100644
--- a/core/fxcodec/codec/cjpx_decoder.cpp
+++ b/core/fxcodec/jpx/cjpx_decoder.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/cjpx_decoder.h"
+#include "core/fxcodec/jpx/cjpx_decoder.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/core/fxcodec/codec/cjpx_decoder.h b/core/fxcodec/jpx/cjpx_decoder.h
similarity index 90%
rename from core/fxcodec/codec/cjpx_decoder.h
rename to core/fxcodec/jpx/cjpx_decoder.h
index 3b3889e..8c607e2 100644
--- a/core/fxcodec/codec/cjpx_decoder.h
+++ b/core/fxcodec/jpx/cjpx_decoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_CJPX_DECODER_H_
-#define CORE_FXCODEC_CODEC_CJPX_DECODER_H_
+#ifndef CORE_FXCODEC_JPX_CJPX_DECODER_H_
+#define CORE_FXCODEC_JPX_CJPX_DECODER_H_
 
 #include <memory>
 #include <vector>
@@ -48,4 +48,4 @@
   opj_dparameters_t m_Parameters;
 };
 
-#endif  // CORE_FXCODEC_CODEC_CJPX_DECODER_H_
+#endif  // CORE_FXCODEC_JPX_CJPX_DECODER_H_
diff --git a/core/fxcodec/codec/jpxmodule.cpp b/core/fxcodec/jpx/jpxmodule.cpp
similarity index 93%
rename from core/fxcodec/codec/jpxmodule.cpp
rename to core/fxcodec/jpx/jpxmodule.cpp
index f20ccad..4229dc5 100644
--- a/core/fxcodec/codec/jpxmodule.cpp
+++ b/core/fxcodec/jpx/jpxmodule.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/jpxmodule.h"
+#include "core/fxcodec/jpx/jpxmodule.h"
 
 #include "third_party/base/ptr_util.h"
 
diff --git a/core/fxcodec/codec/jpxmodule.h b/core/fxcodec/jpx/jpxmodule.h
similarity index 81%
rename from core/fxcodec/codec/jpxmodule.h
rename to core/fxcodec/jpx/jpxmodule.h
index a35a22e..0f2fb71 100644
--- a/core/fxcodec/codec/jpxmodule.h
+++ b/core/fxcodec/jpx/jpxmodule.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_JPXMODULE_H_
-#define CORE_FXCODEC_CODEC_JPXMODULE_H_
+#ifndef CORE_FXCODEC_JPX_JPXMODULE_H_
+#define CORE_FXCODEC_JPX_JPXMODULE_H_
 
 #include <memory>
 #include <vector>
 
-#include "core/fxcodec/codec/cjpx_decoder.h"
+#include "core/fxcodec/jpx/cjpx_decoder.h"
 #include "core/fxcrt/fx_system.h"
 #include "third_party/base/span.h"
 
@@ -31,4 +31,4 @@
 
 using JpxModule = fxcodec::JpxModule;
 
-#endif  // CORE_FXCODEC_CODEC_JPXMODULE_H_
+#endif  // CORE_FXCODEC_JPX_JPXMODULE_H_