diff --git a/src/Application.cpp b/src/Application.cpp
index b2026f2c8..d340b533c 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -44,7 +44,7 @@
 #include "profile/ProfileCommandParser.h"
 #include "session/Session.h"
 #include "session/SessionManager.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "widgets/ViewContainer.h"
 
 using namespace Konsole;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d4be80763..7e7a3b65b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -178,7 +178,7 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS}
                         widgets/RenameTabWidget.cpp
                         widgets/RenameTabWidget.cpp
                         widgets/TabTitleFormatButton.cpp
-                        widgets/TerminalDisplay.cpp
+                        terminalDisplay/TerminalDisplay.cpp
                         widgets/TerminalDisplayAccessible.cpp
                         widgets/TerminalHeaderBar.cpp
                         widgets/ViewContainer.cpp
diff --git a/src/ExtendedCharTable.cpp b/src/ExtendedCharTable.cpp
index 65dea0c7c..4f62a6b2b 100644
--- a/src/ExtendedCharTable.cpp
+++ b/src/ExtendedCharTable.cpp
@@ -25,7 +25,7 @@
 #include "konsoledebug.h"
 
 // Konsole
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "session/SessionManager.h"
 #include "session/Session.h"
 #include "Screen.h"
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a1f869aa0..2d06b0e74 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -61,7 +61,7 @@
 #include "settings/TemporaryFilesSettings.h"
 #include "settings/ThumbnailsSettings.h"
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "widgets/ViewContainer.h"
 
 using namespace Konsole;
diff --git a/src/Part.cpp b/src/Part.cpp
index 651b5ce6a..d7fbc3a1b 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -45,7 +45,7 @@
 #include "settings/PartInfo.h"
 #include "settings/ProfileSettings.h"
 #include "widgets/EditProfileDialog.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "widgets/ViewContainer.h"
 
 using namespace Konsole;
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 8fcf27e2b..a429f876d 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -43,7 +43,7 @@
 #include "session/SessionController.h"
 #include "session/SessionManager.h"
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "widgets/ViewContainer.h"
 #include "widgets/ViewSplitter.h"
 
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 7116d6f3b..2f511ad12 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -38,7 +38,7 @@
 // Konsole
 #include "keyboardtranslator/KeyboardTranslator.h"
 #include "session/SessionController.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "EscapeSequenceUrlExtractor.h"
 #include "Screen.h"
 
diff --git a/src/autotests/TerminalTest.cpp b/src/autotests/TerminalTest.cpp
index a8cd300c3..bef167566 100644
--- a/src/autotests/TerminalTest.cpp
+++ b/src/autotests/TerminalTest.cpp
@@ -23,7 +23,7 @@
 #include "qtest.h"
 
 // Konsole
-#include "../widgets/TerminalDisplay.h"
+#include "../terminalDisplay/TerminalDisplay.h"
 #include "../CharacterColor.h"
 #include "colorscheme/ColorScheme.h"
 
diff --git a/src/filterHotSpots/EscapeSequenceUrlFilter.cpp b/src/filterHotSpots/EscapeSequenceUrlFilter.cpp
index 73de516af..a26cd2ed0 100644
--- a/src/filterHotSpots/EscapeSequenceUrlFilter.cpp
+++ b/src/filterHotSpots/EscapeSequenceUrlFilter.cpp
@@ -21,7 +21,7 @@
 #include "EscapeSequenceUrlFilter.h"
 
 #include "session/Session.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "EscapeSequenceUrlExtractor.h"
 #include "EscapeSequenceUrlFilterHotSpot.h"
 
diff --git a/src/filterHotSpots/EscapeSequenceUrlFilterHotSpot.cpp b/src/filterHotSpots/EscapeSequenceUrlFilterHotSpot.cpp
index 08418f74c..3ee097a2c 100644
--- a/src/filterHotSpots/EscapeSequenceUrlFilterHotSpot.cpp
+++ b/src/filterHotSpots/EscapeSequenceUrlFilterHotSpot.cpp
@@ -32,7 +32,7 @@
 #include <QMouseEvent>
 #include <QDebug>
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 
 using namespace Konsole;
 
