diff --git a/configure.ac b/configure.ac
index 1e9aa484d0..ecefab2582 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4703,6 +4703,7 @@ AC_CONFIG_FILES([
   Makefile
   doc/Makefile
   modules/Makefile
+  modules/gui/qt/Makefile
   m4/Makefile
   po/Makefile.in
   share/Makefile
diff --git a/modules/gui/Makefile.am b/modules/gui/Makefile.am
index 129d68a1f0..c1692dda06 100644
--- a/modules/gui/Makefile.am
+++ b/modules/gui/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS += gui/qt
+
 guidir = $(pluginsdir)/gui
 gui_LTLIBRARIES =
 
@@ -21,5 +23,4 @@ EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la
 gui_LTLIBRARIES += $(LTLIBminimal_macosx)
 
 include gui/macosx/Makefile.am
-include gui/qt/Makefile.am
 include gui/skins2/Makefile.am
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 40c8bcacc3..d0623d680a 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -11,28 +11,32 @@
 # For each qml and js resource
 #   - Add it to ..._QML
 
+include ../../common.am
+guidir = $(pluginsdir)/gui
+gui_LTLIBRARIES =
 SUFFIXES += .ui .h .hpp .moc.cpp .qml
+EXTRA_DIST =
 
 vlc_qt_libs = $(QT5_PLUGINS_LIBS) $(QT5_PLATFORM_PLUGINS_LIBS) $(QT5_XCB_PLUGINS_LIBS) $(QT5_WAYLAND_PLUGINS_LIBS) $(QT_LIBS) $(LIBS_qt)
 
-vlc_qt_check_SOURCES = gui/qt/vlc-qt-check.cpp gui/qt/plugins.hpp
+vlc_qt_check_SOURCES = vlc-qt-check.cpp plugins.hpp
 vlc_qt_check_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) -fPIC $(CXXFLAGS_qt)
 vlc_qt_check_CPPFLAGS = $(AM_CPPFLAGS)
 vlc_qt_check_LDADD = $(vlc_qt_libs)
 
 libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DQT_STRICT_ITERATORS \
-	-I$(srcdir)/gui/qt -I$(builddir)/gui/qt/ \
-	-I$(builddir)/gui/qt/dialogs/extended \
-	-I$(builddir)/gui/qt/dialogs/fingerprint \
-	-I$(builddir)/gui/qt/dialogs/firstrun \
-	-I$(builddir)/gui/qt/dialogs/help \
-	-I$(builddir)/gui/qt/dialogs/messages \
-	-I$(builddir)/gui/qt/dialogs/open \
-	-I$(builddir)/gui/qt/dialogs/podcast \
-	-I$(builddir)/gui/qt/dialogs/preferences \
-	-I$(builddir)/gui/qt/dialogs/sout \
-	-I$(builddir)/gui/qt/dialogs/vlm \
+	-I$(srcdir)/gui/qt -I$(builddir)/ \
+	-I$(builddir)/dialogs/extended \
+	-I$(builddir)/dialogs/fingerprint \
+	-I$(builddir)/dialogs/firstrun \
+	-I$(builddir)/dialogs/help \
+	-I$(builddir)/dialogs/messages \
+	-I$(builddir)/dialogs/open \
+	-I$(builddir)/dialogs/podcast \
+	-I$(builddir)/dialogs/preferences \
+	-I$(builddir)/dialogs/sout \
+	-I$(builddir)/dialogs/vlm \
 	-DQPNI_HEADER=\<$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h\>
 
 libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt)
@@ -96,271 +100,271 @@ libqt_plugin_la_CPPFLAGS += -DQT5_DECLARATIVE_PRIVATE \
 endif
 
 libqt_plugin_la_SOURCES = \
