diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c00794bb..28640f32 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,7 +113,7 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS}
                         EscapeSequenceUrlExtractor.cpp
                         ExtendedCharTable.cpp
                         FontDialog.cpp
-                        HTMLDecoder.cpp
+                        decoders/HTMLDecoder.cpp
                         HistorySizeDialog.cpp
                         KeyBindingEditor.cpp
                         LabelsAligner.cpp
diff --git a/src/PlainTextDecoder.h b/src/PlainTextDecoder.h
index 471730e6..f084537c 100644
--- a/src/PlainTextDecoder.h
+++ b/src/PlainTextDecoder.h
@@ -9,7 +9,7 @@
 
 #include "konsoleprivate_export.h"
 
-#include "TerminalCharacterDecoder.h"
+#include "../decoders/TerminalCharacterDecoder.h"
 
 class QTextStream;
 template<typename> class QList;
diff --git a/src/SaveHistoryTask.cpp b/src/SaveHistoryTask.cpp
index cb79b7b1..b792517e 100644
--- a/src/SaveHistoryTask.cpp
+++ b/src/SaveHistoryTask.cpp
@@ -21,7 +21,7 @@
 #include "Emulation.h"
 
 #include "PlainTextDecoder.h"
-#include "HTMLDecoder.h"
+#include "../decoders/HTMLDecoder.h"
 
 namespace Konsole {
 
diff --git a/src/Screen.cpp b/src/Screen.cpp
index d82a66b1..0ae4c083 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -13,7 +13,7 @@
 
 // Konsole
 #include "PlainTextDecoder.h"
-#include "HTMLDecoder.h"
+#include "../decoders/HTMLDecoder.h"
 #include "history/HistoryType.h"
 #include "history/HistoryScrollNone.h"
 #include "ExtendedCharTable.h"
diff --git a/src/autotests/TerminalCharacterDecoderTest.cpp b/src/autotests/TerminalCharacterDecoderTest.cpp
index 95c9a9d2..32a8623d 100644
--- a/src/autotests/TerminalCharacterDecoderTest.cpp
+++ b/src/autotests/TerminalCharacterDecoderTest.cpp
@@ -10,7 +10,7 @@
 
 // Konsole
 #include "../PlainTextDecoder.h"
-#include "../HTMLDecoder.h"
+#include "../decoders/HTMLDecoder.h"
 
 // Qt
 #include <QTextStream>
diff --git a/src/HTMLDecoder.cpp b/src/decoders/HTMLDecoder.cpp
similarity index 100%
rename from src/HTMLDecoder.cpp
rename to src/decoders/HTMLDecoder.cpp
diff --git a/src/HTMLDecoder.h b/src/decoders/HTMLDecoder.h
similarity index 100%
rename from src/HTMLDecoder.h
rename to src/decoders/HTMLDecoder.h
diff --git a/src/TerminalCharacterDecoder.h b/src/decoders/TerminalCharacterDecoder.h
similarity index 100%
rename from src/TerminalCharacterDecoder.h
rename to src/decoders/TerminalCharacterDecoder.h