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 = []