-	gui/qt/qt.cpp gui/qt/qt.hpp gui/qt/plugins.hpp \
-	gui/qt/dialogs/bookmarks/bookmarks.cpp gui/qt/dialogs/bookmarks/bookmarks.hpp \
-	gui/qt/dialogs/dialogs/dialogmodel.cpp \
-	gui/qt/dialogs/dialogs/dialogmodel.hpp \
-	gui/qt/dialogs/dialogs_provider.cpp gui/qt/dialogs/dialogs_provider.hpp \
-	gui/qt/dialogs/epg/EPGChannels.cpp \
-	gui/qt/dialogs/epg/EPGChannels.hpp \
-	gui/qt/dialogs/epg/EPGItem.cpp \
-	gui/qt/dialogs/epg/EPGItem.hpp \
-	gui/qt/dialogs/epg/EPGProgram.cpp \
-	gui/qt/dialogs/epg/EPGProgram.hpp \
-	gui/qt/dialogs/epg/EPGRuler.cpp gui/qt/dialogs/epg/EPGRuler.hpp \
-	gui/qt/dialogs/epg/EPGView.cpp gui/qt/dialogs/epg/EPGView.hpp \
-	gui/qt/dialogs/epg/EPGWidget.cpp \
-	gui/qt/dialogs/epg/EPGWidget.hpp \
-	gui/qt/dialogs/epg/epg.cpp gui/qt/dialogs/epg/epg.hpp \
-	gui/qt/dialogs/errors/errors.cpp gui/qt/dialogs/errors/errors.hpp \
-	gui/qt/dialogs/extended/extended.cpp gui/qt/dialogs/extended/extended.hpp \
-	gui/qt/dialogs/extended/extended_panels.cpp \
-	gui/qt/dialogs/extended/extended_panels.hpp \
-	gui/qt/dialogs/extensions/extensions.cpp gui/qt/dialogs/extensions/extensions.hpp \
-	gui/qt/dialogs/extensions/extensions_manager.cpp gui/qt/dialogs/extensions/extensions_manager.hpp \
-	gui/qt/dialogs/fingerprint/chromaprint.cpp \
-	gui/qt/dialogs/fingerprint/chromaprint.hpp \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.cpp \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.hpp \
-	gui/qt/dialogs/firstrun/firstrunwizard.cpp gui/qt/dialogs/firstrun/firstrunwizard.hpp \
-	gui/qt/dialogs/gototime/gototime.cpp gui/qt/dialogs/gototime/gototime.hpp \
-	gui/qt/dialogs/help/aboutmodel.cpp \
-	gui/qt/dialogs/help/aboutmodel.hpp \
-	gui/qt/dialogs/help/help.cpp gui/qt/dialogs/help/help.hpp \
-	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/mediainfo/mediainfo.cpp gui/qt/dialogs/mediainfo/mediainfo.hpp \
-	gui/qt/dialogs/messages/messages.cpp gui/qt/dialogs/messages/messages.hpp \
-	gui/qt/dialogs/open/open.cpp gui/qt/dialogs/open/open.hpp \
-	gui/qt/dialogs/open/open_panels.cpp gui/qt/dialogs/open/open_panels.hpp \
-	gui/qt/dialogs/open/openurl.cpp gui/qt/dialogs/open/openurl.hpp \
-	gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
-	gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \
-	gui/qt/dialogs/podcast/podcast_configuration.cpp \
-	gui/qt/dialogs/podcast/podcast_configuration.hpp \
-	gui/qt/dialogs/preferences/complete_preferences.cpp \
-	gui/qt/dialogs/preferences/complete_preferences.hpp \
-	gui/qt/dialogs/preferences/expert_model.cpp \
-	gui/qt/dialogs/preferences/expert_model.hpp \
-	gui/qt/dialogs/preferences/expert_view.cpp \
-	gui/qt/dialogs/preferences/expert_view.hpp \
-	gui/qt/dialogs/preferences/preferences.cpp \
-	gui/qt/dialogs/preferences/preferences.hpp \
-	gui/qt/dialogs/preferences/preferences_widgets.cpp \
-	gui/qt/dialogs/preferences/preferences_widgets.hpp \
-	gui/qt/dialogs/preferences/simple_preferences.cpp \
-	gui/qt/dialogs/preferences/simple_preferences.hpp \
-	gui/qt/dialogs/sout/convert.cpp gui/qt/dialogs/sout/convert.hpp \
-	gui/qt/dialogs/sout/profile_selector.cpp \
-	gui/qt/dialogs/sout/profile_selector.hpp \
-	gui/qt/dialogs/sout/profiles.hpp \
-	gui/qt/dialogs/sout/sout.cpp gui/qt/dialogs/sout/sout.hpp \
-	gui/qt/dialogs/sout/sout_widgets.cpp \
-	gui/qt/dialogs/sout/sout_widgets.hpp \
-	gui/qt/dialogs/toolbar/controlbar_profile.hpp \
-	gui/qt/dialogs/toolbar/controlbar_profile.cpp \
-	gui/qt/dialogs/toolbar/controlbar_profile_model.cpp \
-	gui/qt/dialogs/toolbar/controlbar_profile_model.hpp \
-	gui/qt/dialogs/vlm/vlm.cpp gui/qt/dialogs/vlm/vlm.hpp \
-	gui/qt/dialogs/playlists/playlists.cpp gui/qt/dialogs/playlists/playlists.hpp \
-	gui/qt/maininterface/compositor.hpp \
-	gui/qt/maininterface/compositor.cpp \
-	gui/qt/maininterface/compositor_common.hpp \
-	gui/qt/maininterface/compositor_common.cpp \
-	gui/qt/maininterface/compositor_accessibility.cpp \
-	gui/qt/maininterface/compositor_accessibility.hpp \
-	gui/qt/maininterface/compositor_dummy.hpp \
-	gui/qt/maininterface/compositor_dummy.cpp \
-	gui/qt/maininterface/interface_window_handler.cpp \
-	gui/qt/maininterface/interface_window_handler.hpp \
-	gui/qt/maininterface/mainctx.cpp \
-	gui/qt/maininterface/mainctx.hpp \
-	gui/qt/maininterface/mainctx_submodels.hpp \
-	gui/qt/maininterface/mainui.cpp \
-	gui/qt/maininterface/mainui.hpp \
-	gui/qt/maininterface/videosurface.cpp \
-	gui/qt/maininterface/videosurface.hpp \
-	gui/qt/maininterface/video_window_handler.cpp \
-	gui/qt/maininterface/video_window_handler.hpp \
-	gui/qt/medialibrary/medialib.cpp \
-	gui/qt/medialibrary/medialib.hpp \
-	gui/qt/medialibrary/mlalbum.cpp \
-	gui/qt/medialibrary/mlalbum.hpp \
-	gui/qt/medialibrary/mlalbummodel.cpp \
-	gui/qt/medialibrary/mlalbummodel.hpp \
-	gui/qt/medialibrary/mlalbumtrack.cpp \
-	gui/qt/medialibrary/mlalbumtrack.hpp \
-	gui/qt/medialibrary/mlalbumtrackmodel.cpp \
-	gui/qt/medialibrary/mlalbumtrackmodel.hpp \
-	gui/qt/medialibrary/mlartist.cpp \
-	gui/qt/medialibrary/mlartist.hpp \
-	gui/qt/medialibrary/mlartistmodel.cpp \
-	gui/qt/medialibrary/mlartistmodel.hpp \
-	gui/qt/medialibrary/mlbasemodel.cpp \
-	gui/qt/medialibrary/mlbasemodel.hpp \
-	gui/qt/medialibrary/mlbookmarkmodel.cpp \
-	gui/qt/medialibrary/mlbookmarkmodel.hpp \
-	gui/qt/medialibrary/mlevent.hpp \
-	gui/qt/medialibrary/mlfolder.cpp \
-	gui/qt/medialibrary/mlfolder.hpp \
-	gui/qt/medialibrary/mlfoldersmodel.cpp \
-	gui/qt/medialibrary/mlfoldersmodel.hpp \
-	gui/qt/medialibrary/mlgenre.cpp \
-	gui/qt/medialibrary/mlgenre.hpp \
-	gui/qt/medialibrary/mlgenremodel.cpp \
-	gui/qt/medialibrary/mlgenremodel.hpp \
-	gui/qt/medialibrary/mlgroup.cpp \
-	gui/qt/medialibrary/mlgroup.hpp \
-	gui/qt/medialibrary/mlhelper.cpp \
-	gui/qt/medialibrary/mlhelper.hpp \
-	gui/qt/medialibrary/mlthreadpool.cpp \
-	gui/qt/medialibrary/mlthreadpool.hpp \
-	gui/qt/medialibrary/mlqmltypes.hpp \
-	gui/qt/medialibrary/mlqueryparams.cpp \
-	gui/qt/medialibrary/mlqueryparams.hpp \
-	gui/qt/medialibrary/mlrecentsmodel.cpp \
-	gui/qt/medialibrary/mlrecentsmodel.hpp \
-	gui/qt/medialibrary/mlrecentsvideomodel.cpp \
-	gui/qt/medialibrary/mlrecentsvideomodel.hpp \
-	gui/qt/medialibrary/mlurlmodel.cpp \
-	gui/qt/medialibrary/mlurlmodel.hpp \
-	gui/qt/medialibrary/mlvideo.cpp \
-	gui/qt/medialibrary/mlvideo.hpp \
-	gui/qt/medialibrary/mlvideofoldersmodel.cpp \
-	gui/qt/medialibrary/mlvideofoldersmodel.hpp \
-	gui/qt/medialibrary/mlvideogroupsmodel.cpp \
-	gui/qt/medialibrary/mlvideogroupsmodel.hpp \
-	gui/qt/medialibrary/mlvideomodel.cpp \
-	gui/qt/medialibrary/mlvideomodel.hpp \
-	gui/qt/medialibrary/mlplaylist.cpp \
-	gui/qt/medialibrary/mlplaylist.hpp \
-	gui/qt/medialibrary/mlplaylistlistmodel.cpp \
-	gui/qt/medialibrary/mlplaylistlistmodel.hpp \
-	gui/qt/medialibrary/mlplaylistmedia.cpp \
-	gui/qt/medialibrary/mlplaylistmedia.hpp \
-	gui/qt/medialibrary/mlplaylistmodel.cpp \
-	gui/qt/medialibrary/mlplaylistmodel.hpp \
-	gui/qt/medialibrary/thumbnailcollector.hpp \
-	gui/qt/medialibrary/thumbnailcollector.cpp \
-	gui/qt/medialibrary/mlcustomcover.hpp \
-	gui/qt/medialibrary/mlcustomcover.cpp \
-	gui/qt/menus/custom_menus.cpp \
-	gui/qt/menus/custom_menus.hpp \
-	gui/qt/menus/qml_menu_wrapper.cpp \
-	gui/qt/menus/qml_menu_wrapper.hpp \
-	gui/qt/menus/menus.cpp gui/qt/menus/menus.hpp \
-	gui/qt/network/mediatreelistener.cpp \
-	gui/qt/network/mediatreelistener.hpp \
-	gui/qt/network/networkdevicemodel.cpp \
-	gui/qt/network/networkdevicemodel.hpp \
-	gui/qt/network/networksourcesmodel.cpp \
-	gui/qt/network/networksourcesmodel.hpp \
-	gui/qt/network/networkmediamodel.cpp \
-	gui/qt/network/networkmediamodel.hpp \
-	gui/qt/network/servicesdiscoverymodel.cpp \
-	gui/qt/network/servicesdiscoverymodel.hpp \
-	gui/qt/network/standardpathmodel.cpp \
-	gui/qt/network/standardpathmodel.hpp \
-	gui/qt/style/qtthemeprovider.hpp \
-	gui/qt/style/colorcontext.cpp \
-	gui/qt/style/colorcontext.hpp \
-	gui/qt/style/systempalette.cpp \
-	gui/qt/style/systempalette.hpp \
-	gui/qt/style/defaultthemeproviders.hpp \
-	gui/qt/style/systempalettethemeprovider.cpp \
-	gui/qt/player/input_models.cpp gui/qt/player/input_models.hpp \
-	gui/qt/player/delay_estimator.cpp \
-	gui/qt/player/delay_estimator.hpp \
-	gui/qt/player/player_controller.cpp gui/qt/player/player_controller.hpp gui/qt/player/player_controller_p.hpp \
-	gui/qt/player/player_controlbar_model.cpp gui/qt/player/player_controlbar_model.hpp \
-	gui/qt/player/control_list_model.cpp gui/qt/player/control_list_model.hpp \
-	gui/qt/player/control_list_filter.cpp \
-	gui/qt/player/control_list_filter.hpp \
-	gui/qt/playlist/media.hpp \
-	gui/qt/playlist/playlist_common.hpp \
-	gui/qt/playlist/playlist_controller.cpp \
-	gui/qt/playlist/playlist_controller.hpp \
-	gui/qt/playlist/playlist_controller_p.hpp \
-	gui/qt/playlist/playlist_item.cpp \
-	gui/qt/playlist/playlist_item.hpp \
-	gui/qt/playlist/playlist_model.cpp \
-	gui/qt/playlist/playlist_model.hpp \
-	gui/qt/playlist/playlist_model_p.hpp \
-	gui/qt/util/asynctask.hpp \
-	gui/qt/util/audio_device_model.cpp  \
-	gui/qt/util/audio_device_model.hpp \
-	gui/qt/util/base_model.hpp gui/qt/util/base_model_p.hpp gui/qt/util/base_model.cpp \
-	gui/qt/util/color_scheme_model.cpp gui/qt/util/color_scheme_model.hpp \
-	gui/qt/util/color_svg_image_provider.cpp gui/qt/util/color_svg_image_provider.hpp \
-	gui/qt/util/covergenerator.cpp \
-	gui/qt/util/covergenerator.hpp \
-	gui/qt/util/imageluminanceextractor.cpp gui/qt/util/imageluminanceextractor.hpp \
-	gui/qt/util/csdbuttonmodel.cpp gui/qt/util/csdbuttonmodel.hpp \
-	gui/qt/util/imagehelper.cpp gui/qt/util/imagehelper.hpp \
-	gui/qt/util/i18n.cpp gui/qt/util/i18n.hpp \
-	gui/qt/util/keyhelper.cpp gui/qt/util/keyhelper.hpp \
-	gui/qt/util/listcache.hxx gui/qt/util/listcache.hpp \
-	gui/qt/util/listcacheloader.hpp \
-	gui/qt/util/locallistcacheloader.hpp \
-	gui/qt/util/navigation_history.cpp gui/qt/util/navigation_history.hpp \
-	gui/qt/util/item_key_event_filter.cpp \
-	gui/qt/util/item_key_event_filter.hpp \
-	gui/qt/util/flickable_scroll_handler.cpp \
-	gui/qt/util/flickable_scroll_handler.hpp \
-	gui/qt/util/qt_dirs.cpp gui/qt/util/qt_dirs.hpp \
-	gui/qt/util/proxycolumnmodel.hpp \
-	gui/qt/util/registry.cpp gui/qt/util/registry.hpp \
-	gui/qt/util/renderer_manager.cpp gui/qt/util/renderer_manager.hpp \
-	gui/qt/util/singleton.hpp \
-	gui/qt/util/soutchain.cpp gui/qt/util/soutchain.hpp \
-	gui/qt/util/validators.cpp gui/qt/util/validators.hpp \
-	gui/qt/util/varcommon_p.hpp \
-	gui/qt/util/varchoicemodel.cpp  gui/qt/util/varchoicemodel.hpp \
-	gui/qt/util/variables.cpp gui/qt/util/variables.hpp \
-	gui/qt/util/vlctick.cpp \
-	gui/qt/util/vlctick.hpp \
-	gui/qt/util/shared_input_item.hpp \
-	gui/qt/util/effects_image_provider.cpp \
-	gui/qt/util/effects_image_provider.hpp \
-	gui/qt/util/qsgroundedrectangularimagenode.cpp \
-	gui/qt/util/qsgroundedrectangularimagenode.hpp \
-	gui/qt/util/dismiss_popup_event_filter.cpp \
-	gui/qt/util/dismiss_popup_event_filter.hpp \
-	gui/qt/util/list_selection_model.cpp \
-	gui/qt/util/list_selection_model.hpp \
-	gui/qt/widgets/native/animators.cpp \
-	gui/qt/widgets/native/animators.hpp \
-	gui/qt/widgets/native/customwidgets.cpp gui/qt/widgets/native/customwidgets.hpp \
-	gui/qt/widgets/native/csdthemeimage.cpp \
-	gui/qt/widgets/native/csdthemeimage.hpp \
-	gui/qt/widgets/native/interface_widgets.cpp \
-	gui/qt/widgets/native/interface_widgets.hpp \
-	gui/qt/widgets/native/navigation_attached.cpp \
-	gui/qt/widgets/native/navigation_attached.hpp \
-	gui/qt/widgets/native/mlfolderseditor.cpp \
-	gui/qt/widgets/native/mlfolderseditor.hpp \
-	gui/qt/widgets/native/qvlcframe.cpp \
-	gui/qt/widgets/native/qvlcframe.hpp \
-	gui/qt/widgets/native/roundimage.cpp gui/qt/widgets/native/roundimage.hpp gui/qt/widgets/native/roundimage_p.hpp \
-	gui/qt/widgets/native/searchlineedit.cpp gui/qt/widgets/native/searchlineedit.hpp \
-	gui/qt/widgets/native/viewblockingrectangle.cpp gui/qt/widgets/native/viewblockingrectangle.hpp
+	qt.cpp qt.hpp plugins.hpp \
+	dialogs/bookmarks/bookmarks.cpp dialogs/bookmarks/bookmarks.hpp \
+	dialogs/dialogs/dialogmodel.cpp \
+	dialogs/dialogs/dialogmodel.hpp \
+	dialogs/dialogs_provider.cpp dialogs/dialogs_provider.hpp \
+	dialogs/epg/EPGChannels.cpp \
+	dialogs/epg/EPGChannels.hpp \
+	dialogs/epg/EPGItem.cpp \
+	dialogs/epg/EPGItem.hpp \
+	dialogs/epg/EPGProgram.cpp \
+	dialogs/epg/EPGProgram.hpp \
+	dialogs/epg/EPGRuler.cpp dialogs/epg/EPGRuler.hpp \
+	dialogs/epg/EPGView.cpp dialogs/epg/EPGView.hpp \
+	dialogs/epg/EPGWidget.cpp \
+	dialogs/epg/EPGWidget.hpp \
+	dialogs/epg/epg.cpp dialogs/epg/epg.hpp \
+	dialogs/errors/errors.cpp dialogs/errors/errors.hpp \
+	dialogs/extended/extended.cpp dialogs/extended/extended.hpp \
+	dialogs/extended/extended_panels.cpp \
+	dialogs/extended/extended_panels.hpp \
+	dialogs/extensions/extensions.cpp dialogs/extensions/extensions.hpp \
+	dialogs/extensions/extensions_manager.cpp dialogs/extensions/extensions_manager.hpp \
+	dialogs/fingerprint/chromaprint.cpp \
+	dialogs/fingerprint/chromaprint.hpp \
+	dialogs/fingerprint/fingerprintdialog.cpp \
+	dialogs/fingerprint/fingerprintdialog.hpp \
+	dialogs/firstrun/firstrunwizard.cpp dialogs/firstrun/firstrunwizard.hpp \
+	dialogs/gototime/gototime.cpp dialogs/gototime/gototime.hpp \
+	dialogs/help/aboutmodel.cpp \
+	dialogs/help/aboutmodel.hpp \
+	dialogs/help/help.cpp dialogs/help/help.hpp \
+	dialogs/mediainfo/info_panels.cpp dialogs/mediainfo/info_panels.hpp \
+	dialogs/mediainfo/info_widgets.cpp dialogs/mediainfo/info_widgets.hpp \
+	dialogs/mediainfo/mediainfo.cpp dialogs/mediainfo/mediainfo.hpp \
+	dialogs/messages/messages.cpp dialogs/messages/messages.hpp \
+	dialogs/open/open.cpp dialogs/open/open.hpp \
+	dialogs/open/open_panels.cpp dialogs/open/open_panels.hpp \
+	dialogs/open/openurl.cpp dialogs/open/openurl.hpp \
+	dialogs/plugins/addons_manager.cpp dialogs/plugins/addons_manager.hpp \
+	dialogs/plugins/plugins.cpp dialogs/plugins/plugins.hpp \
+	dialogs/podcast/podcast_configuration.cpp \
+	dialogs/podcast/podcast_configuration.hpp \
+	dialogs/preferences/complete_preferences.cpp \
+	dialogs/preferences/complete_preferences.hpp \
+	dialogs/preferences/expert_model.cpp \
+	dialogs/preferences/expert_model.hpp \
+	dialogs/preferences/expert_view.cpp \
+	dialogs/preferences/expert_view.hpp \
+	dialogs/preferences/preferences.cpp \
+	dialogs/preferences/preferences.hpp \
+	dialogs/preferences/preferences_widgets.cpp \
+	dialogs/preferences/preferences_widgets.hpp \
+	dialogs/preferences/simple_preferences.cpp \
+	dialogs/preferences/simple_preferences.hpp \
+	dialogs/sout/convert.cpp dialogs/sout/convert.hpp \
+	dialogs/sout/profile_selector.cpp \
+	dialogs/sout/profile_selector.hpp \
+	dialogs/sout/profiles.hpp \
+	dialogs/sout/sout.cpp dialogs/sout/sout.hpp \
+	dialogs/sout/sout_widgets.cpp \
+	dialogs/sout/sout_widgets.hpp \
+	dialogs/toolbar/controlbar_profile.hpp \
+	dialogs/toolbar/controlbar_profile.cpp \
+	dialogs/toolbar/controlbar_profile_model.cpp \
+	dialogs/toolbar/controlbar_profile_model.hpp \
+	dialogs/vlm/vlm.cpp dialogs/vlm/vlm.hpp \
+	dialogs/playlists/playlists.cpp dialogs/playlists/playlists.hpp \
+	maininterface/compositor.hpp \
+	maininterface/compositor.cpp \
+	maininterface/compositor_common.hpp \
+	maininterface/compositor_common.cpp \
+	maininterface/compositor_accessibility.cpp \
+	maininterface/compositor_accessibility.hpp \
+	maininterface/compositor_dummy.hpp \
+	maininterface/compositor_dummy.cpp \
+	maininterface/interface_window_handler.cpp \
+	maininterface/interface_window_handler.hpp \
+	maininterface/mainctx.cpp \
+	maininterface/mainctx.hpp \
+	maininterface/mainctx_submodels.hpp \
+	maininterface/mainui.cpp \
+	maininterface/mainui.hpp \
+	maininterface/videosurface.cpp \
+	maininterface/videosurface.hpp \
+	maininterface/video_window_handler.cpp \
+	maininterface/video_window_handler.hpp \
+	medialibrary/medialib.cpp \
+	medialibrary/medialib.hpp \
+	medialibrary/mlalbum.cpp \
+	medialibrary/mlalbum.hpp \
+	medialibrary/mlalbummodel.cpp \
+	medialibrary/mlalbummodel.hpp \
+	medialibrary/mlalbumtrack.cpp \
+	medialibrary/mlalbumtrack.hpp \
+	medialibrary/mlalbumtrackmodel.cpp \
+	medialibrary/mlalbumtrackmodel.hpp \
+	medialibrary/mlartist.cpp \
+	medialibrary/mlartist.hpp \
+	medialibrary/mlartistmodel.cpp \
+	medialibrary/mlartistmodel.hpp \
+	medialibrary/mlbasemodel.cpp \
+	medialibrary/mlbasemodel.hpp \
+	medialibrary/mlbookmarkmodel.cpp \
+	medialibrary/mlbookmarkmodel.hpp \
+	medialibrary/mlevent.hpp \
+	medialibrary/mlfolder.cpp \
+	medialibrary/mlfolder.hpp \
+	medialibrary/mlfoldersmodel.cpp \
+	medialibrary/mlfoldersmodel.hpp \
+	medialibrary/mlgenre.cpp \
+	medialibrary/mlgenre.hpp \
+	medialibrary/mlgenremodel.cpp \
+	medialibrary/mlgenremodel.hpp \
+	medialibrary/mlgroup.cpp \
+	medialibrary/mlgroup.hpp \
+	medialibrary/mlhelper.cpp \
+	medialibrary/mlhelper.hpp \
+	medialibrary/mlthreadpool.cpp \
+	medialibrary/mlthreadpool.hpp \
+	medialibrary/mlqmltypes.hpp \
+	medialibrary/mlqueryparams.cpp \
+	medialibrary/mlqueryparams.hpp \
+	medialibrary/mlrecentsmodel.cpp \
+	medialibrary/mlrecentsmodel.hpp \
+	medialibrary/mlrecentsvideomodel.cpp \
+	medialibrary/mlrecentsvideomodel.hpp \
+	medialibrary/mlurlmodel.cpp \
+	medialibrary/mlurlmodel.hpp \
+	medialibrary/mlvideo.cpp \
+	medialibrary/mlvideo.hpp \
+	medialibrary/mlvideofoldersmodel.cpp \
+	medialibrary/mlvideofoldersmodel.hpp \
+	medialibrary/mlvideogroupsmodel.cpp \
+	medialibrary/mlvideogroupsmodel.hpp \
+	medialibrary/mlvideomodel.cpp \
+	medialibrary/mlvideomodel.hpp \
+	medialibrary/mlplaylist.cpp \
+	medialibrary/mlplaylist.hpp \
+	medialibrary/mlplaylistlistmodel.cpp \
+	medialibrary/mlplaylistlistmodel.hpp \
+	medialibrary/mlplaylistmedia.cpp \
+	medialibrary/mlplaylistmedia.hpp \
+	medialibrary/mlplaylistmodel.cpp \
+	medialibrary/mlplaylistmodel.hpp \
+	medialibrary/thumbnailcollector.hpp \
+	medialibrary/thumbnailcollector.cpp \
+	medialibrary/mlcustomcover.hpp \
+	medialibrary/mlcustomcover.cpp \
+	menus/custom_menus.cpp \
+	menus/custom_menus.hpp \
+	menus/qml_menu_wrapper.cpp \
+	menus/qml_menu_wrapper.hpp \
+	menus/menus.cpp menus/menus.hpp \
+	network/mediatreelistener.cpp \
+	network/mediatreelistener.hpp \
+	network/networkdevicemodel.cpp \
+	network/networkdevicemodel.hpp \
+	network/networksourcesmodel.cpp \
+	network/networksourcesmodel.hpp \
+	network/networkmediamodel.cpp \
+	network/networkmediamodel.hpp \
+	network/servicesdiscoverymodel.cpp \
+	network/servicesdiscoverymodel.hpp \
+	network/standardpathmodel.cpp \
+	network/standardpathmodel.hpp \
+	style/qtthemeprovider.hpp \
+	style/colorcontext.cpp \
+	style/colorcontext.hpp \
+	style/systempalette.cpp \
+	style/systempalette.hpp \
+	style/defaultthemeproviders.hpp \
+	style/systempalettethemeprovider.cpp \
+	player/input_models.cpp player/input_models.hpp \
+	player/delay_estimator.cpp \
+	player/delay_estimator.hpp \
+	player/player_controller.cpp player/player_controller.hpp player/player_controller_p.hpp \
+	player/player_controlbar_model.cpp player/player_controlbar_model.hpp \
+	player/control_list_model.cpp player/control_list_model.hpp \
+	player/control_list_filter.cpp \
+	player/control_list_filter.hpp \
+	playlist/media.hpp \
+	playlist/playlist_common.hpp \
+	playlist/playlist_controller.cpp \
+	playlist/playlist_controller.hpp \
+	playlist/playlist_controller_p.hpp \
+	playlist/playlist_item.cpp \
+	playlist/playlist_item.hpp \
+	playlist/playlist_model.cpp \
+	playlist/playlist_model.hpp \
+	playlist/playlist_model_p.hpp \
+	util/asynctask.hpp \
+	util/audio_device_model.cpp  \
+	util/audio_device_model.hpp \
+	util/base_model.hpp util/base_model_p.hpp util/base_model.cpp \
+	util/color_scheme_model.cpp util/color_scheme_model.hpp \
+	util/color_svg_image_provider.cpp util/color_svg_image_provider.hpp \
+	util/covergenerator.cpp \
+	util/covergenerator.hpp \
+	util/imageluminanceextractor.cpp util/imageluminanceextractor.hpp \
+	util/csdbuttonmodel.cpp util/csdbuttonmodel.hpp \
+	util/imagehelper.cpp util/imagehelper.hpp \
+	util/i18n.cpp util/i18n.hpp \
+	util/keyhelper.cpp util/keyhelper.hpp \
+	util/listcache.hxx util/listcache.hpp \
+	util/listcacheloader.hpp \
+	util/locallistcacheloader.hpp \
+	util/navigation_history.cpp util/navigation_history.hpp \
+	util/item_key_event_filter.cpp \
+	util/item_key_event_filter.hpp \
+	util/flickable_scroll_handler.cpp \
+	util/flickable_scroll_handler.hpp \
+	util/qt_dirs.cpp util/qt_dirs.hpp \
+	util/proxycolumnmodel.hpp \
+	util/registry.cpp util/registry.hpp \
+	util/renderer_manager.cpp util/renderer_manager.hpp \
+	util/singleton.hpp \
+	util/soutchain.cpp util/soutchain.hpp \
+	util/validators.cpp util/validators.hpp \
+	util/varcommon_p.hpp \
+	util/varchoicemodel.cpp  util/varchoicemodel.hpp \
+	util/variables.cpp util/variables.hpp \
+	util/vlctick.cpp \
+	util/vlctick.hpp \
+	util/shared_input_item.hpp \
+	util/effects_image_provider.cpp \
+	util/effects_image_provider.hpp \
+	util/qsgroundedrectangularimagenode.cpp \
+	util/qsgroundedrectangularimagenode.hpp \
+	util/dismiss_popup_event_filter.cpp \
+	util/dismiss_popup_event_filter.hpp \
+	util/list_selection_model.cpp \
+	util/list_selection_model.hpp \
+	widgets/native/animators.cpp \
+	widgets/native/animators.hpp \
+	widgets/native/customwidgets.cpp widgets/native/customwidgets.hpp \
+	widgets/native/csdthemeimage.cpp \
+	widgets/native/csdthemeimage.hpp \
+	widgets/native/interface_widgets.cpp \
+	widgets/native/interface_widgets.hpp \
+	widgets/native/navigation_attached.cpp \
+	widgets/native/navigation_attached.hpp \
+	widgets/native/mlfolderseditor.cpp \
+	widgets/native/mlfolderseditor.hpp \
+	widgets/native/qvlcframe.cpp \
+	widgets/native/qvlcframe.hpp \
+	widgets/native/roundimage.cpp widgets/native/roundimage.hpp widgets/native/roundimage_p.hpp \
+	widgets/native/searchlineedit.cpp widgets/native/searchlineedit.hpp \
+	widgets/native/viewblockingrectangle.cpp widgets/native/viewblockingrectangle.hpp
 if HAVE_WIN32
 libqt_plugin_la_SOURCES += \