diff --git a/src/filterHotSpots/FileFilterHotspot.cpp b/src/filterHotSpots/FileFilterHotspot.cpp
index 7220782dd..9d19a5c08 100644
--- a/src/filterHotSpots/FileFilterHotspot.cpp
+++ b/src/filterHotSpots/FileFilterHotspot.cpp
@@ -36,7 +36,7 @@
 
 #include "konsoledebug.h"
 #include "KonsoleSettings.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 
 using namespace Konsole;
 
diff --git a/src/filterHotSpots/FilterChain.cpp b/src/filterHotSpots/FilterChain.cpp
index 749ce301e..a4f8efbe8 100644
--- a/src/filterHotSpots/FilterChain.cpp
+++ b/src/filterHotSpots/FilterChain.cpp
@@ -22,7 +22,7 @@
 #include "Filter.h"
 #include "HotSpot.h"
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 
 #include <QRect>
 #include <QEvent>
diff --git a/src/filterHotSpots/HotSpot.cpp b/src/filterHotSpots/HotSpot.cpp
index b9f3f9818..608ebd12b 100644
--- a/src/filterHotSpots/HotSpot.cpp
+++ b/src/filterHotSpots/HotSpot.cpp
@@ -23,7 +23,7 @@
 #include <QMouseEvent>
 #include <QDebug>
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "FileFilterHotspot.h"
 
 using namespace Konsole;
diff --git a/src/filterHotSpots/TerminalImageFilterChain.cpp b/src/filterHotSpots/TerminalImageFilterChain.cpp
index 7df75e23d..3e1c5c24e 100644
--- a/src/filterHotSpots/TerminalImageFilterChain.cpp
+++ b/src/filterHotSpots/TerminalImageFilterChain.cpp
@@ -24,7 +24,7 @@
 
 #include "PlainTextDecoder.h"
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 
 using namespace Konsole;
 
diff --git a/src/filterHotSpots/UrlFilterHotspot.cpp b/src/filterHotSpots/UrlFilterHotspot.cpp
index cd02ccd81..716146ac5 100644
--- a/src/filterHotSpots/UrlFilterHotspot.cpp
+++ b/src/filterHotSpots/UrlFilterHotspot.cpp
@@ -38,7 +38,7 @@
 #include <QMouseEvent>
 
 #include "UrlFilter.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 //regexp matches:
 // full url:
 
diff --git a/src/session/Session.cpp b/src/session/Session.cpp
index f62971295..9ac1692c4 100644
--- a/src/session/Session.cpp
+++ b/src/session/Session.cpp
@@ -60,7 +60,8 @@
 #include "profile/Profile.h"
 #include "profile/ProfileManager.h"
 #include "SessionManager.h"
-#include "widgets/TerminalDisplay.h"
+
+#include "terminalDisplay/TerminalDisplay.h"
 
 using namespace Konsole;
 
diff --git a/src/session/SessionController.cpp b/src/session/SessionController.cpp
index c07b4520e..818c156f4 100644
--- a/src/session/SessionController.cpp
+++ b/src/session/SessionController.cpp
@@ -99,7 +99,8 @@
 
 #include "widgets/EditProfileDialog.h"
 #include "widgets/IncrementalSearchBar.h"
-#include "widgets/TerminalDisplay.h"
+
+#include "terminalDisplay/TerminalDisplay.h"
 
 // For Unix signal names
 #include <csignal>
