diff --git a/core/libs/dimg/CMakeLists.txt b/core/libs/dimg/CMakeLists.txt
index 51d6ccacf5..c7d0b6732a 100644
--- a/core/libs/dimg/CMakeLists.txt
+++ b/core/libs/dimg/CMakeLists.txt
@@ -1,222 +1,221 @@
 #
 # Copyright (c) 2010-2020 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 # Copyright (c) 2015      by Veaceslav Munteanu, <veaceslav dot munteanu90 at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 kde_enable_exceptions()
 
 # Boost uses operator names (and, not, ...)
 string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 set(libdimg_SRCS
     dimg.cpp
     dimg_bitsops.cpp
     dimg_colors.cpp
     dimg_copy.cpp
     dimg_data.cpp
     dimg_fileio.cpp
     dimg_metadata.cpp
     dimg_props.cpp
     dimg_qimage.cpp
     dimg_qpixmap.cpp
     dimg_scale.cpp
     dimg_transform.cpp
-    drawdecoding.cpp
-    dcolor.cpp
-    dcolorcomposer.cpp
+    color/dcolor.cpp
+    color/dcolorcomposer.cpp
     history/dimagehistory.cpp
     history/filteraction.cpp
     history/historyimageid.cpp
 )
 
 set(libdimgfilters_SRCS
     filters/dimgbuiltinfilter.cpp
     filters/dimgthreadedfilter.cpp
     filters/dimgthreadedanalyser.cpp
     filters/dimgfiltermanager.cpp
     filters/dimgfiltergenerator.cpp
     filters/dpixelsaliasfilter.cpp
     filters/filteractionfilter.cpp
     filters/randomnumbergenerator.cpp
-    filters/rawprocessingfilter.cpp
+    filters/raw/rawprocessingfilter.cpp
+    filters/raw/drawdecoding.cpp
     filters/decorate/borderfilter.cpp
     filters/decorate/bordersettings.cpp
     filters/decorate/texturefilter.cpp
     filters/film/filmfilter.cpp
     filters/fx/blurfilter.cpp
     filters/fx/blurfxfilter.cpp
     filters/fx/colorfxfilter.cpp
     filters/fx/colorfxsettings.cpp
     filters/fx/distortionfxfilter.cpp
     filters/fx/charcoalfilter.cpp
     filters/fx/embossfilter.cpp
     filters/fx/filmgrainfilter.cpp
     filters/fx/filmgrainsettings.cpp
     filters/fx/invertfilter.cpp
     filters/fx/oilpaintfilter.cpp
     filters/fx/raindropfilter.cpp
     filters/auto/autolevelsfilter.cpp
     filters/auto/autoexpofilter.cpp
     filters/auto/equalizefilter.cpp
     filters/auto/stretchfilter.cpp
     filters/auto/normalizefilter.cpp
     filters/cb/cbfilter.cpp
     filters/cb/cbsettings.cpp
     filters/bcg/bcgfilter.cpp
     filters/bcg/bcgsettings.cpp
     filters/bw/bwsepiafilter.cpp
     filters/bw/bwsepiasettings.cpp
     filters/bw/tonalityfilter.cpp
     filters/bw/infraredfilter.cpp
     filters/bw/mixerfilter.cpp
     filters/bw/mixersettings.cpp
     filters/hsl/hslfilter.cpp
     filters/hsl/hslsettings.cpp
     filters/hsl/hspreviewwidget.cpp
     filters/icc/iccmanager.cpp
     filters/icc/iccprofile.cpp
     filters/icc/iccprofilesettings.cpp
     filters/icc/icctransform.cpp
     filters/icc/icctransformfilter.cpp
     filters/icc/iccsettingscontainer.cpp
     filters/icc/iccsettings.cpp
     filters/icc/digikam-lcms.cpp
     filters/lc/localcontrastfilter.cpp
     filters/lc/localcontrastsettings.cpp
     filters/lc/localcontrastcontainer.cpp
     filters/nr/nrfilter.cpp
     filters/nr/nrestimate.cpp
     filters/nr/nrsettings.cpp
     filters/sharp/sharpenfilter.cpp
     filters/sharp/unsharpmaskfilter.cpp
     filters/sharp/sharpsettings.cpp
     filters/levels/imagelevels.cpp
     filters/levels/levelsfilter.cpp
     filters/levels/imagehistogram.cpp
     filters/levels/histogrambox.cpp
     filters/levels/histogramwidget.cpp
     filters/levels/histogrampainter.cpp
     filters/curves/curvescontainer.cpp
     filters/curves/imagecurves.cpp
     filters/curves/curvesfilter.cpp
     filters/curves/curvessettings.cpp
     filters/curves/curveswidget.cpp
     filters/curves/curvesbox.cpp
     filters/wb/wbcontainer.cpp
     filters/wb/wbfilter.cpp
     filters/wb/wbsettings.cpp
     filters/transform/freerotationfilter.cpp
     filters/transform/freerotationsettings.cpp
     filters/transform/shearfilter.cpp
     filters/transform/autocrop.cpp
     filters/greycstoration/greycstorationfilter.cpp
     filters/greycstoration/greycstorationsettings.cpp
     filters/lens/antivignettingfilter.cpp
     filters/lens/antivignettingsettings.cpp
     filters/lens/lensdistortionfilter.cpp
     filters/lens/lensdistortionpixelaccess.cpp
     filters/redeye/redeyecorrectionfilter.cpp
     filters/redeye/redeyecorrectionsettings.cpp
     filters/redeye/redeyecorrectioncontainer.cpp
     filters/imgqsort/imagequalitycontainer.cpp
     filters/imgqsort/imagequalitysettings.cpp
     filters/imgqsort/imagequalityparser.cpp
     filters/imgqsort/imagequalityparser_blur.cpp
     filters/imgqsort/imagequalityparser_exposure.cpp
     filters/imgqsort/imagequalityparser_noise.cpp
     filters/imgqsort/imagequalityparser_compression.cpp
 )
 
 # ==================================================================================================
 # get the gcc version
 
 # CImg.h version 1.2.8 do not compile fine with gcc 4.3.x
 # See bug #163118: digikam-0.9.4_beta5 compilation hangs with gcc 4.3
 # Using -fno-tree-pre is work around this problem.
 
 # TODO is this hack anymore required?
 if(CMAKE_COMPILER_IS_GNUCXX)
     exec_program(${CMAKE_CXX_COMPILER} ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
 
     if (${GCC_VERSION} VERSION_LESS "4.3.0")
         message(STATUS "Adjusting compilation flags for GCC version (${GCC_VERSION} )")
         add_definitions(-fno-tree-pre)
     endif()
 endif()
 
 
 if(Lqr-1_FOUND)
     set(libdimgfilters_SRCS
         ${libdimgfilters_SRCS}
         filters/transform/contentawarefilter.cpp
     )
     include_directories(${LQR-1_INCLUDE_DIRS})
 endif()
 
 if(LensFun_FOUND)
     set(libdimgfilters_SRCS
         ${libdimgfilters_SRCS}
         filters/lens/lensfunfilter.cpp
         filters/lens/lensfuncameraselector.cpp
         filters/lens/lensfuniface.cpp
         filters/lens/lensfunsettings.cpp
     )
     include_directories(${LENSFUN_INCLUDE_DIRS})
 endif()
 
 if(Eigen3_FOUND)
     set(libdimgfilters_SRCS
         ${libdimgfilters_SRCS}
         filters/sharp/refocusfilter.cpp
         filters/sharp/refocusmatrix.cpp
     )
     include_directories(${EIGEN3_INCLUDE_DIR})
 endif()
 
 set(libdimgloaders_SRCS
     loaders/dimgloader.cpp
     loaders/jpegsettings.cpp
     loaders/pngsettings.cpp
     loaders/tiffsettings.cpp
     loaders/pgfsettings.cpp
 )
 
 # JPEG2000 support
 
 if(Jasper_FOUND)
     set(libdimgloaders_SRCS
         ${libdimgloaders_SRCS}
         loaders/jp2ksettings.cpp
     )
 endif()
 
 # HEIF support
 if(X265_FOUND)
     set(libdimgloaders_SRCS
         ${libdimgloaders_SRCS}
         loaders/heifsettings.cpp
     )
 endif()
 
 include_directories(
     $<TARGET_PROPERTY:Qt5::Concurrent,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:Qt5::Xml,INTERFACE_INCLUDE_DIRECTORIES>
 
     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:KF5::WidgetsAddons,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 if(X11_FOUND)
     include_directories($<TARGET_PROPERTY:Qt5::X11Extras,INTERFACE_INCLUDE_DIRECTORIES>)
 endif()
 
 add_library(dimg_src OBJECT
             ${libdimgloaders_SRCS}
             ${libdimgfilters_SRCS}
             ${libdimg_SRCS}
-            ${libdlib_SRCS}
 )
diff --git a/core/libs/dimg/dcolor.cpp b/core/libs/dimg/color/dcolor.cpp
similarity index 100%
rename from core/libs/dimg/dcolor.cpp
rename to core/libs/dimg/color/dcolor.cpp
diff --git a/core/libs/dimg/dcolor.h b/core/libs/dimg/color/dcolor.h
similarity index 100%
rename from core/libs/dimg/dcolor.h
rename to core/libs/dimg/color/dcolor.h
diff --git a/core/libs/dimg/dcolorblend.h b/core/libs/dimg/color/dcolorblend.h
similarity index 100%
rename from core/libs/dimg/dcolorblend.h
rename to core/libs/dimg/color/dcolorblend.h
diff --git a/core/libs/dimg/dcolorcomposer.cpp b/core/libs/dimg/color/dcolorcomposer.cpp
similarity index 100%
rename from core/libs/dimg/dcolorcomposer.cpp
rename to core/libs/dimg/color/dcolorcomposer.cpp
diff --git a/core/libs/dimg/dcolorcomposer.h b/core/libs/dimg/color/dcolorcomposer.h
similarity index 100%
rename from core/libs/dimg/dcolorcomposer.h
rename to core/libs/dimg/color/dcolorcomposer.h
diff --git a/core/libs/dimg/dcolorpixelaccess.h b/core/libs/dimg/color/dcolorpixelaccess.h
similarity index 100%
rename from core/libs/dimg/dcolorpixelaccess.h
rename to core/libs/dimg/color/dcolorpixelaccess.h
diff --git a/core/libs/dimg/filters/README b/core/libs/dimg/filters/README
index e2ce0598b6..53ddf41a52 100644
--- a/core/libs/dimg/filters/README
+++ b/core/libs/dimg/filters/README
@@ -1,20 +1,21 @@
 auto          : Auto Color Correction.
 bw            : Black and White.
 bcg           : Brighness / Contrast / Gamma.
 cb            : Color Balance Correction.
 curves        : Histogram Curves Correction.
 decorate      : Decorative Effects.
 fx            : Special Effects.
 greystoration : CImg library interface for Greystoration filter.
 hsl           : Hue / Saturation / Lightness.
 icc           : Color Management.
 imgqsort      : Image Quality Sorter.
 levels        : Histogram Levels Correction.
 lens          : Misc lens correction filters.
 lut3d         : 3D LUT color filters.
 lc            : Local Contrast (LDR Tonemapping).
 nr            : Wavelets Noise Reduction.
+raw           : RAW image processing
 sharp         : Sharp / Unsharp Mask / Refocus
 transform     : Change Image Geometry.
 wb            : White Balance.
 redeye        : Red-Eye Detection and Correction.
diff --git a/core/libs/dimg/drawdecoding.cpp b/core/libs/dimg/filters/raw/drawdecoding.cpp
similarity index 100%
rename from core/libs/dimg/drawdecoding.cpp
rename to core/libs/dimg/filters/raw/drawdecoding.cpp
diff --git a/core/libs/dimg/drawdecoding.h b/core/libs/dimg/filters/raw/drawdecoding.h
similarity index 100%
rename from core/libs/dimg/drawdecoding.h
rename to core/libs/dimg/filters/raw/drawdecoding.h
diff --git a/core/libs/dimg/filters/rawprocessingfilter.cpp b/core/libs/dimg/filters/raw/rawprocessingfilter.cpp
similarity index 100%
rename from core/libs/dimg/filters/rawprocessingfilter.cpp
rename to core/libs/dimg/filters/raw/rawprocessingfilter.cpp
diff --git a/core/libs/dimg/filters/rawprocessingfilter.h b/core/libs/dimg/filters/raw/rawprocessingfilter.h
similarity index 100%
rename from core/libs/dimg/filters/rawprocessingfilter.h
rename to core/libs/dimg/filters/raw/rawprocessingfilter.h