-	gui/qt/maininterface/mainctx_win32.cpp \
-	gui/qt/maininterface/mainctx_win32.hpp \
-	gui/qt/maininterface/compositor_win7.cpp \
-	gui/qt/maininterface/compositor_win7.hpp \
-	gui/qt/style/windowsthemeprovider.cpp
+	maininterface/mainctx_win32.cpp \
+	maininterface/mainctx_win32.hpp \
+	maininterface/compositor_win7.cpp \
+	maininterface/compositor_win7.hpp \
+	style/windowsthemeprovider.cpp
 
 if HAVE_DCOMP
 libqt_plugin_la_SOURCES += \
-	gui/qt/maininterface/compositor_dcomp.cpp \
-	gui/qt/maininterface/compositor_dcomp.hpp \
-	gui/qt/maininterface/compositor_dcomp_error.hpp \
-	gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp \
-	gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp \
-	gui/qt/maininterface/compositor_dcomp_uisurface.cpp \
-	gui/qt/maininterface/compositor_dcomp_uisurface.hpp
+	maininterface/compositor_dcomp.cpp \
+	maininterface/compositor_dcomp.hpp \
+	maininterface/compositor_dcomp_error.hpp \
+	maininterface/compositor_dcomp_acrylicsurface.hpp \
+	maininterface/compositor_dcomp_acrylicsurface.cpp \
+	maininterface/compositor_dcomp_uisurface.cpp \
+	maininterface/compositor_dcomp_uisurface.hpp
 endif
 
 endif
@@ -370,16 +374,16 @@ if HAVE_XCB
 if HAVE_XCB_DAMAGE
 if HAVE_XCB_XFIXES
 libqt_plugin_la_SOURCES += \
-	gui/qt/maininterface/compositor_x11.cpp \
-	gui/qt/maininterface/compositor_x11.hpp \
-	gui/qt/maininterface/compositor_x11_renderclient.cpp \
-	gui/qt/maininterface/compositor_x11_renderclient.hpp \
-	gui/qt/maininterface/compositor_x11_renderwindow.cpp \
-	gui/qt/maininterface/compositor_x11_renderwindow.hpp \
-	gui/qt/maininterface/compositor_x11_uisurface.cpp \
-	gui/qt/maininterface/compositor_x11_uisurface.hpp \
-	gui/qt/maininterface/compositor_x11_utils.cpp \
-	gui/qt/maininterface/compositor_x11_utils.hpp
+	maininterface/compositor_x11.cpp \
+	maininterface/compositor_x11.hpp \
+	maininterface/compositor_x11_renderclient.cpp \
+	maininterface/compositor_x11_renderclient.hpp \
+	maininterface/compositor_x11_renderwindow.cpp \
+	maininterface/compositor_x11_renderwindow.hpp \
+	maininterface/compositor_x11_uisurface.cpp \
+	maininterface/compositor_x11_uisurface.hpp \
+	maininterface/compositor_x11_utils.cpp \
+	maininterface/compositor_x11_utils.hpp
 endif
 endif
 endif
@@ -399,142 +403,142 @@ moc_verbose__0 = $(moc_verbose_0)
 dialogs/dialogs_provider.moc.cpp dialogs/vlm/vlm.moc.cpp: $(top_builddir)/config.h
 
 nodist_libqt_plugin_la_SOURCES = \
