diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index e71a6dda361c2ff82c1bbaed5993d5d4463b2a1d..0341a7172664c4c5f475d92686ffed5b65ffec77 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -59,7 +59,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/mediainfo/info_panels.cpp gui/qt/dialogs/mediainfo/info_panels.hpp \
gui/qt/dialogs/mediainfo/info_widgets.cpp gui/qt/dialogs/mediainfo/info_widgets.hpp \
gui/qt/dialogs/extended/extended.cpp gui/qt/dialogs/extended/extended.hpp \
- gui/qt/dialogs/messages.cpp gui/qt/dialogs/messages.hpp \
+ gui/qt/dialogs/messages/messages.cpp gui/qt/dialogs/messages/messages.hpp \
gui/qt/dialogs/errors.cpp gui/qt/dialogs/errors.hpp \
gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \
gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
@@ -70,7 +70,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/open/open.cpp gui/qt/dialogs/open/open.hpp \
gui/qt/dialogs/open/openurl.cpp gui/qt/dialogs/open/openurl.hpp \
gui/qt/dialogs/vlm.cpp gui/qt/dialogs/vlm.hpp \
- gui/qt/dialogs/firstrun.cpp gui/qt/dialogs/firstrun.hpp \
+ gui/qt/dialogs/firstrun/firstrun.cpp gui/qt/dialogs/firstrun/firstrun.hpp \
gui/qt/dialogs/podcast_configuration.cpp \
gui/qt/dialogs/podcast_configuration.hpp \
gui/qt/dialogs/extensions/extensions.cpp gui/qt/dialogs/extensions/extensions.hpp \
@@ -241,7 +241,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/mediainfo/info_panels.moc.cpp \
gui/qt/dialogs/mediainfo/info_widgets.moc.cpp \
gui/qt/dialogs/extended/extended.moc.cpp \
- gui/qt/dialogs/messages.moc.cpp \
+ gui/qt/dialogs/messages/messages.moc.cpp \
gui/qt/dialogs/errors.moc.cpp \
gui/qt/dialogs/plugins/addons_manager.moc.cpp \
gui/qt/dialogs/plugins/plugins.moc.cpp \
@@ -252,7 +252,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/open/open.moc.cpp \
gui/qt/dialogs/open/openurl.moc.cpp \
gui/qt/dialogs/podcast_configuration.moc.cpp \
- gui/qt/dialogs/firstrun.moc.cpp \
+ gui/qt/dialogs/firstrun/firstrun.moc.cpp \
gui/qt/dialogs/extensions/extensions_manager.moc.cpp \
gui/qt/dialogs/extensions/extensions.moc.cpp \
gui/qt/dialogs/fingerprint/fingerprintdialog.moc.cpp \
@@ -348,7 +348,7 @@ nodist_libqt_plugin_la_SOURCES += \
gui/qt/dialogs/preferences/ui_sprefs_subtitles.h \
gui/qt/dialogs/preferences/ui_sprefs_video.h \
gui/qt/ui/ui_streampanel.h \
- gui/qt/ui/ui_messages_panel.h \
+ gui/qt/dialogs/messages/ui_messages_panel.h \
gui/qt/dialogs/help/ui_about.h \
gui/qt/dialogs/help/ui_update.h \
gui/qt/dialogs/fingerprint/ui_fingerprintdialog.h \
@@ -387,7 +387,7 @@ libqt_plugin_la_UI = \
gui/qt/dialogs/preferences/sprefs_subtitles.ui \
gui/qt/dialogs/preferences/sprefs_video.ui \
gui/qt/ui/streampanel.ui \
- gui/qt/ui/messages_panel.ui \
+ gui/qt/dialogs/messages/messages_panel.ui \
gui/qt/dialogs/help/about.ui \
gui/qt/dialogs/help/update.ui \
gui/qt/dialogs/sout/sout.ui \
diff --git a/modules/gui/qt/dialogs/firstrun.cpp b/modules/gui/qt/dialogs/firstrun/firstrun.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/firstrun.cpp
rename to modules/gui/qt/dialogs/firstrun/firstrun.cpp
index a0b95308383a40075f922a1446218d954cd328c1..a7042a6a8d2ca7c140d9358eedf339f5e3d676c9 100644
--- a/modules/gui/qt/dialogs/firstrun.cpp
+++ b/modules/gui/qt/dialogs/firstrun/firstrun.cpp
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "dialogs/firstrun.hpp"
+#include "firstrun.hpp"
#include <QGridLayout>
#include <QGroupBox>
diff --git a/modules/gui/qt/dialogs/firstrun.hpp b/modules/gui/qt/dialogs/firstrun/firstrun.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/firstrun.hpp
rename to modules/gui/qt/dialogs/firstrun/firstrun.hpp
diff --git a/modules/gui/qt/dialogs/messages.cpp b/modules/gui/qt/dialogs/messages/messages.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/messages.cpp
rename to modules/gui/qt/dialogs/messages/messages.cpp
index 8d31eaac3e9d92150ebd291a9ea85a0e805a17d6..f0bedeadd6bb07584befc3e6a9236b8f0e8fcc18 100644
--- a/modules/gui/qt/dialogs/messages.cpp
+++ b/modules/gui/qt/dialogs/messages/messages.cpp
@@ -43,7 +43,7 @@
#include <vlc_common.h>
#include <vlc_input_item.h>
-#include "dialogs/messages.hpp"
+#include "dialogs/messages/messages.hpp"
enum {
MsgEvent_Type = QEvent::User + MsgEventTypeOffset + 1,
diff --git a/modules/gui/qt/dialogs/messages.hpp b/modules/gui/qt/dialogs/messages/messages.hpp
similarity index 97%
rename from modules/gui/qt/dialogs/messages.hpp
rename to modules/gui/qt/dialogs/messages/messages.hpp
index 9bcf7b32d6f8c11a16e01b41de47cb987fca5191..c63678a7d1dad02be0a0f6660cd6c1d674148784 100644
--- a/modules/gui/qt/dialogs/messages.hpp
+++ b/modules/gui/qt/dialogs/messages/messages.hpp
@@ -25,7 +25,7 @@
#include "util/qvlcframe.hpp"
#include "util/singleton.hpp"
-#include "ui_messages_panel.h"
+#include "dialogs/messages/ui_messages_panel.h"
#include <stdarg.h>
#include <QMutex>
#include <QAtomicInt>
diff --git a/modules/gui/qt/ui/messages_panel.ui b/modules/gui/qt/dialogs/messages/messages_panel.ui
similarity index 100%
rename from modules/gui/qt/ui/messages_panel.ui
rename to modules/gui/qt/dialogs/messages/messages_panel.ui
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 172c202dedc6d9c76f70707713d9bda719b9d4f0..72075c0d8c04e7c5321c0130d10edf6d698e20dc 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -41,7 +41,7 @@
#include "dialogs/bookmarks.hpp"
#include "dialogs/preferences/preferences.hpp"
#include "dialogs/mediainfo/mediainfo.hpp"
-#include "dialogs/messages.hpp"
+#include "dialogs/messages/messages.hpp"
#include "dialogs/extended/extended.hpp"
#include "dialogs/vlm.hpp"
#include "dialogs/sout/sout.hpp"
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 64a8fea7a84f43b12bee5b784d336515b078fd08..f31fcc0b6f537bf3898689a131a8c7756d9c51b9 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -38,7 +38,7 @@
#include "components/interface_widgets.hpp" // bgWidget, videoWidget
#include "components/controller.hpp" // controllers
-#include "dialogs/firstrun.hpp" // First Run
+#include "dialogs/firstrun/firstrun.hpp" // First Run
#include "playlist/playlist_model.hpp"
#include <vlc_playlist.h>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0ab29ebfd4f83963a68cb32a23c32b3362a13f41..a3fe95ed80cf5ef34fdbff682f23c98b81d2930f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -725,16 +725,16 @@ modules/gui/qt/dialogs/extensions/extensions.cpp
modules/gui/qt/dialogs/extensions/extensions.hpp
modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp
modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp
-modules/gui/qt/dialogs/firstrun.cpp
-modules/gui/qt/dialogs/firstrun.hpp
+modules/gui/qt/dialogs/firstrun/firstrun.cpp
+modules/gui/qt/dialogs/firstrun/firstrun.hpp
modules/gui/qt/dialogs/gototime.cpp
modules/gui/qt/dialogs/gototime.hpp
modules/gui/qt/dialogs/help/help.cpp
modules/gui/qt/dialogs/help/help.hpp
modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
-modules/gui/qt/dialogs/messages.cpp
-modules/gui/qt/dialogs/messages.hpp
+modules/gui/qt/dialogs/messages/messages.cpp
+modules/gui/qt/dialogs/messages/messages.hpp
modules/gui/qt/dialogs/open/open.cpp
modules/gui/qt/dialogs/open/open.hpp
modules/gui/qt/dialogs/open/openurl.cpp
@@ -1277,7 +1277,7 @@ share/lua/http/mobile_view.html
#modules/gui/qt/dialogs/help/ui_about.h
#modules/gui/qt/dialogs/extended/ui_equalizer.h
-#modules/gui/qt/ui/ui_messages_panel.h
+#modules/gui/qt/dialogs/messages/ui_messages_panel.h
#modules/gui/qt/dialogs/open/ui_open.h
#modules/gui/qt/dialogs/open/ui_open_capture.h
#modules/gui/qt/dialogs/open/ui_open_disk.h