diff --git a/Ladybird/ImageCodecPluginLadybird.cpp b/Ladybird/ImageCodecPluginLadybird.cpp
index bb1687f2e3..40faf29f55 100644
--- a/Ladybird/ImageCodecPluginLadybird.cpp
+++ b/Ladybird/ImageCodecPluginLadybird.cpp
@@ -9,7 +9,7 @@
 
 #include "ImageCodecPluginLadybird.h"
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <QImage>
 
 namespace Ladybird {
diff --git a/Ladybird/WebContentView.cpp b/Ladybird/WebContentView.cpp
index 7f3769c89c..a67f72d865 100644
--- a/Ladybird/WebContentView.cpp
+++ b/Ladybird/WebContentView.cpp
@@ -29,7 +29,7 @@
 #include <LibCore/Timer.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font/FontDatabase.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/Rect.h>
diff --git a/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp b/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp
index 8a701ab518..d64d22bd1f 100644
--- a/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/BMPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
 #include <stdio.h>
 
 extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size)
diff --git a/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp b/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp
index 5de7cb6f79..6730ef50d6 100644
--- a/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp
@@ -7,7 +7,7 @@
 #include <AK/Debug.h>
 #include <AK/DeprecatedString.h>
 #include <AK/Format.h>
-#include <LibGfx/GIFLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp b/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp
index 1e4b995f40..d44337f9a7 100644
--- a/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/ICOLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp b/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp
index c85de25cdd..4b359c7479 100644
--- a/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/JPEGLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp
index e2cc65711b..5141f0bc05 100644
--- a/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PBMLoader.h>
+#include <LibGfx/ImageFormats/PBMLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp
index bea425c068..a07308f46c 100644
--- a/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PGMLoader.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp
index a871d1ef83..50cf86c71e 100644
--- a/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp
index 4b78866e73..5b599f6761 100644
--- a/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PPMLoader.h>
+#include <LibGfx/ImageFormats/PPMLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp b/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp
index caf278b28f..70cc783620 100644
--- a/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/QOILoader.h>
+#include <LibGfx/ImageFormats/QOILoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp b/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp
index 4d1848e0b4..728c931f4d 100644
--- a/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/TGALoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/Tests/LibGL/TestRender.cpp b/Tests/LibGL/TestRender.cpp
index 35f38e8a21..a69e14f725 100644
--- a/Tests/LibGL/TestRender.cpp
+++ b/Tests/LibGL/TestRender.cpp
@@ -11,7 +11,7 @@
 #include <LibGL/GL/gl.h>
 #include <LibGL/GLContext.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibTest/TestCase.h>
 
 #ifdef AK_OS_SERENITY
diff --git a/Tests/LibGL/TestShaders.cpp b/Tests/LibGL/TestShaders.cpp
index f101452131..546e8c5c08 100644
--- a/Tests/LibGL/TestShaders.cpp
+++ b/Tests/LibGL/TestShaders.cpp
@@ -9,7 +9,7 @@
 #include <LibGL/GL/gl.h>
 #include <LibGL/GLContext.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibTest/TestCase.h>
 
 static NonnullOwnPtr<GL::GLContext> create_testing_context(int width, int height)
diff --git a/Tests/LibGfx/TestICCProfile.cpp b/Tests/LibGfx/TestICCProfile.cpp
index a77e3a961c..184365bdff 100644
--- a/Tests/LibGfx/TestICCProfile.cpp
+++ b/Tests/LibGfx/TestICCProfile.cpp
@@ -9,9 +9,9 @@
 #include <LibGfx/ICC/BinaryWriter.h>
 #include <LibGfx/ICC/Profile.h>
 #include <LibGfx/ICC/WellKnownProfiles.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 #include <LibTest/TestCase.h>
 
 #ifdef AK_OS_SERENITY
diff --git a/Tests/LibGfx/TestImageDecoder.cpp b/Tests/LibGfx/TestImageDecoder.cpp
index f5a1533438..e75f0c8fa4 100644
--- a/Tests/LibGfx/TestImageDecoder.cpp
+++ b/Tests/LibGfx/TestImageDecoder.cpp
@@ -7,17 +7,17 @@
 
 #include <AK/DeprecatedString.h>
 #include <LibCore/MappedFile.h>