-	gui/qt/dialogs/bookmarks/bookmarks.moc.cpp \
-	gui/qt/dialogs/dialogs/dialogmodel.moc.cpp \
-	gui/qt/dialogs/dialogs_provider.moc.cpp \
-	gui/qt/dialogs/epg/EPGChannels.moc.cpp \
-	gui/qt/dialogs/epg/EPGProgram.moc.cpp \
-	gui/qt/dialogs/epg/EPGRuler.moc.cpp \
-	gui/qt/dialogs/epg/EPGView.moc.cpp \
-	gui/qt/dialogs/epg/EPGWidget.moc.cpp \
-	gui/qt/dialogs/epg/epg.moc.cpp \
-	gui/qt/dialogs/errors/errors.moc.cpp \
-	gui/qt/dialogs/extended/extended.moc.cpp \
-	gui/qt/dialogs/extended/extended_panels.moc.cpp \
-	gui/qt/dialogs/extensions/extensions.moc.cpp \
-	gui/qt/dialogs/extensions/extensions_manager.moc.cpp \
-	gui/qt/dialogs/fingerprint/chromaprint.moc.cpp \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.moc.cpp \
-	gui/qt/dialogs/firstrun/firstrunwizard.moc.cpp \
-	gui/qt/dialogs/gototime/gototime.moc.cpp \
-	gui/qt/dialogs/help/aboutmodel.moc.cpp \
-	gui/qt/dialogs/help/help.moc.cpp \
-	gui/qt/dialogs/mediainfo/info_panels.moc.cpp \
-	gui/qt/dialogs/mediainfo/info_widgets.moc.cpp \
-	gui/qt/dialogs/mediainfo/mediainfo.moc.cpp \
-	gui/qt/dialogs/messages/messages.moc.cpp \
-	gui/qt/dialogs/open/open.moc.cpp \
-	gui/qt/dialogs/open/open_panels.moc.cpp \
-	gui/qt/dialogs/open/openurl.moc.cpp \
-	gui/qt/dialogs/plugins/addons_manager.moc.cpp \
-	gui/qt/dialogs/plugins/plugins.moc.cpp \
-	gui/qt/dialogs/podcast/podcast_configuration.moc.cpp \
-	gui/qt/dialogs/preferences/complete_preferences.moc.cpp \
-	gui/qt/dialogs/preferences/expert_model.moc.cpp \
-	gui/qt/dialogs/preferences/expert_view.moc.cpp \
-	gui/qt/dialogs/preferences/preferences.moc.cpp \
-	gui/qt/dialogs/preferences/preferences_widgets.moc.cpp \
-	gui/qt/dialogs/preferences/simple_preferences.moc.cpp \
-	gui/qt/dialogs/sout/convert.moc.cpp \
-	gui/qt/dialogs/sout/profile_selector.moc.cpp \
-	gui/qt/dialogs/sout/sout.moc.cpp \
-	gui/qt/dialogs/sout/sout_widgets.moc.cpp \
-	gui/qt/dialogs/toolbar/controlbar_profile.moc.cpp \
-	gui/qt/dialogs/toolbar/controlbar_profile_model.moc.cpp \
-	gui/qt/dialogs/playlists/playlists.moc.cpp \
-	gui/qt/maininterface/compositor.moc.cpp \
-	gui/qt/maininterface/compositor_common.moc.cpp \
-	gui/qt/maininterface/compositor_dummy.moc.cpp \
-	gui/qt/maininterface/interface_window_handler.moc.cpp \
-	gui/qt/maininterface/mainctx.moc.cpp \
-	gui/qt/maininterface/mainctx_submodels.moc.cpp \
-	gui/qt/maininterface/mainui.moc.cpp \
-	gui/qt/maininterface/videosurface.moc.cpp \
-	gui/qt/maininterface/video_window_handler.moc.cpp \
-	gui/qt/medialibrary/medialib.moc.cpp \
-	gui/qt/medialibrary/mlalbum.moc.cpp \
-	gui/qt/medialibrary/mlalbummodel.moc.cpp \
-	gui/qt/medialibrary/mlalbumtrack.moc.cpp \
-	gui/qt/medialibrary/mlalbumtrackmodel.moc.cpp \
-	gui/qt/medialibrary/mlartist.moc.cpp \
-	gui/qt/medialibrary/mlartistmodel.moc.cpp \
-        gui/qt/medialibrary/mlbookmarkmodel.moc.cpp \
-	gui/qt/medialibrary/mlbasemodel.moc.cpp \
-	gui/qt/medialibrary/mlfoldersmodel.moc.cpp \
-	gui/qt/medialibrary/mlgenremodel.moc.cpp \
-	gui/qt/medialibrary/mlthreadpool.moc.cpp \
-	gui/qt/medialibrary/mlqmltypes.moc.cpp \
-	gui/qt/medialibrary/mlrecentsmodel.moc.cpp \
-	gui/qt/medialibrary/mlrecentsvideomodel.moc.cpp \
-	gui/qt/medialibrary/mlurlmodel.moc.cpp \
-	gui/qt/medialibrary/mlvideo.moc.cpp \
-	gui/qt/medialibrary/mlvideomodel.moc.cpp \
-	gui/qt/medialibrary/mlplaylistlistmodel.moc.cpp \
-	gui/qt/medialibrary/mlplaylistmodel.moc.cpp \
-	gui/qt/medialibrary/mlvideofoldersmodel.moc.cpp \
-	gui/qt/medialibrary/mlvideogroupsmodel.moc.cpp \
-	gui/qt/medialibrary/thumbnailcollector.moc.cpp \
-	gui/qt/menus/custom_menus.moc.cpp \
-	gui/qt/menus/qml_menu_wrapper.moc.cpp \
-	gui/qt/menus/menus.moc.cpp \
-	gui/qt/network/networkdevicemodel.moc.cpp \
-	gui/qt/network/networksourcesmodel.moc.cpp \
-	gui/qt/network/networkmediamodel.moc.cpp \
-	gui/qt/network/servicesdiscoverymodel.moc.cpp \
-	gui/qt/network/standardpathmodel.moc.cpp \
-	gui/qt/style/colorcontext.moc.cpp \
-	gui/qt/style/systempalette.moc.cpp \
-	gui/qt/player/delay_estimator.moc.cpp \
-	gui/qt/player/input_models.moc.cpp \
-	gui/qt/player/player_controller.moc.cpp \
-	gui/qt/player/player_controlbar_model.moc.cpp \
-	gui/qt/player/control_list_model.moc.cpp \
-	gui/qt/player/control_list_filter.moc.cpp \
-	gui/qt/playlist/playlist_controller.moc.cpp \
-	gui/qt/playlist/playlist_item.moc.cpp \
-	gui/qt/playlist/playlist_model.moc.cpp \
-	gui/qt/util/asynctask.moc.cpp \
-	gui/qt/util/audio_device_model.moc.cpp \
-	gui/qt/util/base_model.moc.cpp \
-	gui/qt/util/color_scheme_model.moc.cpp \
-	gui/qt/util/color_svg_image_provider.moc.cpp \
-	gui/qt/util/imageluminanceextractor.moc.cpp \
-	gui/qt/util/csdbuttonmodel.moc.cpp \
-	gui/qt/util/i18n.moc.cpp \
-	gui/qt/util/keyhelper.moc.cpp \
-	gui/qt/util/listcache.moc.cpp \
-	gui/qt/util/locallistcacheloader.moc.cpp \
-	gui/qt/util/navigation_history.moc.cpp \
-	gui/qt/util/item_key_event_filter.moc.cpp \
-	gui/qt/util/effects_image_provider.moc.cpp \
-	gui/qt/util/flickable_scroll_handler.moc.cpp \
-	gui/qt/util/renderer_manager.moc.cpp \
-	gui/qt/util/validators.moc.cpp \
-	gui/qt/util/varchoicemodel.moc.cpp \
-	gui/qt/util/variables.moc.cpp \
-	gui/qt/util/vlctick.moc.cpp \
-	gui/qt/util/dismiss_popup_event_filter.moc.cpp \
-	gui/qt/util/list_selection_model.moc.cpp \
-	gui/qt/widgets/native/animators.moc.cpp \
-	gui/qt/widgets/native/csdthemeimage.moc.cpp \
-	gui/qt/widgets/native/customwidgets.moc.cpp \
-	gui/qt/widgets/native/interface_widgets.moc.cpp \
-	gui/qt/widgets/native/navigation_attached.moc.cpp \
-	gui/qt/widgets/native/mlfolderseditor.moc.cpp \
-	gui/qt/widgets/native/roundimage.moc.cpp \
-	gui/qt/widgets/native/roundimage_p.moc.cpp \
-	gui/qt/widgets/native/searchlineedit.moc.cpp \
-	gui/qt/widgets/native/viewblockingrectangle.moc.cpp
+	dialogs/bookmarks/bookmarks.moc.cpp \
+	dialogs/dialogs/dialogmodel.moc.cpp \
+	dialogs/dialogs_provider.moc.cpp \
+	dialogs/epg/EPGChannels.moc.cpp \
+	dialogs/epg/EPGProgram.moc.cpp \
+	dialogs/epg/EPGRuler.moc.cpp \
+	dialogs/epg/EPGView.moc.cpp \
+	dialogs/epg/EPGWidget.moc.cpp \
+	dialogs/epg/epg.moc.cpp \
+	dialogs/errors/errors.moc.cpp \
+	dialogs/extended/extended.moc.cpp \
+	dialogs/extended/extended_panels.moc.cpp \
+	dialogs/extensions/extensions.moc.cpp \
+	dialogs/extensions/extensions_manager.moc.cpp \
+	dialogs/fingerprint/chromaprint.moc.cpp \
+	dialogs/fingerprint/fingerprintdialog.moc.cpp \
+	dialogs/firstrun/firstrunwizard.moc.cpp \
+	dialogs/gototime/gototime.moc.cpp \
+	dialogs/help/aboutmodel.moc.cpp \
+	dialogs/help/help.moc.cpp \
+	dialogs/mediainfo/info_panels.moc.cpp \
+	dialogs/mediainfo/info_widgets.moc.cpp \
+	dialogs/mediainfo/mediainfo.moc.cpp \
+	dialogs/messages/messages.moc.cpp \
+	dialogs/open/open.moc.cpp \
+	dialogs/open/open_panels.moc.cpp \
+	dialogs/open/openurl.moc.cpp \
+	dialogs/plugins/addons_manager.moc.cpp \
+	dialogs/plugins/plugins.moc.cpp \
+	dialogs/podcast/podcast_configuration.moc.cpp \
+	dialogs/preferences/complete_preferences.moc.cpp \
+	dialogs/preferences/expert_model.moc.cpp \
+	dialogs/preferences/expert_view.moc.cpp \
+	dialogs/preferences/preferences.moc.cpp \
+	dialogs/preferences/preferences_widgets.moc.cpp \
+	dialogs/preferences/simple_preferences.moc.cpp \
+	dialogs/sout/convert.moc.cpp \
+	dialogs/sout/profile_selector.moc.cpp \
+	dialogs/sout/sout.moc.cpp \
+	dialogs/sout/sout_widgets.moc.cpp \
+	dialogs/toolbar/controlbar_profile.moc.cpp \
+	dialogs/toolbar/controlbar_profile_model.moc.cpp \
+	dialogs/playlists/playlists.moc.cpp \
+	maininterface/compositor.moc.cpp \
+	maininterface/compositor_common.moc.cpp \
+	maininterface/compositor_dummy.moc.cpp \
+	maininterface/interface_window_handler.moc.cpp \
+	maininterface/mainctx.moc.cpp \
+	maininterface/mainctx_submodels.moc.cpp \
+	maininterface/mainui.moc.cpp \
+	maininterface/videosurface.moc.cpp \
+	maininterface/video_window_handler.moc.cpp \
+	medialibrary/medialib.moc.cpp \
+	medialibrary/mlalbum.moc.cpp \
+	medialibrary/mlalbummodel.moc.cpp \
+	medialibrary/mlalbumtrack.moc.cpp \
+	medialibrary/mlalbumtrackmodel.moc.cpp \
+	medialibrary/mlartist.moc.cpp \
+	medialibrary/mlartistmodel.moc.cpp \
+        medialibrary/mlbookmarkmodel.moc.cpp \
+	medialibrary/mlbasemodel.moc.cpp \
+	medialibrary/mlfoldersmodel.moc.cpp \
+	medialibrary/mlgenremodel.moc.cpp \
+	medialibrary/mlthreadpool.moc.cpp \
+	medialibrary/mlqmltypes.moc.cpp \
+	medialibrary/mlrecentsmodel.moc.cpp \
+	medialibrary/mlrecentsvideomodel.moc.cpp \
+	medialibrary/mlurlmodel.moc.cpp \
+	medialibrary/mlvideo.moc.cpp \
+	medialibrary/mlvideomodel.moc.cpp \
+	medialibrary/mlplaylistlistmodel.moc.cpp \
+	medialibrary/mlplaylistmodel.moc.cpp \
+	medialibrary/mlvideofoldersmodel.moc.cpp \
+	medialibrary/mlvideogroupsmodel.moc.cpp \
+	medialibrary/thumbnailcollector.moc.cpp \
+	menus/custom_menus.moc.cpp \
+	menus/qml_menu_wrapper.moc.cpp \
+	menus/menus.moc.cpp \
+	network/networkdevicemodel.moc.cpp \
+	network/networksourcesmodel.moc.cpp \
+	network/networkmediamodel.moc.cpp \
+	network/servicesdiscoverymodel.moc.cpp \
+	network/standardpathmodel.moc.cpp \
+	style/colorcontext.moc.cpp \
+	style/systempalette.moc.cpp \
+	player/delay_estimator.moc.cpp \
+	player/input_models.moc.cpp \
+	player/player_controller.moc.cpp \
+	player/player_controlbar_model.moc.cpp \
+	player/control_list_model.moc.cpp \
+	player/control_list_filter.moc.cpp \
+	playlist/playlist_controller.moc.cpp \
+	playlist/playlist_item.moc.cpp \
+	playlist/playlist_model.moc.cpp \
+	util/asynctask.moc.cpp \
+	util/audio_device_model.moc.cpp \
+	util/base_model.moc.cpp \
+	util/color_scheme_model.moc.cpp \
+	util/color_svg_image_provider.moc.cpp \
+	util/imageluminanceextractor.moc.cpp \
+	util/csdbuttonmodel.moc.cpp \
+	util/i18n.moc.cpp \
+	util/keyhelper.moc.cpp \
+	util/listcache.moc.cpp \
+	util/locallistcacheloader.moc.cpp \
+	util/navigation_history.moc.cpp \
+	util/item_key_event_filter.moc.cpp \
+	util/effects_image_provider.moc.cpp \
+	util/flickable_scroll_handler.moc.cpp \
+	util/renderer_manager.moc.cpp \
+	util/validators.moc.cpp \
+	util/varchoicemodel.moc.cpp \
+	util/variables.moc.cpp \
+	util/vlctick.moc.cpp \
+	util/dismiss_popup_event_filter.moc.cpp \
+	util/list_selection_model.moc.cpp \
+	widgets/native/animators.moc.cpp \
+	widgets/native/csdthemeimage.moc.cpp \
+	widgets/native/customwidgets.moc.cpp \
+	widgets/native/interface_widgets.moc.cpp \
+	widgets/native/navigation_attached.moc.cpp \
+	widgets/native/mlfolderseditor.moc.cpp \
+	widgets/native/roundimage.moc.cpp \
+	widgets/native/roundimage_p.moc.cpp \
+	widgets/native/searchlineedit.moc.cpp \
+	widgets/native/viewblockingrectangle.moc.cpp
 
 if HAVE_WIN32
-nodist_libqt_plugin_la_SOURCES += gui/qt/maininterface/mainctx_win32.moc.cpp \
-	gui/qt/maininterface/compositor_win7.moc.cpp
+nodist_libqt_plugin_la_SOURCES += maininterface/mainctx_win32.moc.cpp \
+	maininterface/compositor_win7.moc.cpp
 
 if HAVE_DCOMP
 nodist_libqt_plugin_la_SOURCES += \
-	gui/qt/maininterface/compositor_dcomp_acrylicsurface.moc.cpp \
-	gui/qt/maininterface/compositor_dcomp.moc.cpp \
-	gui/qt/maininterface/compositor_dcomp_uisurface.moc.cpp
+	maininterface/compositor_dcomp_acrylicsurface.moc.cpp \
+	maininterface/compositor_dcomp.moc.cpp \
+	maininterface/compositor_dcomp_uisurface.moc.cpp
 endif
 
 endif
@@ -544,39 +548,39 @@ if HAVE_XCB
 if HAVE_XCB_DAMAGE
 if HAVE_XCB_XFIXES
 nodist_libqt_plugin_la_SOURCES += \
-	gui/qt/maininterface/compositor_x11.moc.cpp \
-	gui/qt/maininterface/compositor_x11_renderclient.moc.cpp \
-	gui/qt/maininterface/compositor_x11_renderwindow.moc.cpp \
-	gui/qt/maininterface/compositor_x11_uisurface.moc.cpp \
-	gui/qt/maininterface/compositor_x11_utils.moc.cpp
+	maininterface/compositor_x11.moc.cpp \
+	maininterface/compositor_x11_renderclient.moc.cpp \
+	maininterface/compositor_x11_renderwindow.moc.cpp \
+	maininterface/compositor_x11_uisurface.moc.cpp \
+	maininterface/compositor_x11_utils.moc.cpp
 endif
 endif
 endif
 endif
 
 nodist_libqt_plugin_la_SOURCES += \
-	gui/qt/dialogs/extended/ui_equalizer.h \
-	gui/qt/dialogs/extended/ui_video_effects.h \
-	gui/qt/dialogs/fingerprint/ui_fingerprintdialog.h \
-	gui/qt/dialogs/firstrun/ui_firstrunwizard.h \
-	gui/qt/dialogs/help/ui_about.h \
-	gui/qt/dialogs/help/ui_update.h \
-	gui/qt/dialogs/messages/ui_messages_panel.h \
-	gui/qt/dialogs/open/ui_open.h \
-	gui/qt/dialogs/open/ui_open_capture.h \
-	gui/qt/dialogs/open/ui_open_disk.h \
-	gui/qt/dialogs/open/ui_open_file.h \
-	gui/qt/dialogs/open/ui_open_net.h \
-	gui/qt/dialogs/podcast/ui_podcast_configuration.h \
-	gui/qt/dialogs/preferences/ui_sprefs_audio.h \
-	gui/qt/dialogs/preferences/ui_sprefs_input.h \
-	gui/qt/dialogs/preferences/ui_sprefs_interface.h \
-	gui/qt/dialogs/preferences/ui_sprefs_medialibrary.h \
-	gui/qt/dialogs/preferences/ui_sprefs_subtitles.h \
-	gui/qt/dialogs/preferences/ui_sprefs_video.h \
-	gui/qt/dialogs/sout/ui_profiles.h \
-	gui/qt/dialogs/sout/ui_sout.h \
-	gui/qt/dialogs/vlm/ui_vlm.h
+	dialogs/extended/ui_equalizer.h \
+	dialogs/extended/ui_video_effects.h \
+	dialogs/fingerprint/ui_fingerprintdialog.h \
+	dialogs/firstrun/ui_firstrunwizard.h \
+	dialogs/help/ui_about.h \
+	dialogs/help/ui_update.h \
+	dialogs/messages/ui_messages_panel.h \
+	dialogs/open/ui_open.h \
+	dialogs/open/ui_open_capture.h \
+	dialogs/open/ui_open_disk.h \
+	dialogs/open/ui_open_file.h \
+	dialogs/open/ui_open_net.h \
+	dialogs/podcast/ui_podcast_configuration.h \
+	dialogs/preferences/ui_sprefs_audio.h \
+	dialogs/preferences/ui_sprefs_input.h \
+	dialogs/preferences/ui_sprefs_interface.h \
+	dialogs/preferences/ui_sprefs_medialibrary.h \
+	dialogs/preferences/ui_sprefs_subtitles.h \
+	dialogs/preferences/ui_sprefs_video.h \
+	dialogs/sout/ui_profiles.h \
+	dialogs/sout/ui_sout.h \
+	dialogs/vlm/ui_vlm.h
 
 # User interface compilation
 
@@ -597,32 +601,32 @@ MOC_CPPFLAGS += -D_WIN32
 endif
 
 libqt_plugin_la_UI = \
-	gui/qt/dialogs/extended/equalizer.ui \
-	gui/qt/dialogs/extended/video_effects.ui \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.ui \
-	gui/qt/dialogs/firstrun/firstrunwizard.ui \
-	gui/qt/dialogs/help/about.ui \
-	gui/qt/dialogs/help/update.ui \
-	gui/qt/dialogs/messages/messages_panel.ui \
-	gui/qt/dialogs/open/open.ui \
-	gui/qt/dialogs/open/open_capture.ui \
-	gui/qt/dialogs/open/open_disk.ui \
-	gui/qt/dialogs/open/open_file.ui \
-	gui/qt/dialogs/open/open_net.ui \
-	gui/qt/dialogs/podcast/podcast_configuration.ui \
-	gui/qt/dialogs/preferences/sprefs_audio.ui \
-	gui/qt/dialogs/preferences/sprefs_input.ui \
-	gui/qt/dialogs/preferences/sprefs_interface.ui \
-	gui/qt/dialogs/preferences/sprefs_medialibrary.ui \
-	gui/qt/dialogs/preferences/sprefs_subtitles.ui \
-	gui/qt/dialogs/preferences/sprefs_video.ui \
-	gui/qt/dialogs/sout/profiles.ui \
-	gui/qt/dialogs/sout/sout.ui \
-	gui/qt/dialogs/vlm/vlm.ui
+	dialogs/extended/equalizer.ui \
+	dialogs/extended/video_effects.ui \
+	dialogs/fingerprint/fingerprintdialog.ui \
+	dialogs/firstrun/firstrunwizard.ui \
+	dialogs/help/about.ui \
+	dialogs/help/update.ui \
+	dialogs/messages/messages_panel.ui \
+	dialogs/open/open.ui \
+	dialogs/open/open_capture.ui \
+	dialogs/open/open_disk.ui \
+	dialogs/open/open_file.ui \
+	dialogs/open/open_net.ui \
+	dialogs/podcast/podcast_configuration.ui \
+	dialogs/preferences/sprefs_audio.ui \
+	dialogs/preferences/sprefs_input.ui \
+	dialogs/preferences/sprefs_interface.ui \
+	dialogs/preferences/sprefs_medialibrary.ui \
+	dialogs/preferences/sprefs_subtitles.ui \
+	dialogs/preferences/sprefs_video.ui \
+	dialogs/sout/profiles.ui \
+	dialogs/sout/sout.ui \
+	dialogs/vlm/vlm.ui
 EXTRA_DIST += $(libqt_plugin_la_UI)
 
 ui_%.h: %.ui