diff --git a/src/session/SessionDisplayConnection.cpp b/src/session/SessionDisplayConnection.cpp
index 72edd0389..e619cd9a0 100644
--- a/src/session/SessionDisplayConnection.cpp
+++ b/src/session/SessionDisplayConnection.cpp
@@ -22,7 +22,7 @@
 
 // Konsole
 #include "Session.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 
 namespace Konsole
 {
diff --git a/src/session/SessionManager.cpp b/src/session/SessionManager.cpp
index 5494b7e8f..e504c4fce 100644
--- a/src/session/SessionManager.cpp
+++ b/src/session/SessionManager.cpp
@@ -48,7 +48,7 @@
 #include "Session.h"
 #include "SessionController.h"
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 
 using namespace Konsole;
 
diff --git a/src/settings/ProfileSettings.cpp b/src/settings/ProfileSettings.cpp
index 71c6c5134..0e7135db0 100644
--- a/src/settings/ProfileSettings.cpp
+++ b/src/settings/ProfileSettings.cpp
@@ -31,7 +31,7 @@
 #include "profile/ProfileModel.h"
 #include "session/Session.h"
 #include "widgets/EditProfileDialog.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "session/SessionManager.h"
 #include "session/SessionController.h"
 #include "delegates/ProfileShortcutDelegate.h"
diff --git a/src/widgets/TerminalDisplay.cpp b/src/terminalDisplay/TerminalDisplay.cpp
similarity index 99%
rename from src/widgets/TerminalDisplay.cpp
rename to src/terminalDisplay/TerminalDisplay.cpp
index 33115edb0..969f237bc 100644
--- a/src/widgets/TerminalDisplay.cpp
+++ b/src/terminalDisplay/TerminalDisplay.cpp
@@ -21,7 +21,7 @@
 */
 
 // Own
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "KonsoleSettings.h"
 
 // Config
@@ -73,7 +73,7 @@
 #include "PlainTextDecoder.h"
 #include "Screen.h"
 #include "ExtendedCharTable.h"
-#include "TerminalDisplayAccessible.h"
+#include "../widgets/TerminalDisplayAccessible.h"
 #include "session/SessionController.h"
 #include "session/SessionManager.h"
 #include "session/Session.h"
@@ -83,7 +83,7 @@
 #include "ViewManager.h" // for colorSchemeForProfile. // TODO: Rewrite this.
 #include "LineBlockCharacters.h"
 #include "PrintOptions.h"
-#include "KonsolePrintManager.h"
+#include "../widgets/KonsolePrintManager.h"
 #include "EscapeSequenceUrlExtractor.h"
 
 using namespace Konsole;
diff --git a/src/widgets/TerminalDisplay.h b/src/terminalDisplay/TerminalDisplay.h
similarity index 99%
rename from src/widgets/TerminalDisplay.h
rename to src/terminalDisplay/TerminalDisplay.h
index 0da63170e..451281b6a 100644
--- a/src/widgets/TerminalDisplay.h
+++ b/src/terminalDisplay/TerminalDisplay.h
@@ -33,7 +33,7 @@
 #include "colorscheme/ColorScheme.h"
 #include "Enumeration.h"
 #include "ScrollState.h"
-#include "TerminalHeaderBar.h"
+#include "widgets/TerminalHeaderBar.h"
 
 class QDrag;
 class QDragEnterEvent;
diff --git a/src/widgets/TerminalDisplayAccessible.h b/src/widgets/TerminalDisplayAccessible.h
index 5c0309730..b528e3731 100644
--- a/src/widgets/TerminalDisplayAccessible.h
+++ b/src/widgets/TerminalDisplayAccessible.h
@@ -27,7 +27,7 @@
 #include <QAccessibleTextInterface>
 #include <QAccessibleWidget>
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "ScreenWindow.h"
 #include "Screen.h"
 
diff --git a/src/widgets/TerminalHeaderBar.cpp b/src/widgets/TerminalHeaderBar.cpp
index c4af5e638..b74e8514f 100644
--- a/src/widgets/TerminalHeaderBar.cpp
+++ b/src/widgets/TerminalHeaderBar.cpp
@@ -21,7 +21,7 @@
 
 #include "TerminalHeaderBar.h"
 
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "session/SessionController.h"
 #include "ViewProperties.h"
 #include "KonsoleSettings.h"
diff --git a/src/widgets/ViewContainer.cpp b/src/widgets/ViewContainer.cpp
index 8f175719a..501ecd7e3 100644
--- a/src/widgets/ViewContainer.cpp
+++ b/src/widgets/ViewContainer.cpp
@@ -43,7 +43,7 @@
 #include "KonsoleSettings.h"
 #include "session/SessionController.h"
 #include "DetachableTabBar.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 #include "widgets/ViewSplitter.h"
 #include "MainWindow.h"
 #include "session/Session.h"
diff --git a/src/widgets/ViewSplitter.cpp b/src/widgets/ViewSplitter.cpp
index 2656b904c..782a61f49 100644
--- a/src/widgets/ViewSplitter.cpp
+++ b/src/widgets/ViewSplitter.cpp
@@ -33,7 +33,7 @@
 
 // Konsole
 #include "widgets/ViewContainer.h"
-#include "widgets/TerminalDisplay.h"
+#include "terminalDisplay/TerminalDisplay.h"
 
 using Konsole::ViewSplitter;
 using Konsole::TerminalDisplay;