-#include <LibGfx/BMPLoader.h>
-#include <LibGfx/GIFLoader.h>
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PBMLoader.h>
-#include <LibGfx/PGMLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PPMLoader.h>
-#include <LibGfx/TGALoader.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PBMLoader.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PPMLoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 #include <LibTest/TestCase.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp
index b796b8c586..9e9101f3bf 100644
--- a/Userland/Applications/Browser/BrowserWindow.cpp
+++ b/Userland/Applications/Browser/BrowserWindow.cpp
@@ -32,7 +32,7 @@
 #include <LibGUI/TabWidget.h>
 #include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/Widget.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibJS/Interpreter.h>
 #include <LibWeb/CSS/PreferredColorScheme.h>
 #include <LibWeb/Dump.h>
diff --git a/Userland/Applications/Magnifier/main.cpp b/Userland/Applications/Magnifier/main.cpp
index 7f8273546f..19138489e6 100644
--- a/Userland/Applications/Magnifier/main.cpp
+++ b/Userland/Applications/Magnifier/main.cpp
@@ -18,10 +18,10 @@
 #include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Filters/ColorBlindnessFilter.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibMain/Main.h>
 
 static ErrorOr<ByteBuffer> dump_bitmap(RefPtr<Gfx::Bitmap> bitmap, AK::StringView extension)
diff --git a/Userland/Applications/PixelPaint/Image.cpp b/Userland/Applications/PixelPaint/Image.cpp
index 03940ad014..8c6a979ea4 100644
--- a/Userland/Applications/PixelPaint/Image.cpp
+++ b/Userland/Applications/PixelPaint/Image.cpp
@@ -12,10 +12,10 @@
 #include <AK/Base64.h>
 #include <AK/JsonObject.h>
 #include <LibGUI/Painter.h>
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibImageDecoderClient/Client.h>
 #include <stdio.h>
 
diff --git a/Userland/Demos/Mandelbrot/Mandelbrot.cpp b/Userland/Demos/Mandelbrot/Mandelbrot.cpp
index 405481e1ad..b3c3064d21 100644
--- a/Userland/Demos/Mandelbrot/Mandelbrot.cpp
+++ b/Userland/Demos/Mandelbrot/Mandelbrot.cpp
@@ -16,10 +16,10 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibMain/Main.h>
 #include <unistd.h>
 
diff --git a/Userland/Libraries/LibGUI/FileIconProvider.cpp b/Userland/Libraries/LibGUI/FileIconProvider.cpp
index 0b58a83b13..d85ea00612 100644
--- a/Userland/Libraries/LibGUI/FileIconProvider.cpp
+++ b/Userland/Libraries/LibGUI/FileIconProvider.cpp
@@ -17,7 +17,7 @@
 #include <LibGUI/Icon.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/Userland/Libraries/LibGUI/ImageWidget.cpp b/Userland/Libraries/LibGUI/ImageWidget.cpp
index 3de928bc46..c57de3804e 100644
--- a/Userland/Libraries/LibGUI/ImageWidget.cpp
+++ b/Userland/Libraries/LibGUI/ImageWidget.cpp
@@ -10,7 +10,7 @@
 #include <LibGUI/ImageWidget.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 REGISTER_WIDGET(GUI, ImageWidget)
 
diff --git a/Userland/Libraries/LibGUI/ImageWidget.h b/Userland/Libraries/LibGUI/ImageWidget.h
index 967bb19247..f7ee3e1b22 100644
--- a/Userland/Libraries/LibGUI/ImageWidget.h
+++ b/Userland/Libraries/LibGUI/ImageWidget.h
@@ -9,7 +9,7 @@
 
 #include <LibCore/Timer.h>
 #include <LibGUI/Frame.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace GUI {
 
diff --git a/Userland/Libraries/LibGfx/Bitmap.cpp b/Userland/Libraries/LibGfx/Bitmap.cpp
index 0964109c73..e98a200cff 100644
--- a/Userland/Libraries/LibGfx/Bitmap.cpp
+++ b/Userland/Libraries/LibGfx/Bitmap.cpp
@@ -20,7 +20,7 @@
 #include <LibCore/MimeData.h>
 #include <LibCore/System.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibGfx/ShareableBitmap.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt
index 38923c5e72..408b8aec58 100644
--- a/Userland/Libraries/LibGfx/CMakeLists.txt
+++ b/Userland/Libraries/LibGfx/CMakeLists.txt
@@ -1,15 +1,12 @@
 set(SOURCES
     AffineTransform.cpp
     AntiAliasingPainter.cpp
-    BMPLoader.cpp
-    BMPWriter.cpp
     Bitmap.cpp
     BitmapMixer.cpp
     ClassicStylePainter.cpp
     ClassicWindowTheme.cpp
     Color.cpp
     CursorParams.cpp
-    DDSLoader.cpp
     FillPathImplementation.cpp
     Filters/ColorBlindnessFilter.cpp
     Filters/FastBoxBlurFilter.cpp
@@ -28,27 +25,32 @@ set(SOURCES
     Font/Typeface.cpp
     Font/WOFF/Font.cpp
     GradientPainting.cpp
-    GIFLoader.cpp
     ICC/BinaryWriter.cpp
     ICC/Profile.cpp
     ICC/Tags.cpp
     ICC/TagTypes.cpp
     ICC/WellKnownProfiles.cpp
-    ICOLoader.cpp
-    ImageDecoder.cpp
-    JPEGLoader.cpp
-    PBMLoader.cpp
-    PGMLoader.cpp
-    PNGLoader.cpp
-    PNGWriter.cpp
-    PortableFormatWriter.cpp
-    PPMLoader.cpp
+    ImageFormats/BMPLoader.cpp
+    ImageFormats/BMPWriter.cpp
+    ImageFormats/DDSLoader.cpp
+    ImageFormats/GIFLoader.cpp
+    ImageFormats/ICOLoader.cpp
+    ImageFormats/ImageDecoder.cpp
+    ImageFormats/JPEGLoader.cpp
+    ImageFormats/PBMLoader.cpp
+    ImageFormats/PGMLoader.cpp
+    ImageFormats/PNGLoader.cpp
+    ImageFormats/PNGWriter.cpp
+    ImageFormats/PortableFormatWriter.cpp
+    ImageFormats/PPMLoader.cpp
+    ImageFormats/QOILoader.cpp
+    ImageFormats/QOIWriter.cpp
+    ImageFormats/TGALoader.cpp
+    ImageFormats/WebPLoader.cpp
     Painter.cpp
     Palette.cpp
     Path.cpp
     Point.cpp
-    QOILoader.cpp
-    QOIWriter.cpp
     Rect.cpp
     ShareableBitmap.cpp
     Size.cpp
@@ -56,9 +58,7 @@ set(SOURCES
     SystemTheme.cpp
     TextDirection.cpp
     TextLayout.cpp
-    TGALoader.cpp
     Triangle.cpp
-    WebPLoader.cpp
     WindowTheme.cpp
 )
 
diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp b/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
index 8216a8a96a..8dc47a2e9e 100644
--- a/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
+++ b/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
@@ -17,7 +17,7 @@
 #include <LibGfx/Font/OpenType/Font.h>
 #include <LibGfx/Font/OpenType/Glyf.h>
 #include <LibGfx/Font/OpenType/Tables.h>
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <LibTextCodec/Decoder.h>
 #include <math.h>
 #include <sys/mman.h>
diff --git a/Userland/Libraries/LibGfx/BMPLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/BMPLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp
index bae791c339..76c9e25d88 100644
--- a/Userland/Libraries/LibGfx/BMPLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp
@@ -12,7 +12,7 @@
 #include <AK/Function.h>
 #include <AK/Try.h>
 #include <AK/Vector.h>
-#include <LibGfx/BMPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/BMPLoader.h b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h
similarity index 93%
rename from Userland/Libraries/LibGfx/BMPLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h
index 6430d66f94..7999a4a76e 100644
--- a/Userland/Libraries/LibGfx/BMPLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/BMPWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/BMPWriter.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp
index a755946a07..fb56998407 100644
--- a/Userland/Libraries/LibGfx/BMPWriter.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/BMPWriter.h b/Userland/Libraries/LibGfx/ImageFormats/BMPWriter.h
similarity index 100%
rename from Userland/Libraries/LibGfx/BMPWriter.h
rename to Userland/Libraries/LibGfx/ImageFormats/BMPWriter.h
diff --git a/Userland/Libraries/LibGfx/DDSLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/DDSLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp
index f2775dbfee..8f2f889f8b 100644
--- a/Userland/Libraries/LibGfx/DDSLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp
@@ -12,7 +12,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/Try.h>
 #include <AK/Vector.h>
-#include <LibGfx/DDSLoader.h>
+#include <LibGfx/ImageFormats/DDSLoader.h>
 #include <fcntl.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/Userland/Libraries/LibGfx/DDSLoader.h b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
similarity index 99%
rename from Userland/Libraries/LibGfx/DDSLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
index bc9c6e250f..4e7d213add 100644
--- a/Userland/Libraries/LibGfx/DDSLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/GIFLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/GIFLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp
index 1809b21feb..79da2033d0 100644
--- a/Userland/Libraries/LibGfx/GIFLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp
@@ -13,7 +13,7 @@
 #include <AK/Memory.h>
 #include <AK/MemoryStream.h>
 #include <AK/Try.h>
-#include <LibGfx/GIFLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
 #include <string.h>
 
 namespace Gfx {
diff --git a/Userland/Libraries/LibGfx/GIFLoader.h b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h
similarity index 95%
rename from Userland/Libraries/LibGfx/GIFLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h
index deaa011bea..88975716be 100644
--- a/Userland/Libraries/LibGfx/GIFLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/ICOLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
similarity index 98%
rename from Userland/Libraries/LibGfx/ICOLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
index 0e9cbd1667..87aa56ffe8 100644
--- a/Userland/Libraries/LibGfx/ICOLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
@@ -8,9 +8,9 @@
 #include <AK/Debug.h>
 #include <AK/MemoryStream.h>
 #include <AK/Types.h>
-#include <LibGfx/BMPLoader.h>
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <string.h>
 
 namespace Gfx {
diff --git a/Userland/Libraries/LibGfx/ICOLoader.h b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
similarity index 95%
rename from Userland/Libraries/LibGfx/ICOLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
index eecd7d396b..bef1c4cf87 100644
--- a/Userland/Libraries/LibGfx/ICOLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/ImageDecoder.cpp b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp
similarity index 85%
rename from Userland/Libraries/LibGfx/ImageDecoder.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp
index 19c96d9f83..b8a8ff4207 100644
--- a/Userland/Libraries/LibGfx/ImageDecoder.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp
@@ -5,19 +5,19 @@
  */
 
 #include <AK/LexicalPath.h>
-#include <LibGfx/BMPLoader.h>
-#include <LibGfx/DDSLoader.h>
-#include <LibGfx/GIFLoader.h>
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PBMLoader.h>
-#include <LibGfx/PGMLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PPMLoader.h>
-#include <LibGfx/QOILoader.h>
-#include <LibGfx/TGALoader.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/DDSLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PBMLoader.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PPMLoader.h>
+#include <LibGfx/ImageFormats/QOILoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/ImageDecoder.h b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h
similarity index 100%
rename from Userland/Libraries/LibGfx/ImageDecoder.h
rename to Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h
diff --git a/Userland/Libraries/LibGfx/JPEGLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/JPEGLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp
index e76dc760fa..d0040c727c 100644
--- a/Userland/Libraries/LibGfx/JPEGLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp
@@ -14,7 +14,7 @@
 #include <AK/String.h>
 #include <AK/Try.h>
 #include <AK/Vector.h>
-#include <LibGfx/JPEGLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
 
 #define JPEG_INVALID 0X0000
 
diff --git a/Userland/Libraries/LibGfx/JPEGLoader.h b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h
similarity index 95%
rename from Userland/Libraries/LibGfx/JPEGLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h
index 2890d803c3..fc650f8fb8 100644
--- a/Userland/Libraries/LibGfx/JPEGLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/MemoryStream.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/PBMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp
similarity index 95%
rename from Userland/Libraries/LibGfx/PBMLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp
index 8a60c851ff..dff6a12d66 100644
--- a/Userland/Libraries/LibGfx/PBMLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "PBMLoader.h"
+#include "AK/Endian.h"
 #include "PortableImageLoaderCommon.h"
-#include "Streamer.h"
-#include <AK/Endian.h>
+#include "Userland/Libraries/LibGfx/Streamer.h"
 #include <string.h>
 
 namespace Gfx {
diff --git a/Userland/Libraries/LibGfx/PBMLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h
similarity index 85%
rename from Userland/Libraries/LibGfx/PBMLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h
index e37d037f20..37705432b3 100644
--- a/Userland/Libraries/LibGfx/PBMLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <AK/StringView.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PortableImageMapLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PortableImageMapLoader.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/PGMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
similarity index 93%
rename from Userland/Libraries/LibGfx/PGMLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
index a211209f83..0240548013 100644
--- a/Userland/Libraries/LibGfx/PGMLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "PGMLoader.h"
-#include "PortableImageLoaderCommon.h"
-#include "Streamer.h"
 #include <AK/Endian.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
+#include <LibGfx/ImageFormats/PortableImageLoaderCommon.h>
+#include <LibGfx/Streamer.h>
 #include <string.h>
 
 namespace Gfx {
diff --git a/Userland/Libraries/LibGfx/PGMLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h
similarity index 86%
rename from Userland/Libraries/LibGfx/PGMLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h
index f5b4778042..087a5a4c6b 100644
--- a/Userland/Libraries/LibGfx/PGMLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <AK/StringView.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PortableImageMapLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PortableImageMapLoader.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/PNGLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/PNGLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp
index 26a00a5908..2ec92ef34f 100644
--- a/Userland/Libraries/LibGfx/PNGLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp
@@ -9,8 +9,8 @@
 #include <AK/Endian.h>
 #include <AK/Vector.h>
 #include <LibCompress/Zlib.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PNGShared.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGShared.h>
 #include <string.h>
 
 namespace Gfx {
diff --git a/Userland/Libraries/LibGfx/PNGLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h
similarity index 95%
rename from Userland/Libraries/LibGfx/PNGLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h
index 80abda9daf..b8f7b6097f 100644
--- a/Userland/Libraries/LibGfx/PNGLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/PNGShared.h b/Userland/Libraries/LibGfx/ImageFormats/PNGShared.h
similarity index 100%
rename from Userland/Libraries/LibGfx/PNGShared.h
rename to Userland/Libraries/LibGfx/ImageFormats/PNGShared.h
diff --git a/Userland/Libraries/LibGfx/PNGWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/PNGWriter.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp
index 8bd39aff4e..ad1c7afa51 100644
--- a/Userland/Libraries/LibGfx/PNGWriter.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp
@@ -13,7 +13,7 @@
 #include <LibCompress/Zlib.h>
 #include <LibCrypto/Checksum/CRC32.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 
 #pragma GCC diagnostic ignored "-Wpsabi"
 
diff --git a/Userland/Libraries/LibGfx/PNGWriter.h b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h
similarity index 96%
rename from Userland/Libraries/LibGfx/PNGWriter.h
rename to Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h
index 9a19e3b91b..0891261ed2 100644
--- a/Userland/Libraries/LibGfx/PNGWriter.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h
@@ -10,7 +10,7 @@
 #include <AK/Optional.h>
 #include <AK/Vector.h>
 #include <LibGfx/Forward.h>
-#include <LibGfx/PNGShared.h>
+#include <LibGfx/ImageFormats/PNGShared.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/PPMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp
similarity index 98%
rename from Userland/Libraries/LibGfx/PPMLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp
index 720cc7a5e7..c662e76b87 100644
--- a/Userland/Libraries/LibGfx/PPMLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp
@@ -7,11 +7,11 @@
 
 #include "PPMLoader.h"
 #include "PortableImageLoaderCommon.h"
-#include "Streamer.h"
 #include <AK/Endian.h>
 #include <AK/LexicalPath.h>
 #include <AK/ScopeGuard.h>
 #include <AK/StringBuilder.h>
+#include <LibGfx/Streamer.h>
 #include <string.h>
 
 namespace Gfx {
diff --git a/Userland/Libraries/LibGfx/PPMLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h
similarity index 86%
rename from Userland/Libraries/LibGfx/PPMLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h
index 661b2a7c69..527bddbeae 100644
--- a/Userland/Libraries/LibGfx/PPMLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <AK/StringView.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PortableImageMapLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PortableImageMapLoader.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/PortableFormatWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.cpp
similarity index 100%
rename from Userland/Libraries/LibGfx/PortableFormatWriter.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.cpp
diff --git a/Userland/Libraries/LibGfx/PortableFormatWriter.h b/Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.h
similarity index 100%
rename from Userland/Libraries/LibGfx/PortableFormatWriter.h
rename to Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.h
diff --git a/Userland/Libraries/LibGfx/PortableImageLoaderCommon.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
similarity index 99%
rename from Userland/Libraries/LibGfx/PortableImageLoaderCommon.h
rename to Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
index 5cfd1d29b2..a17b6c1921 100644
--- a/Userland/Libraries/LibGfx/PortableImageLoaderCommon.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
@@ -16,7 +16,7 @@
 #include <AK/Vector.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Color.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibGfx/Streamer.h>
 
 namespace Gfx {
diff --git a/Userland/Libraries/LibGfx/PortableImageMapLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h
similarity index 98%
rename from Userland/Libraries/LibGfx/PortableImageMapLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h
index e6be567dac..9426bca36e 100644
--- a/Userland/Libraries/LibGfx/PortableImageMapLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h
@@ -11,7 +11,7 @@
 #include <AK/StringView.h>
 #include <AK/Types.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PortableImageLoaderCommon.h>
+#include <LibGfx/ImageFormats/PortableImageLoaderCommon.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/QOILoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/QOILoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp
index b6392ff65a..fcebf42f79 100644
--- a/Userland/Libraries/LibGfx/QOILoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp
@@ -7,7 +7,7 @@
 #include <AK/Endian.h>
 #include <AK/MemoryStream.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/QOILoader.h>
+#include <LibGfx/ImageFormats/QOILoader.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/QOILoader.h b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
similarity index 97%
rename from Userland/Libraries/LibGfx/QOILoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
index 65fa373864..e072828018 100644
--- a/Userland/Libraries/LibGfx/QOILoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
@@ -8,7 +8,7 @@
 
 #include <AK/Forward.h>
 #include <LibGfx/Forward.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/QOIWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/QOIWriter.cpp
similarity index 100%
rename from Userland/Libraries/LibGfx/QOIWriter.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/QOIWriter.cpp
diff --git a/Userland/Libraries/LibGfx/QOIWriter.h b/Userland/Libraries/LibGfx/ImageFormats/QOIWriter.h
similarity index 100%
rename from Userland/Libraries/LibGfx/QOIWriter.h
rename to Userland/Libraries/LibGfx/ImageFormats/QOIWriter.h
diff --git a/Userland/Libraries/LibGfx/TGALoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/TGALoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
index 067299454a..0d5a8e1fea 100644
--- a/Userland/Libraries/LibGfx/TGALoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
@@ -7,7 +7,7 @@
 #include <AK/Span.h>
 #include <AK/StdLibExtraDetails.h>
 #include <AK/String.h>
-#include <LibGfx/TGALoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/TGALoader.h b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h
similarity index 95%
rename from Userland/Libraries/LibGfx/TGALoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/TGALoader.h
index b6a4b7bfdf..70f2719aa1 100644
--- a/Userland/Libraries/LibGfx/TGALoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibGfx/WebPLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp
similarity index 99%
rename from Userland/Libraries/LibGfx/WebPLoader.cpp
rename to Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp
index d7a288d2fd..3106e66088 100644
--- a/Userland/Libraries/LibGfx/WebPLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp
@@ -8,7 +8,7 @@
 #include <AK/Endian.h>
 #include <AK/Format.h>
 #include <AK/Vector.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 
 // Overview: https://developers.google.com/speed/webp/docs/compression
 // Container: https://developers.google.com/speed/webp/docs/riff_container
diff --git a/Userland/Libraries/LibGfx/WebPLoader.h b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h
similarity index 95%
rename from Userland/Libraries/LibGfx/WebPLoader.h
rename to Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h
index ddc82bd0f8..f7f07a458c 100644
--- a/Userland/Libraries/LibGfx/WebPLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Userland/Libraries/LibPDF/Filter.cpp b/Userland/Libraries/LibPDF/Filter.cpp
index 308c22d272..f5aea25242 100644
--- a/Userland/Libraries/LibPDF/Filter.cpp
+++ b/Userland/Libraries/LibPDF/Filter.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Hex.h>
 #include <LibCompress/Deflate.h>
-#include <LibGfx/JPEGLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
 #include <LibPDF/CommonNames.h>
 #include <LibPDF/Filter.h>
 
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp
index 4ee07569ea..b1f2810f37 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp
+++ b/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp
@@ -7,7 +7,7 @@
 #include <AK/Base64.h>
 #include <AK/Checked.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibWeb/CSS/StyleComputer.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/CanvasRenderingContext2D.h>
diff --git a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
index c1d5a207cd..a9bf71728e 100644
--- a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
+++ b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
@@ -9,7 +9,7 @@
 #include <AK/LexicalPath.h>
 #include <AK/SourceGenerator.h>
 #include <LibGemini/Document.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibMarkdown/Document.h>
 #include <LibWeb/Bindings/MainThreadVM.h>
 #include <LibWeb/DOM/Document.h>
diff --git a/Userland/Services/ImageDecoder/ConnectionFromClient.cpp b/Userland/Services/ImageDecoder/ConnectionFromClient.cpp
index e1d25a589d..85c91024ed 100644
--- a/Userland/Services/ImageDecoder/ConnectionFromClient.cpp
+++ b/Userland/Services/ImageDecoder/ConnectionFromClient.cpp
@@ -8,7 +8,7 @@
 #include <ImageDecoder/ConnectionFromClient.h>
 #include <ImageDecoder/ImageDecoderClientEndpoint.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace ImageDecoder {
 
diff --git a/Userland/Services/SpiceAgent/SpiceAgent.cpp b/Userland/Services/SpiceAgent/SpiceAgent.cpp
index 8dec42762b..83292d8bc3 100644
--- a/Userland/Services/SpiceAgent/SpiceAgent.cpp
+++ b/Userland/Services/SpiceAgent/SpiceAgent.cpp
@@ -7,11 +7,11 @@
 #include "SpiceAgent.h"
 #include "ConnectionToClipboardServer.h"
 #include <AK/DeprecatedString.h>
-#include <LibGfx/BMPLoader.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <memory.h>
 #include <unistd.h>
 
diff --git a/Userland/Utilities/file.cpp b/Userland/Utilities/file.cpp
index 067d20e81d..a12240aedb 100644
--- a/Userland/Utilities/file.cpp
+++ b/Userland/Utilities/file.cpp
@@ -14,7 +14,7 @@
 #include <LibCore/System.h>
 #include <LibELF/Image.h>
 #include <LibELF/Validation.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibMain/Main.h>
 #include <stdio.h>
 #include <sys/stat.h>
diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp
index 975c257726..3eb4376d7d 100644
--- a/Userland/Utilities/headless-browser.cpp
+++ b/Userland/Utilities/headless-browser.cpp
@@ -27,7 +27,7 @@
 #include <LibFileSystem/FileSystem.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font/FontDatabase.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibGfx/Point.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/ShareableBitmap.h>
diff --git a/Userland/Utilities/icc.cpp b/Userland/Utilities/icc.cpp
index ba85c84403..7cdc5e06d7 100644
--- a/Userland/Utilities/icc.cpp
+++ b/Userland/Utilities/icc.cpp
@@ -14,7 +14,7 @@
 #include <LibGfx/ICC/Profile.h>
 #include <LibGfx/ICC/Tags.h>
 #include <LibGfx/ICC/WellKnownProfiles.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibVideo/Color/CodingIndependentCodePoints.h>
 
 template<class T>
diff --git a/Userland/Utilities/image.cpp b/Userland/Utilities/image.cpp
index 74d3654ba3..2462f9e2c1 100644
--- a/Userland/Utilities/image.cpp
+++ b/Userland/Utilities/image.cpp
@@ -7,11 +7,11 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/File.h>
 #include <LibCore/MappedFile.h>
-#include <LibGfx/BMPWriter.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/PortableFormatWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/PortableFormatWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
diff --git a/Userland/Utilities/shot.cpp b/Userland/Utilities/shot.cpp
index c168f9d583..bb0b8cddc5 100644
--- a/Userland/Utilities/shot.cpp
+++ b/Userland/Utilities/shot.cpp
@@ -19,7 +19,7 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibGfx/Palette.h>
 #include <LibMain/Main.h>
 #include <unistd.h>