-	$(AM_V_at)$(MKDIR_P) "gui/qt/ui"
+	$(AM_V_at)$(MKDIR_P) "ui"
 	$(AM_V_at)rm -f $@ $@.tmp
 	$(AM_V_at)echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
 	$(uic_verbose)$(UIC) -tr "Q_" $< >> $@.tmp
@@ -632,490 +636,490 @@ ui_%.h: %.ui
 # Resources
 
 libqt_plugin_la_RES = \
-	gui/qt/pixmaps/VLCIcons.ttf \
-	gui/qt/pixmaps/addons/addon_default.svg \
-	gui/qt/pixmaps/addons/addon_broken.svg \
-	gui/qt/pixmaps/addons/addon_blue.svg \
-	gui/qt/pixmaps/addons/addon_cyan.svg \
-	gui/qt/pixmaps/addons/addon_green.svg \
-	gui/qt/pixmaps/addons/addon_magenta.svg \
-	gui/qt/pixmaps/addons/addon_red.svg \
-	gui/qt/pixmaps/addons/addon_yellow.svg \
-	gui/qt/pixmaps/addons/addon_score.svg \
-	gui/qt/pixmaps/icons/active_indicator.svg \
-	gui/qt/pixmaps/icons/add.svg \
-	gui/qt/pixmaps/icons/album_cover.svg \
-	gui/qt/pixmaps/icons/aspect_ratio.svg \
-	gui/qt/pixmaps/icons/atob.svg \
-	gui/qt/pixmaps/icons/audiosub.svg \
-	gui/qt/pixmaps/icons/back.svg \
-	gui/qt/pixmaps/icons/ic_fluent_bookmark.svg \
-	gui/qt/pixmaps/icons/breadcrumb_prev.svg \
-	gui/qt/pixmaps/icons/breadcrumb_sep.svg \
-	gui/qt/pixmaps/icons/check.svg \
-	gui/qt/pixmaps/icons/clear.svg \
-	gui/qt/pixmaps/icons/close.svg \
-	gui/qt/pixmaps/icons/ic_fluent_full_screen_minimize.svg \
-	gui/qt/pixmaps/icons/del.svg \
-	gui/qt/pixmaps/icons/download.svg \
-	gui/qt/pixmaps/icons/dropzone.svg \
-	gui/qt/pixmaps/icons/dvd_menu.svg \
-	gui/qt/pixmaps/icons/dvd_next.svg \
-	gui/qt/pixmaps/icons/dvd_prev.svg \
-	gui/qt/pixmaps/icons/ic_fluent_arrow_eject.svg \
-	gui/qt/pixmaps/icons/ellipsis.svg \
-	gui/qt/pixmaps/icons/ic_playlist_add.svg \
-	gui/qt/pixmaps/icons/expand_inverted.svg \
-	gui/qt/pixmaps/icons/expand.svg \
-	gui/qt/pixmaps/icons/ic_fluent_options.svg \
-	gui/qt/pixmaps/icons/ic_fluent_fast_forward.svg \
-	gui/qt/pixmaps/icons/frame-by-frame.svg \
-	gui/qt/pixmaps/icons/ic_fluent_full_screen_maximize.svg \
-	gui/qt/pixmaps/icons/ic_fluent_grid.svg \
-	gui/qt/pixmaps/icons/history.svg \
-	gui/qt/pixmaps/icons/home.svg \
-	gui/qt/pixmaps/icons/info.svg \
-	gui/qt/pixmaps/icons/ic_fluent_apps_list.svg \
-	gui/qt/pixmaps/icons/ic_fluent_more_vertical.svg \
-	gui/qt/pixmaps/icons/multiselect.svg \
-	gui/qt/pixmaps/icons/ic_fluent_next.svg \
-	gui/qt/pixmaps/icons/ic_pause_filled.svg \
-	gui/qt/pixmaps/icons/pip.svg \
-	gui/qt/pixmaps/icons/ic_playlist_clear.svg \
-	gui/qt/pixmaps/icons/ic_playlist.svg \
-	gui/qt/pixmaps/icons/ic_fluent_play.svg \
-	gui/qt/pixmaps/icons/play_reverse.svg \
-	gui/qt/pixmaps/icons/ic_fluent_play_filled.svg \
-	gui/qt/pixmaps/icons/podcast.svg \
-	gui/qt/pixmaps/icons/ic_fluent_previous.svg \
-	gui/qt/pixmaps/icons/profile_new.svg \
-	gui/qt/pixmaps/icons/record.svg \
-	gui/qt/pixmaps/icons/remove.svg \
-	gui/qt/pixmaps/icons/renderer.svg \
-	gui/qt/pixmaps/icons/ic_fluent_arrow_repeat_all.svg \
-	gui/qt/pixmaps/icons/ic_fluent_arrow_repeat_1.svg \
-	gui/qt/pixmaps/icons/ic_fluent_rewind.svg \
-	gui/qt/pixmaps/icons/ic_fluent_search.svg \
-	gui/qt/pixmaps/icons/ic_fluent_arrow_shuffle.svg \
-	gui/qt/pixmaps/icons/ic_fluent_skip_back_10.svg \
-	gui/qt/pixmaps/icons/ic_fluent_skip_forward_10.svg \
-	gui/qt/pixmaps/icons/ic_fluent_camera.svg \
-	gui/qt/pixmaps/icons/space.svg \
-	gui/qt/pixmaps/icons/ic_fluent_stop.svg \
-	gui/qt/pixmaps/icons/stream.svg \
-	gui/qt/pixmaps/icons/sync.svg \
-	gui/qt/pixmaps/icons/time.svg \
-	gui/qt/pixmaps/icons/ic_fluent_globe.svg \
-	gui/qt/pixmaps/icons/topbar_filter.svg \
-	gui/qt/pixmaps/icons/ic_fluent_music_note_2.svg \
-	gui/qt/pixmaps/icons/ic_fluent_wifi_1.svg \
-	gui/qt/pixmaps/icons/ic_fluent_arrow_sort.svg \
-	gui/qt/pixmaps/icons/ic_fluent_filmstrip.svg \
-	gui/qt/pixmaps/icons/ic_fluent_chevron_up.svg \
-	gui/qt/pixmaps/icons/ic_fluent_chevron_down.svg \
-	gui/qt/pixmaps/icons/tv.svg \
-	gui/qt/pixmaps/icons/tvtelx.svg \
-	gui/qt/pixmaps/icons/visualization.svg \
-	gui/qt/pixmaps/icons/volume_high.svg \
-	gui/qt/pixmaps/icons/volume_low.svg \
-	gui/qt/pixmaps/icons/volume_medium.svg \
-	gui/qt/pixmaps/icons/volume_muted.svg \
-	gui/qt/pixmaps/icons/volume_zero.svg \
-	gui/qt/pixmaps/icons/window_close.svg \
-	gui/qt/pixmaps/icons/window_maximize.svg \
-	gui/qt/pixmaps/icons/window_minimize.svg \
-	gui/qt/pixmaps/icons/window_restore.svg \
-	gui/qt/pixmaps/menu/add.svg \
-	gui/qt/pixmaps/menu/capture-card.svg \
-	gui/qt/pixmaps/menu/clear.svg \
-	gui/qt/pixmaps/menu/disc.svg \
-	gui/qt/pixmaps/menu/download.svg \
-	gui/qt/pixmaps/menu/ic_fluent_arrow_eject.svg \
-	gui/qt/pixmaps/menu/exit.svg \
-	gui/qt/pixmaps/menu/ic_fluent_fast_forward.svg \
-	gui/qt/pixmaps/menu/file.svg \
-	gui/qt/pixmaps/menu/folder.svg \
-	gui/qt/pixmaps/menu/help.svg \
-	gui/qt/pixmaps/menu/info.svg \
-	gui/qt/pixmaps/menu/media_library.svg \
-	gui/qt/pixmaps/menu/messages.svg \
-	gui/qt/pixmaps/menu/movie.svg \
-	gui/qt/pixmaps/menu/music.svg \
-	gui/qt/pixmaps/menu/network.svg \
-	gui/qt/pixmaps/menu/ic_playlist.svg \
-	gui/qt/pixmaps/menu/ic_fluent_next.svg \
-	gui/qt/pixmaps/menu/ic_pause_filled.svg \
-	gui/qt/pixmaps/menu/ic_fluent_play_filled.svg \
-	gui/qt/pixmaps/menu/preferences.svg \
-	gui/qt/pixmaps/menu/ic_fluent_previous.svg \
-	gui/qt/pixmaps/menu/profile_new.svg \
-	gui/qt/pixmaps/menu/record.svg \
-	gui/qt/pixmaps/menu/remove.svg \
-	gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_all.svg \
-	gui/qt/pixmaps/menu/repeat_off.svg \
-	gui/qt/pixmaps/menu/ic_fluent_arrow_repeat_1.svg \
-	gui/qt/pixmaps/menu/ic_fluent_rewind.svg \
-	gui/qt/pixmaps/menu/search_clear.svg \
-	gui/qt/pixmaps/menu/ic_fluent_options.svg \
-	gui/qt/pixmaps/menu/ic_fluent_skip_back_10.svg \
-	gui/qt/pixmaps/menu/ic_fluent_skip_forward_10.svg \
-	gui/qt/pixmaps/menu/ic_fluent_arrow_shuffle.svg \
-	gui/qt/pixmaps/menu/ic_fluent_stop.svg \
-	gui/qt/pixmaps/menu/stream.svg \
-	gui/qt/pixmaps/menu/sync.svg \
-	gui/qt/pixmaps/menu/update.svg \
-	gui/qt/pixmaps/menu/volume-high.svg \
-	gui/qt/pixmaps/menu/volume-low.svg \
-	gui/qt/pixmaps/menu/volume-muted.svg \
-	gui/qt/pixmaps/misc/cone.svg \
-	gui/qt/pixmaps/misc/new_indicator.svg \
-	gui/qt/pixmaps/misc/play_button.svg \
-	gui/qt/pixmaps/misc/play_shadow.png \
-	gui/qt/pixmaps/misc/theme_dark.svg \
-	gui/qt/pixmaps/misc/theme_daynight.svg \
-	gui/qt/pixmaps/misc/theme_light.svg \
-	gui/qt/pixmaps/misc/wait1.svg \
-	gui/qt/pixmaps/misc/wait2.svg \
-	gui/qt/pixmaps/misc/wait3.svg \
-	gui/qt/pixmaps/misc/wait4.svg \
-	gui/qt/pixmaps/placeholder/add_service.svg \
-	gui/qt/pixmaps/placeholder/noart.png \
-	gui/qt/pixmaps/placeholder/noart_album.svg \
-	gui/qt/pixmaps/placeholder/noart_albumCover.svg \
-	gui/qt/pixmaps/placeholder/noart_artist.svg \
-	gui/qt/pixmaps/placeholder/noart_artistCover.svg \
-	gui/qt/pixmaps/placeholder/noart_artist_small.svg \
-	gui/qt/pixmaps/placeholder/noart_videoCover.svg \
-	gui/qt/pixmaps/prefs/advprefs_audio.svg \
-	gui/qt/pixmaps/prefs/advprefs_codec.svg \
-	gui/qt/pixmaps/prefs/advprefs_extended.svg \
-	gui/qt/pixmaps/prefs/advprefs_intf.svg \
-	gui/qt/pixmaps/prefs/advprefs_playlist.svg \
-	gui/qt/pixmaps/prefs/advprefs_sout.svg \
-	gui/qt/pixmaps/prefs/advprefs_video.svg \
-	gui/qt/pixmaps/prefs/sample_complete.png \
-	gui/qt/pixmaps/prefs/sample_minimal.png \
-	gui/qt/pixmaps/prefs/sample_skins.png \
-	gui/qt/pixmaps/prefs/spref_audio.png \
-	gui/qt/pixmaps/prefs/spref_hotkeys.png \
-	gui/qt/pixmaps/prefs/spref_input.png \
-	gui/qt/pixmaps/prefs/spref_interface.png \
-	gui/qt/pixmaps/prefs/spref_medialibrary.png \
-	gui/qt/pixmaps/prefs/spref_subtitles.png \
-	gui/qt/pixmaps/prefs/spref_video.png \
-	gui/qt/pixmaps/sd/appletrailers.svg \
-	gui/qt/pixmaps/sd/assembleenationale.svg \
-	gui/qt/pixmaps/sd/capture-card.svg \
-	gui/qt/pixmaps/sd/directory.svg \
-	gui/qt/pixmaps/sd/disc.svg \
-	gui/qt/pixmaps/sd/file.svg \
-	gui/qt/pixmaps/sd/fmc.svg \
-	gui/qt/pixmaps/sd/frenchtv.svg \
-	gui/qt/pixmaps/sd/harddisk.svg \
-	gui/qt/pixmaps/sd/icecast.svg \
-	gui/qt/pixmaps/sd/jamendo.svg \
-	gui/qt/pixmaps/sd/katsomo.svg \
-	gui/qt/pixmaps/sd/lan.svg \
-	gui/qt/pixmaps/sd/library.svg \
-	gui/qt/pixmaps/sd/metachannels.svg \
-	gui/qt/pixmaps/sd/mtp.svg \
-	gui/qt/pixmaps/sd/network.svg \
-	gui/qt/pixmaps/sd/node.svg \
-	gui/qt/pixmaps/sd/pictures.svg \
-	gui/qt/pixmaps/sd/playlist.svg \
-	gui/qt/pixmaps/sd/podcast.svg \
-	gui/qt/pixmaps/sd/screen.svg \
-	gui/qt/pixmaps/sd/stream.svg \
-	gui/qt/pixmaps/sd/unknown.svg
+	pixmaps/VLCIcons.ttf \
+	pixmaps/addons/addon_default.svg \
+	pixmaps/addons/addon_broken.svg \
+	pixmaps/addons/addon_blue.svg \
+	pixmaps/addons/addon_cyan.svg \
+	pixmaps/addons/addon_green.svg \
+	pixmaps/addons/addon_magenta.svg \
+	pixmaps/addons/addon_red.svg \
+	pixmaps/addons/addon_yellow.svg \
+	pixmaps/addons/addon_score.svg \
+	pixmaps/icons/active_indicator.svg \
+	pixmaps/icons/add.svg \
+	pixmaps/icons/album_cover.svg \
+	pixmaps/icons/aspect_ratio.svg \
+	pixmaps/icons/atob.svg \
+	pixmaps/icons/audiosub.svg \
+	pixmaps/icons/back.svg \
+	pixmaps/icons/ic_fluent_bookmark.svg \
+	pixmaps/icons/breadcrumb_prev.svg \
+	pixmaps/icons/breadcrumb_sep.svg \
+	pixmaps/icons/check.svg \
+	pixmaps/icons/clear.svg \
+	pixmaps/icons/close.svg \
+	pixmaps/icons/ic_fluent_full_screen_minimize.svg \
+	pixmaps/icons/del.svg \
+	pixmaps/icons/download.svg \
+	pixmaps/icons/dropzone.svg \
+	pixmaps/icons/dvd_menu.svg \
+	pixmaps/icons/dvd_next.svg \
+	pixmaps/icons/dvd_prev.svg \
+	pixmaps/icons/ic_fluent_arrow_eject.svg \
+	pixmaps/icons/ellipsis.svg \
+	pixmaps/icons/ic_playlist_add.svg \
+	pixmaps/icons/expand_inverted.svg \
+	pixmaps/icons/expand.svg \
+	pixmaps/icons/ic_fluent_options.svg \
+	pixmaps/icons/ic_fluent_fast_forward.svg \
+	pixmaps/icons/frame-by-frame.svg \
+	pixmaps/icons/ic_fluent_full_screen_maximize.svg \
+	pixmaps/icons/ic_fluent_grid.svg \
+	pixmaps/icons/history.svg \
+	pixmaps/icons/home.svg \
+	pixmaps/icons/info.svg \
+	pixmaps/icons/ic_fluent_apps_list.svg \
+	pixmaps/icons/ic_fluent_more_vertical.svg \
+	pixmaps/icons/multiselect.svg \
+	pixmaps/icons/ic_fluent_next.svg \
+	pixmaps/icons/ic_pause_filled.svg \
+	pixmaps/icons/pip.svg \
+	pixmaps/icons/ic_playlist_clear.svg \
+	pixmaps/icons/ic_playlist.svg \
+	pixmaps/icons/ic_fluent_play.svg \
+	pixmaps/icons/play_reverse.svg \
+	pixmaps/icons/ic_fluent_play_filled.svg \
+	pixmaps/icons/podcast.svg \
+	pixmaps/icons/ic_fluent_previous.svg \
+	pixmaps/icons/profile_new.svg \
+	pixmaps/icons/record.svg \
+	pixmaps/icons/remove.svg \
+	pixmaps/icons/renderer.svg \
+	pixmaps/icons/ic_fluent_arrow_repeat_all.svg \
+	pixmaps/icons/ic_fluent_arrow_repeat_1.svg \
+	pixmaps/icons/ic_fluent_rewind.svg \
+	pixmaps/icons/ic_fluent_search.svg \
+	pixmaps/icons/ic_fluent_arrow_shuffle.svg \
+	pixmaps/icons/ic_fluent_skip_back_10.svg \
+	pixmaps/icons/ic_fluent_skip_forward_10.svg \
+	pixmaps/icons/ic_fluent_camera.svg \
+	pixmaps/icons/space.svg \
+	pixmaps/icons/ic_fluent_stop.svg \
+	pixmaps/icons/stream.svg \
+	pixmaps/icons/sync.svg \
+	pixmaps/icons/time.svg \
+	pixmaps/icons/ic_fluent_globe.svg \
+	pixmaps/icons/topbar_filter.svg \
+	pixmaps/icons/ic_fluent_music_note_2.svg \
+	pixmaps/icons/ic_fluent_wifi_1.svg \
+	pixmaps/icons/ic_fluent_arrow_sort.svg \
+	pixmaps/icons/ic_fluent_filmstrip.svg \
+	pixmaps/icons/ic_fluent_chevron_up.svg \
+	pixmaps/icons/ic_fluent_chevron_down.svg \
+	pixmaps/icons/tv.svg \
+	pixmaps/icons/tvtelx.svg \
+	pixmaps/icons/visualization.svg \
+	pixmaps/icons/volume_high.svg \
+	pixmaps/icons/volume_low.svg \
+	pixmaps/icons/volume_medium.svg \
+	pixmaps/icons/volume_muted.svg \
+	pixmaps/icons/volume_zero.svg \
+	pixmaps/icons/window_close.svg \
+	pixmaps/icons/window_maximize.svg \
+	pixmaps/icons/window_minimize.svg \
+	pixmaps/icons/window_restore.svg \
+	pixmaps/menu/add.svg \
+	pixmaps/menu/capture-card.svg \
+	pixmaps/menu/clear.svg \
+	pixmaps/menu/disc.svg \
+	pixmaps/menu/download.svg \
+	pixmaps/menu/ic_fluent_arrow_eject.svg \
+	pixmaps/menu/exit.svg \
+	pixmaps/menu/ic_fluent_fast_forward.svg \
+	pixmaps/menu/file.svg \
+	pixmaps/menu/folder.svg \
+	pixmaps/menu/help.svg \
+	pixmaps/menu/info.svg \
+	pixmaps/menu/media_library.svg \
+	pixmaps/menu/messages.svg \
+	pixmaps/menu/movie.svg \
+	pixmaps/menu/music.svg \
+	pixmaps/menu/network.svg \
+	pixmaps/menu/ic_playlist.svg \
+	pixmaps/menu/ic_fluent_next.svg \
+	pixmaps/menu/ic_pause_filled.svg \
+	pixmaps/menu/ic_fluent_play_filled.svg \
+	pixmaps/menu/preferences.svg \
+	pixmaps/menu/ic_fluent_previous.svg \
+	pixmaps/menu/profile_new.svg \
+	pixmaps/menu/record.svg \
+	pixmaps/menu/remove.svg \
+	pixmaps/menu/ic_fluent_arrow_repeat_all.svg \
+	pixmaps/menu/repeat_off.svg \
+	pixmaps/menu/ic_fluent_arrow_repeat_1.svg \
+	pixmaps/menu/ic_fluent_rewind.svg \
+	pixmaps/menu/search_clear.svg \
+	pixmaps/menu/ic_fluent_options.svg \
+	pixmaps/menu/ic_fluent_skip_back_10.svg \
+	pixmaps/menu/ic_fluent_skip_forward_10.svg \
+	pixmaps/menu/ic_fluent_arrow_shuffle.svg \
+	pixmaps/menu/ic_fluent_stop.svg \
+	pixmaps/menu/stream.svg \
+	pixmaps/menu/sync.svg \
+	pixmaps/menu/update.svg \
+	pixmaps/menu/volume-high.svg \
+	pixmaps/menu/volume-low.svg \
+	pixmaps/menu/volume-muted.svg \
+	pixmaps/misc/cone.svg \
+	pixmaps/misc/new_indicator.svg \
+	pixmaps/misc/play_button.svg \
+	pixmaps/misc/play_shadow.png \
+	pixmaps/misc/theme_dark.svg \
+	pixmaps/misc/theme_daynight.svg \
+	pixmaps/misc/theme_light.svg \
+	pixmaps/misc/wait1.svg \
+	pixmaps/misc/wait2.svg \
+	pixmaps/misc/wait3.svg \
+	pixmaps/misc/wait4.svg \
+	pixmaps/placeholder/add_service.svg \
+	pixmaps/placeholder/noart.png \
+	pixmaps/placeholder/noart_album.svg \
+	pixmaps/placeholder/noart_albumCover.svg \
+	pixmaps/placeholder/noart_artist.svg \
+	pixmaps/placeholder/noart_artistCover.svg \
+	pixmaps/placeholder/noart_artist_small.svg \
+	pixmaps/placeholder/noart_videoCover.svg \
+	pixmaps/prefs/advprefs_audio.svg \
+	pixmaps/prefs/advprefs_codec.svg \
+	pixmaps/prefs/advprefs_extended.svg \
+	pixmaps/prefs/advprefs_intf.svg \
+	pixmaps/prefs/advprefs_playlist.svg \
+	pixmaps/prefs/advprefs_sout.svg \
+	pixmaps/prefs/advprefs_video.svg \
+	pixmaps/prefs/sample_complete.png \
+	pixmaps/prefs/sample_minimal.png \
+	pixmaps/prefs/sample_skins.png \
+	pixmaps/prefs/spref_audio.png \
+	pixmaps/prefs/spref_hotkeys.png \
+	pixmaps/prefs/spref_input.png \
+	pixmaps/prefs/spref_interface.png \
+	pixmaps/prefs/spref_medialibrary.png \
+	pixmaps/prefs/spref_subtitles.png \
+	pixmaps/prefs/spref_video.png \
+	pixmaps/sd/appletrailers.svg \
+	pixmaps/sd/assembleenationale.svg \
+	pixmaps/sd/capture-card.svg \
+	pixmaps/sd/directory.svg \
+	pixmaps/sd/disc.svg \
+	pixmaps/sd/file.svg \
+	pixmaps/sd/fmc.svg \
+	pixmaps/sd/frenchtv.svg \
+	pixmaps/sd/harddisk.svg \
+	pixmaps/sd/icecast.svg \
+	pixmaps/sd/jamendo.svg \
+	pixmaps/sd/katsomo.svg \
+	pixmaps/sd/lan.svg \
+	pixmaps/sd/library.svg \
+	pixmaps/sd/metachannels.svg \
+	pixmaps/sd/mtp.svg \
+	pixmaps/sd/network.svg \
+	pixmaps/sd/node.svg \
+	pixmaps/sd/pictures.svg \
+	pixmaps/sd/playlist.svg \
+	pixmaps/sd/podcast.svg \
+	pixmaps/sd/screen.svg \
+	pixmaps/sd/stream.svg \
+	pixmaps/sd/unknown.svg
 
 if HAVE_WIN32
-libqt_plugin_la_RES += gui/qt/pixmaps/windows-theme.conf \
-	gui/qt/pixmaps/win7/pause.svg \
-	gui/qt/pixmaps/win7/prev.svg \
-	gui/qt/pixmaps/win7/next.svg \
-	gui/qt/pixmaps/win7/play.svg
+libqt_plugin_la_RES += pixmaps/windows-theme.conf \
+	pixmaps/win7/pause.svg \
+	pixmaps/win7/prev.svg \
+	pixmaps/win7/next.svg \
+	pixmaps/win7/play.svg
 endif
 
 #QML and JS resources
 libqt_plugin_la_QML = \
-	gui/qt/dialogs/dialogs/qml/CustomDialog.qml \
-	gui/qt/dialogs/dialogs/qml/Dialogs.qml \
-	gui/qt/dialogs/dialogs/qml/ModalDialog.qml \
-	gui/qt/dialogs/dialogs/qml/WindowDialog.qml \
-	gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml \
-	gui/qt/dialogs/toolbar/qml/EditorDNDView.qml\
-	gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml \
-	gui/qt/dialogs/toolbar/qml/EditorTabButton.qml \
-	gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml \
-	gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml \
-	gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
-	gui/qt/maininterface/qml/BannerSources.qml \
-	gui/qt/maininterface/qml/MainInterface.qml \
-	gui/qt/maininterface/qml/MainViewLoader.qml \
-	gui/qt/maininterface/qml/MainDisplay.qml \
-	gui/qt/maininterface/qml/MainGridView.qml \
-	gui/qt/maininterface/qml/MainTableView.qml \
-	gui/qt/maininterface/qml/NoMedialibHome.qml \
-	gui/qt/medialibrary/qml/ArtistTopBanner.qml \
-	gui/qt/medialibrary/qml/AudioGridItem.qml \
-	gui/qt/medialibrary/qml/MediaGroupDisplay.qml \
-	gui/qt/medialibrary/qml/MusicAlbums.qml \
-	gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml \
-	gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml \
-	gui/qt/medialibrary/qml/MusicArtist.qml \
-	gui/qt/medialibrary/qml/MusicArtistDelegate.qml \
-	gui/qt/medialibrary/qml/MusicArtistsAlbums.qml \
-	gui/qt/medialibrary/qml/MusicAllArtists.qml \
-	gui/qt/medialibrary/qml/MusicArtistsDisplay.qml \
-	gui/qt/medialibrary/qml/MusicDisplay.qml \
-	gui/qt/medialibrary/qml/MusicGenres.qml \
-	gui/qt/medialibrary/qml/MusicGenresDisplay.qml \
-	gui/qt/medialibrary/qml/MusicPlaylistsDisplay.qml \
-	gui/qt/medialibrary/qml/MusicTrackListDisplay.qml \
-	gui/qt/medialibrary/qml/MusicTracksDisplay.qml \
-	gui/qt/medialibrary/qml/UrlListDisplay.qml \
-	gui/qt/medialibrary/qml/VideoDisplay.qml \
-	gui/qt/medialibrary/qml/VideoAll.qml \
-	gui/qt/medialibrary/qml/VideoAllDisplay.qml \
-	gui/qt/medialibrary/qml/VideoAllSubDisplay.qml \
-	gui/qt/medialibrary/qml/PlaylistMediaList.qml \
-	gui/qt/medialibrary/qml/PlaylistMedia.qml \
-	gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml \
-	gui/qt/medialibrary/qml/VideoPlaylistsDisplay.qml \
-        gui/qt/medialibrary/qml/VideoRecentVideos.qml \
-        gui/qt/medialibrary/qml/VideoRecentVideosDisplay.qml \
-	gui/qt/medialibrary/qml/VideoGridItem.qml \
-	gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml \
-	gui/qt/medialibrary/qml/VideoListDisplay.qml \
-        gui/qt/medialibrary/qml/VideoGridDisplay.qml \
-	gui/qt/menus/qml/GlobalShortcuts.qml \
-	gui/qt/menus/qml/GlobalShortcutsMedialib.qml \
-	gui/qt/menus/qml/Menubar.qml \
-	gui/qt/menus/qml/ShortcutExt.qml \
-	gui/qt/network/qml/AddressbarButton.qml \
-	gui/qt/network/qml/BrowseDeviceHeader.qml \
-	gui/qt/network/qml/BrowseDeviceView.qml \
-	gui/qt/network/qml/BrowseDisplay.qml \
-	gui/qt/network/qml/BrowseHomeDisplay.qml \
-	gui/qt/network/qml/BrowseTreeDisplay.qml \
-	gui/qt/network/qml/BrowseTreeHeader.qml \
-	gui/qt/network/qml/DiscoverDisplay.qml \
-	gui/qt/network/qml/DiscoverUrlDisplay.qml \
-	gui/qt/network/qml/NetworkAddressbar.qml \
-	gui/qt/network/qml/NetworkCustomCover.qml \
-	gui/qt/network/qml/NetworkGridItem.qml \
-	gui/qt/network/qml/NetworkThumbnailItem.qml \
-	gui/qt/network/qml/ServicesHomeDisplay.qml \
-	gui/qt/network/qml/ServicesManage.qml \
-	gui/qt/network/qml/ServicesSources.qml \
-	gui/qt/player/qml/qmldir \
-        gui/qt/player/qml/Bookmarks.qml \
-	gui/qt/player/qml/ControlBar.qml \
-	gui/qt/player/qml/ControlbarControls.qml \
-	gui/qt/player/qml/PlaybackSpeed.qml \
-	gui/qt/player/qml/MiniPlayer.qml \
-	gui/qt/player/qml/PIPPlayer.qml \
-	gui/qt/player/qml/Player.qml \
-	gui/qt/player/qml/PlayerBlurredBackground.qml \
-	gui/qt/player/qml/PlayerBlurredBackground.frag \
-	gui/qt/player/qml/PlayerControlLayout.qml \
-	gui/qt/player/qml/PlayerPlaylistVisibilityFSM.qml \
-	gui/qt/player/qml/ResumeDialog.qml \
-	gui/qt/player/qml/SliderBar.qml \
-	gui/qt/player/qml/TopBar.qml \
-	gui/qt/player/qml/TracksMenu.qml \
-	gui/qt/player/qml/TracksPage.qml \
-	gui/qt/player/qml/TracksPageAudio.qml \
-	gui/qt/player/qml/TracksPageSpeed.qml \
-	gui/qt/player/qml/TracksPageSubtitle.qml \
-	gui/qt/player/qml/TracksListPage.qml \
-	gui/qt/player/qml/ControlLayout.qml \
-	gui/qt/player/qml/ControlRepeater.qml \
-	gui/qt/player/qml/controlbarcontrols/HighResolutionTimeWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/AtoBButton.qml \
-	gui/qt/player/qml/controlbarcontrols/BackButton.qml \
-	gui/qt/player/qml/controlbarcontrols/BookmarkButton.qml \
-	gui/qt/player/qml/controlbarcontrols/ChapterNextButton.qml \
-	gui/qt/player/qml/controlbarcontrols/ChapterPreviousButton.qml \
-	gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml \
-	gui/qt/player/qml/controlbarcontrols/ExpandingSpacerWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/ExtendedSettingsButton.qml \
-	gui/qt/player/qml/controlbarcontrols/FasterButton.qml \
-	gui/qt/player/qml/controlbarcontrols/FrameButton.qml \
-	gui/qt/player/qml/controlbarcontrols/FullscreenButton.qml \
-	gui/qt/player/qml/controlbarcontrols/InfoButton.qml \
-	gui/qt/player/qml/controlbarcontrols/LangButton.qml \
-	gui/qt/player/qml/controlbarcontrols/LoopButton.qml \
-	gui/qt/player/qml/controlbarcontrols/MenuButton.qml \
-	gui/qt/player/qml/controlbarcontrols/NavigationWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/NextButton.qml \
-	gui/qt/player/qml/controlbarcontrols/OpenButton.qml \
-	gui/qt/player/qml/controlbarcontrols/PlaybackSpeedButton.qml \
-	gui/qt/player/qml/controlbarcontrols/PlayButton.qml \
-	gui/qt/player/qml/controlbarcontrols/PlayerSwitchButton.qml \
-	gui/qt/player/qml/controlbarcontrols/PlaylistButton.qml \
-	gui/qt/player/qml/controlbarcontrols/PreviousButton.qml \
-	gui/qt/player/qml/controlbarcontrols/ProgramButton.qml \
-	gui/qt/player/qml/controlbarcontrols/QuitButton.qml \
-	gui/qt/player/qml/controlbarcontrols/RandomButton.qml \
-	gui/qt/player/qml/controlbarcontrols/RendererButton.qml \
-	gui/qt/player/qml/controlbarcontrols/RecordButton.qml \
-	gui/qt/player/qml/controlbarcontrols/ReverseButton.qml \
-	gui/qt/player/qml/controlbarcontrols/SkipBackButton.qml \
-	gui/qt/player/qml/controlbarcontrols/SkipForwardButton.qml \
-	gui/qt/player/qml/controlbarcontrols/SlowerButton.qml \
-	gui/qt/player/qml/controlbarcontrols/SnapshotButton.qml \
-	gui/qt/player/qml/controlbarcontrols/SpacerWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/StopButton.qml \
-	gui/qt/player/qml/controlbarcontrols/TeletextButton.qml \
-	gui/qt/player/qml/controlbarcontrols/TeletextColorButton.qml \
-	gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml \
-	gui/qt/player/qml/controlbarcontrols/Fallback.qml \
-	gui/qt/playlist/qml/PlaylistDelegate.qml \
-	gui/qt/playlist/qml/PlaylistListView.qml \
-	gui/qt/playlist/qml/PlaylistToolbar.qml \
-	gui/qt/playlist/qml/PlaylistDetachedWindow.qml \
-	gui/qt/style/AcrylicController.qml \
-	gui/qt/style/VLCIcons.qml \
-	gui/qt/style/VLCStyle.qml \
-	gui/qt/style/qmldir \
-	gui/qt/util/qml/Helpers.js \
-	gui/qt/util/qml/ModelSortSettingHandler.qml \
-	gui/qt/util/qml/FlickableScrollHandler.qml \
-	gui/qt/util/qml/ViewDragAutoScrollHandler.qml \
-	gui/qt/util/qml/BindingRev8.qml \
-	gui/qt/util/qml/BindingRev14.qml \
-	gui/qt/util/qml/FSM.qml \
-	gui/qt/util/qml/FSMState.qml \
-	gui/qt/util/qml/NativeMenu.qml \
-	gui/qt/util/qml/MLContextMenu.qml \
-	gui/qt/util/qml/ListViewRev15.qml \
-	gui/qt/util/qml/ListViewRev11.qml \
-	gui/qt/widgets/qml/ActionButtonOverlay.qml \
-	gui/qt/widgets/qml/ActionButtonPrimary.qml \
-	gui/qt/widgets/qml/BannerTabButton.qml \
-	gui/qt/widgets/qml/BannerCone.qml \
-	gui/qt/widgets/qml/BusyIndicatorExt.qml \
-	gui/qt/widgets/qml/CaptionLabel.qml \
-	gui/qt/widgets/qml/CheckButton.qml \
-	gui/qt/widgets/qml/CheckedDelegate.qml \
-	gui/qt/widgets/qml/ComboBoxExt.qml \
-	gui/qt/widgets/qml/AcrylicBackground.qml \
-	gui/qt/widgets/qml/AnimatedBackground.qml \
-	gui/qt/widgets/qml/CoverShadow.qml \
-	gui/qt/widgets/qml/CSDThemeButton.qml \
-	gui/qt/widgets/qml/CSDThemeButtonSet.qml \
-	gui/qt/widgets/qml/CSDWindowButton.qml \
-	gui/qt/widgets/qml/CSDWindowButtonSet.qml \
-	gui/qt/widgets/qml/CSDTitlebarTapNDrapHandler.qml \
-	gui/qt/widgets/qml/CSDMouseStealer.qml \
-	gui/qt/widgets/qml/CurrentIndicator.qml \
-	gui/qt/widgets/qml/DragItem.qml \
-	gui/qt/widgets/qml/DrawerExt.qml \
-	gui/qt/widgets/qml/ExpandGridView.qml \
-	gui/qt/widgets/qml/EmptyLabel.qml \
-	gui/qt/widgets/qml/EmptyLabelButton.qml \
-	gui/qt/widgets/qml/EmptyLabelHint.qml \
-	gui/qt/widgets/qml/GridItem.qml \
-	gui/qt/widgets/qml/HorizontalResizeHandle.qml \
-	gui/qt/widgets/qml/IconLabel.qml \
-	gui/qt/widgets/qml/IconButton.qml \
-	gui/qt/widgets/qml/IconControlButton.qml \
-	gui/qt/widgets/qml/IconToolButton.qml \
-	gui/qt/widgets/qml/IconTrackButton.qml \
-	gui/qt/widgets/qml/ImageToolButton.qml \
-	gui/qt/widgets/qml/KeyNavigableListView.qml \
-	gui/qt/widgets/qml/KeyNavigableTableView.qml \
-	gui/qt/widgets/qml/TableViewDelegate.qml \
-	gui/qt/widgets/qml/ListCoverShadow.qml \
-	gui/qt/widgets/qml/ListLabel.qml \
-	gui/qt/widgets/qml/LoaderFade.qml \
-	gui/qt/widgets/qml/LocalTabBar.qml \
-	gui/qt/widgets/qml/MediaCover.qml \
-	gui/qt/widgets/qml/SubtitleLabel.qml \
-	gui/qt/widgets/qml/MenuCaption.qml \
-	gui/qt/widgets/qml/MenuLabel.qml \
-	gui/qt/widgets/qml/MLDragItem.qml \
-	gui/qt/widgets/qml/NavigableCol.qml \
-	gui/qt/widgets/qml/NavigableRow.qml \
-	gui/qt/widgets/qml/PlayCover.qml \
-	gui/qt/widgets/qml/RoundButton.qml \
-	gui/qt/widgets/qml/ScaledImage.qml \
-	gui/qt/widgets/qml/ScanProgressBar.qml \
-	gui/qt/widgets/qml/ScrollingText.qml \
-	gui/qt/widgets/qml/SearchBox.qml \
-	gui/qt/widgets/qml/SliderExt.qml \
-	gui/qt/widgets/qml/SortControl.qml \
-	gui/qt/widgets/qml/SpinBoxExt.qml \
-	gui/qt/widgets/qml/StackViewExt.qml \
-	gui/qt/widgets/qml/PageLoader.qml \
-	gui/qt/widgets/qml/ButtonExt.qml \
-	gui/qt/widgets/qml/TableColumns.qml \
-	gui/qt/widgets/qml/TextFieldExt.qml \
-	gui/qt/widgets/qml/TextToolButton.qml \
-	gui/qt/widgets/qml/TrackDelayButton.qml \
-	gui/qt/widgets/qml/VideoProgressBar.qml \
-	gui/qt/widgets/qml/VideoQualityLabels.qml \
-	gui/qt/widgets/qml/ListSubtitleLabel.qml \
-	gui/qt/widgets/qml/PointingTooltip.qml \
-	gui/qt/widgets/qml/FrostedGlassEffect.qml \
-	gui/qt/widgets/qml/OverlayMenu.qml \
-	gui/qt/widgets/qml/ToolTipExt.qml \
-	gui/qt/widgets/qml/DropShadowImage.qml \
-	gui/qt/widgets/qml/DoubleShadow.qml \
-	gui/qt/widgets/qml/FadingEdge.qml \
-	gui/qt/widgets/qml/FadingEdgeForListView.qml \
-	gui/qt/widgets/qml/PopupIconToolButton.qml
+	dialogs/dialogs/qml/CustomDialog.qml \
+	dialogs/dialogs/qml/Dialogs.qml \
+	dialogs/dialogs/qml/ModalDialog.qml \
+	dialogs/dialogs/qml/WindowDialog.qml \
+	dialogs/toolbar/qml/EditorDNDDelegate.qml \
+	dialogs/toolbar/qml/EditorDNDView.qml\
+	dialogs/toolbar/qml/EditorDummyButton.qml \
+	dialogs/toolbar/qml/EditorTabButton.qml \
+	dialogs/toolbar/qml/ToolbarEditor.qml \
+	dialogs/toolbar/qml/ToolbarEditorDialog.qml \
+	dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
+	maininterface/qml/BannerSources.qml \
+	maininterface/qml/MainInterface.qml \
+	maininterface/qml/MainViewLoader.qml \
+	maininterface/qml/MainDisplay.qml \
+	maininterface/qml/MainGridView.qml \
+	maininterface/qml/MainTableView.qml \
+	maininterface/qml/NoMedialibHome.qml \
+	medialibrary/qml/ArtistTopBanner.qml \
+	medialibrary/qml/AudioGridItem.qml \
+	medialibrary/qml/MediaGroupDisplay.qml \
+	medialibrary/qml/MusicAlbums.qml \
+	medialibrary/qml/MusicAlbumsDisplay.qml \
+	medialibrary/qml/MusicAlbumsGridExpandDelegate.qml \
+	medialibrary/qml/MusicArtist.qml \
+	medialibrary/qml/MusicArtistDelegate.qml \
+	medialibrary/qml/MusicArtistsAlbums.qml \
+	medialibrary/qml/MusicAllArtists.qml \
+	medialibrary/qml/MusicArtistsDisplay.qml \
+	medialibrary/qml/MusicDisplay.qml \
+	medialibrary/qml/MusicGenres.qml \
+	medialibrary/qml/MusicGenresDisplay.qml \
+	medialibrary/qml/MusicPlaylistsDisplay.qml \
+	medialibrary/qml/MusicTrackListDisplay.qml \
+	medialibrary/qml/MusicTracksDisplay.qml \
+	medialibrary/qml/UrlListDisplay.qml \
+	medialibrary/qml/VideoDisplay.qml \
+	medialibrary/qml/VideoAll.qml \
+	medialibrary/qml/VideoAllDisplay.qml \
+	medialibrary/qml/VideoAllSubDisplay.qml \
+	medialibrary/qml/PlaylistMediaList.qml \
+	medialibrary/qml/PlaylistMedia.qml \
+	medialibrary/qml/PlaylistMediaDisplay.qml \
+	medialibrary/qml/VideoPlaylistsDisplay.qml \
+        medialibrary/qml/VideoRecentVideos.qml \
+        medialibrary/qml/VideoRecentVideosDisplay.qml \
+	medialibrary/qml/VideoGridItem.qml \
+	medialibrary/qml/VideoInfoExpandPanel.qml \
+	medialibrary/qml/VideoListDisplay.qml \
+        medialibrary/qml/VideoGridDisplay.qml \
+	menus/qml/GlobalShortcuts.qml \
+	menus/qml/GlobalShortcutsMedialib.qml \
+	menus/qml/Menubar.qml \
+	menus/qml/ShortcutExt.qml \
+	network/qml/AddressbarButton.qml \
+	network/qml/BrowseDeviceHeader.qml \
+	network/qml/BrowseDeviceView.qml \
+	network/qml/BrowseDisplay.qml \
+	network/qml/BrowseHomeDisplay.qml \
+	network/qml/BrowseTreeDisplay.qml \
+	network/qml/BrowseTreeHeader.qml \
+	network/qml/DiscoverDisplay.qml \
+	network/qml/DiscoverUrlDisplay.qml \
+	network/qml/NetworkAddressbar.qml \
+	network/qml/NetworkCustomCover.qml \
+	network/qml/NetworkGridItem.qml \
+	network/qml/NetworkThumbnailItem.qml \
+	network/qml/ServicesHomeDisplay.qml \
+	network/qml/ServicesManage.qml \
+	network/qml/ServicesSources.qml \
+	player/qml/qmldir \
+        player/qml/Bookmarks.qml \
+	player/qml/ControlBar.qml \
+	player/qml/ControlbarControls.qml \
+	player/qml/PlaybackSpeed.qml \
+	player/qml/MiniPlayer.qml \
+	player/qml/PIPPlayer.qml \
+	player/qml/Player.qml \
+	player/qml/PlayerBlurredBackground.qml \
+	player/qml/PlayerBlurredBackground.frag \
+	player/qml/PlayerControlLayout.qml \
+	player/qml/PlayerPlaylistVisibilityFSM.qml \
+	player/qml/ResumeDialog.qml \
+	player/qml/SliderBar.qml \
+	player/qml/TopBar.qml \
+	player/qml/TracksMenu.qml \
+	player/qml/TracksPage.qml \
+	player/qml/TracksPageAudio.qml \
+	player/qml/TracksPageSpeed.qml \
+	player/qml/TracksPageSubtitle.qml \
+	player/qml/TracksListPage.qml \
+	player/qml/ControlLayout.qml \
+	player/qml/ControlRepeater.qml \
+	player/qml/controlbarcontrols/HighResolutionTimeWidget.qml \
+	player/qml/controlbarcontrols/ArtworkInfoWidget.qml \
+	player/qml/controlbarcontrols/AspectRatioWidget.qml \
+	player/qml/controlbarcontrols/AtoBButton.qml \
+	player/qml/controlbarcontrols/BackButton.qml \
+	player/qml/controlbarcontrols/BookmarkButton.qml \
+	player/qml/controlbarcontrols/ChapterNextButton.qml \
+	player/qml/controlbarcontrols/ChapterPreviousButton.qml \
+	player/qml/controlbarcontrols/DvdMenuButton.qml \
+	player/qml/controlbarcontrols/ExpandingSpacerWidget.qml \
+	player/qml/controlbarcontrols/ExtendedSettingsButton.qml \
+	player/qml/controlbarcontrols/FasterButton.qml \
+	player/qml/controlbarcontrols/FrameButton.qml \
+	player/qml/controlbarcontrols/FullscreenButton.qml \
+	player/qml/controlbarcontrols/InfoButton.qml \
+	player/qml/controlbarcontrols/LangButton.qml \
+	player/qml/controlbarcontrols/LoopButton.qml \
+	player/qml/controlbarcontrols/MenuButton.qml \
+	player/qml/controlbarcontrols/NavigationWidget.qml \
+	player/qml/controlbarcontrols/NextButton.qml \
+	player/qml/controlbarcontrols/OpenButton.qml \
+	player/qml/controlbarcontrols/PlaybackSpeedButton.qml \
+	player/qml/controlbarcontrols/PlayButton.qml \
+	player/qml/controlbarcontrols/PlayerSwitchButton.qml \
+	player/qml/controlbarcontrols/PlaylistButton.qml \
+	player/qml/controlbarcontrols/PreviousButton.qml \
+	player/qml/controlbarcontrols/ProgramButton.qml \
+	player/qml/controlbarcontrols/QuitButton.qml \
+	player/qml/controlbarcontrols/RandomButton.qml \
+	player/qml/controlbarcontrols/RendererButton.qml \
+	player/qml/controlbarcontrols/RecordButton.qml \
+	player/qml/controlbarcontrols/ReverseButton.qml \
+	player/qml/controlbarcontrols/SkipBackButton.qml \
+	player/qml/controlbarcontrols/SkipForwardButton.qml \
+	player/qml/controlbarcontrols/SlowerButton.qml \
+	player/qml/controlbarcontrols/SnapshotButton.qml \
+	player/qml/controlbarcontrols/SpacerWidget.qml \
+	player/qml/controlbarcontrols/StopButton.qml \
+	player/qml/controlbarcontrols/TeletextButton.qml \
+	player/qml/controlbarcontrols/TeletextColorButton.qml \
+	player/qml/controlbarcontrols/TeletextWidget.qml \
+	player/qml/controlbarcontrols/VolumeWidget.qml \
+	player/qml/controlbarcontrols/Fallback.qml \
+	playlist/qml/PlaylistDelegate.qml \
+	playlist/qml/PlaylistListView.qml \
+	playlist/qml/PlaylistToolbar.qml \
+	playlist/qml/PlaylistDetachedWindow.qml \
+	style/AcrylicController.qml \
+	style/VLCIcons.qml \
+	style/VLCStyle.qml \
+	style/qmldir \
+	util/qml/Helpers.js \
+	util/qml/ModelSortSettingHandler.qml \
+	util/qml/FlickableScrollHandler.qml \
+	util/qml/ViewDragAutoScrollHandler.qml \
+	util/qml/BindingRev8.qml \
+	util/qml/BindingRev14.qml \
+	util/qml/FSM.qml \
+	util/qml/FSMState.qml \
+	util/qml/NativeMenu.qml \
+	util/qml/MLContextMenu.qml \
+	util/qml/ListViewRev15.qml \
+	util/qml/ListViewRev11.qml \
+	widgets/qml/ActionButtonOverlay.qml \
+	widgets/qml/ActionButtonPrimary.qml \
+	widgets/qml/BannerTabButton.qml \
+	widgets/qml/BannerCone.qml \
+	widgets/qml/BusyIndicatorExt.qml \
+	widgets/qml/CaptionLabel.qml \
+	widgets/qml/CheckButton.qml \
+	widgets/qml/CheckedDelegate.qml \
+	widgets/qml/ComboBoxExt.qml \
+	widgets/qml/AcrylicBackground.qml \
+	widgets/qml/AnimatedBackground.qml \
+	widgets/qml/CoverShadow.qml \
+	widgets/qml/CSDThemeButton.qml \
+	widgets/qml/CSDThemeButtonSet.qml \
+	widgets/qml/CSDWindowButton.qml \
+	widgets/qml/CSDWindowButtonSet.qml \
+	widgets/qml/CSDTitlebarTapNDrapHandler.qml \
+	widgets/qml/CSDMouseStealer.qml \
+	widgets/qml/CurrentIndicator.qml \
+	widgets/qml/DragItem.qml \
+	widgets/qml/DrawerExt.qml \
+	widgets/qml/ExpandGridView.qml \
+	widgets/qml/EmptyLabel.qml \
+	widgets/qml/EmptyLabelButton.qml \
+	widgets/qml/EmptyLabelHint.qml \
+	widgets/qml/GridItem.qml \
+	widgets/qml/HorizontalResizeHandle.qml \
+	widgets/qml/IconLabel.qml \
+	widgets/qml/IconButton.qml \
+	widgets/qml/IconControlButton.qml \
+	widgets/qml/IconToolButton.qml \
+	widgets/qml/IconTrackButton.qml \
+	widgets/qml/ImageToolButton.qml \
+	widgets/qml/KeyNavigableListView.qml \
+	widgets/qml/KeyNavigableTableView.qml \
+	widgets/qml/TableViewDelegate.qml \
+	widgets/qml/ListCoverShadow.qml \
+	widgets/qml/ListLabel.qml \
+	widgets/qml/LoaderFade.qml \
+	widgets/qml/LocalTabBar.qml \
+	widgets/qml/MediaCover.qml \
+	widgets/qml/SubtitleLabel.qml \
+	widgets/qml/MenuCaption.qml \
+	widgets/qml/MenuLabel.qml \
+	widgets/qml/MLDragItem.qml \
+	widgets/qml/NavigableCol.qml \
+	widgets/qml/NavigableRow.qml \
+	widgets/qml/PlayCover.qml \
+	widgets/qml/RoundButton.qml \
+	widgets/qml/ScaledImage.qml \
+	widgets/qml/ScanProgressBar.qml \
+	widgets/qml/ScrollingText.qml \
+	widgets/qml/SearchBox.qml \
+	widgets/qml/SliderExt.qml \
+	widgets/qml/SortControl.qml \
+	widgets/qml/SpinBoxExt.qml \
+	widgets/qml/StackViewExt.qml \
+	widgets/qml/PageLoader.qml \
+	widgets/qml/ButtonExt.qml \
+	widgets/qml/TableColumns.qml \
+	widgets/qml/TextFieldExt.qml \
+	widgets/qml/TextToolButton.qml \
+	widgets/qml/TrackDelayButton.qml \
+	widgets/qml/VideoProgressBar.qml \
+	widgets/qml/VideoQualityLabels.qml \
+	widgets/qml/ListSubtitleLabel.qml \
+	widgets/qml/PointingTooltip.qml \
+	widgets/qml/FrostedGlassEffect.qml \
+	widgets/qml/OverlayMenu.qml \
+	widgets/qml/ToolTipExt.qml \
+	widgets/qml/DropShadowImage.qml \
+	widgets/qml/DoubleShadow.qml \
+	widgets/qml/FadingEdge.qml \
+	widgets/qml/FadingEdgeForListView.qml \
+	widgets/qml/PopupIconToolButton.qml
 
-lib_qt_plugin_la_QRC = gui/qt/vlc.qrc
+lib_qt_plugin_la_QRC = vlc.qrc
 
 if HAVE_WIN32
-lib_qt_plugin_la_QRC += gui/qt/windows.qrc
+lib_qt_plugin_la_QRC += windows.qrc
 endif
 
 EXTRA_DIST += $(lib_qt_plugin_la_QRC) $(libqt_plugin_la_RES)
 
-nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp
+nodist_libqt_plugin_la_SOURCES += resources.cpp
 
 if ENABLE_VLM
-nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm/vlm.moc.cpp
+nodist_libqt_plugin_la_SOURCES += dialogs/vlm/vlm.moc.cpp
 endif
 
 if HAVE_QMLCACHE
 
-nodist_libqt_plugin_la_SOURCES += gui/qt/qmlcache_loader.cpp
+nodist_libqt_plugin_la_SOURCES += qmlcache_loader.cpp
 libqt_plugin_la_SOURCES += $(libqt_plugin_la_QML)
 
 .qml.cpp:
-	$(AM_V_GEN)$(QMLCACHE) --resource=$(srcdir)/gui/qt/vlc.qrc -o $@ $<
+	$(AM_V_GEN)$(QMLCACHE) --resource=$(srcdir)/vlc.qrc -o $@ $<
 
 .js.cpp:
-	$(AM_V_GEN)$(QMLCACHE) --resource=$(srcdir)/gui/qt/vlc.qrc -o $@ $<
+	$(AM_V_GEN)$(QMLCACHE) --resource=$(srcdir)/vlc.qrc -o $@ $<
 
 .mjs.cpp:
-	$(AM_V_GEN)$(QMLCACHE) --resource=$(srcdir)/gui/qt/vlc.qrc -o $@ $<
+	$(AM_V_GEN)$(QMLCACHE) --resource=$(srcdir)/vlc.qrc -o $@ $<
 
-qml_cache.qrc: gui/qt/vlc.qrc
+qml_cache.qrc: vlc.qrc
 	$(AM_V_GEN)$(QMLCACHE) --filter-resource-file -o $@ $<
 
-QRCS_EXCEPT_VLC_QRC = $(filter-out gui/qt/vlc.qrc, $(lib_qt_plugin_la_QRC))
+QRCS_EXCEPT_VLC_QRC = $(filter-out vlc.qrc, $(lib_qt_plugin_la_QRC))
 QRCS_EXCEPT_VLC_QRC += qml_cache.qrc
 
-gui/qt/resources.cpp: $(QRCS_EXCEPT_VLC_QRC) $(libqt_plugin_la_RES)
+resources.cpp: $(QRCS_EXCEPT_VLC_QRC) $(libqt_plugin_la_RES)
 	$(AM_V_GEN)$(RCC) --name qml_cache -o $@ $(filter %.qrc, $^)
 
 #output name matters here
-gui/qt/qmlcache_loader.cpp: gui/qt/vlc.qrc qml_cache.qrc $(libqt_plugin_la_QML)
+qmlcache_loader.cpp: vlc.qrc qml_cache.qrc $(libqt_plugin_la_QML)
 	$(AM_V_GEN)$(QMLCACHE) --resource-file-mapping=$<=qml_cache.qrc $< -o $@
 
 else
 
 EXTRA_DIST += $(libqt_plugin_la_QML)
 
-gui/qt/resources.cpp: $(lib_qt_plugin_la_QRC) $(libqt_plugin_la_RES) $(libqt_plugin_la_QML)
+resources.cpp: $(lib_qt_plugin_la_QRC) $(libqt_plugin_la_RES) $(libqt_plugin_la_QML)
 	$(AM_V_GEN)$(RCC) --name vlc -o $@ $(filter %.qrc, $^)
 
 endif
@@ -1126,14 +1130,14 @@ libqt_gtktheme_CPPFLAGS = $(AM_CPPFLAGS)
 libqt_gtktheme_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 libqt_gtktheme_plugin_la_LIBADD = $(GTK3_LIBS)
 libqt_gtktheme_plugin_la_SOURCES = \
-	gui/qt/style/gtkthemeprovider/gtk_compat.cpp \
-	gui/qt/style/gtkthemeprovider/gtk_compat.h \
-	gui/qt/style/gtkthemeprovider/gtkthemeprovider.cpp \
-	gui/qt/style/gtkthemeprovider/gtk_util.cpp \
-	gui/qt/style/gtkthemeprovider/gtk_util.h \
-	gui/qt/style/gtkthemeprovider/nav_button_provider_gtk.cpp \
-	gui/qt/style/gtkthemeprovider/nav_button_provider_gtk.h \
-	gui/qt/style/gtkthemeprovider/scoped_gobject.h
+	style/gtkthemeprovider/gtk_compat.cpp \
+	style/gtkthemeprovider/gtk_compat.h \
+	style/gtkthemeprovider/gtkthemeprovider.cpp \
+	style/gtkthemeprovider/gtk_util.cpp \
+	style/gtkthemeprovider/gtk_util.h \
+	style/gtkthemeprovider/nav_button_provider_gtk.cpp \
+	style/gtkthemeprovider/nav_button_provider_gtk.h \
+	style/gtkthemeprovider/scoped_gobject.h
 if ENABLE_QT
 gui_LTLIBRARIES += libqt_gtktheme_plugin.la
 endif
@@ -1144,24 +1148,20 @@ gui_LTLIBRARIES += libqt_plugin.la
 BUILT_SOURCES += $(nodist_libqt_plugin_la_SOURCES)
 if !HAVE_WIN32
 if !HAVE_OS2
-pkglibexec_PROGRAMS += vlc-qt-check
+pkglibexec_PROGRAMS = vlc-qt-check
 endif
 endif
 
 if HAVE_QT5_QUICK_TEST
-
-qml_test_SOURCES = gui/qt/tests/qml_test.cpp
-nodist_qml_test_SOURCES = gui/qt/resources.cpp
+qml_test_SOURCES = tests/qml_test.cpp
+nodist_qml_test_SOURCES = resources.cpp
 if HAVE_QMLCACHE
-nodist_qml_test_SOURCES += gui/qt/qmlcache_loader.cpp $(libqt_plugin_la_QML)
+nodist_qml_test_SOURCES += qmlcache_loader.cpp $(libqt_plugin_la_QML)
 endif
-qml_test_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) -fPIC $(CXXFLAGS_qt) ${QT5_QUICK_TEST_CFLAGS} -DQUICK_TEST_SOURCE_DIR="\"${srcdir}/gui/qt/tests\""
+qml_test_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) -fPIC $(CXXFLAGS_qt) ${QT5_QUICK_TEST_CFLAGS} -DQUICK_TEST_SOURCE_DIR="\"${srcdir}/tests\""
 qml_test_LDADD = $(QT5_PLUGINS_LIBS) ${QT5_QUICK_TEST_LIBS} $(QT_LIBS) $(LIBS_qt)
-check_PROGRAMS += qml_test
-EXTRA_DIST += gui/qt/tests/tst_FSM.qml
-
-TESTS += qml_test
-
+check_PROGRAMS = qml_test
+EXTRA_DIST += tests/tst_FSM.qml
+TESTS = qml_test
 endif
-
 endif