50 files changed, 140 insertions, 116 deletions

diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 9fb78e3b3e..026b7375ed 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -47,8 +47,26 @@ set(WIRESHARK_UTILS_HEADERS
 	utils/color_utils.h
 	utils/stock_icon.h
 	utils/qt_ui_utils.h
+	utils/tango_colors.h
 	utils/variant_pointer.h
-	uat_delegate.h
+)
+
+set(WIRESHARK_MODEL_HEADERS
+	models/cache_proxy_model.h
+	models/interface_sort_filter_model.h
+	models/interface_tree_cache_model.h
+	models/interface_tree_model.h
+	models/numeric_value_chooser_delegate.h
+	models/packet_list_model.h
+	models/packet_list_record.h
+	models/path_chooser_delegate.h
+	models/percent_bar_delegate.h
+	models/related_packet_delegate.h
+	models/timeline_delegate.h
+	models/sparkline_delegate.h
+	models/uat_delegate.h
+	models/uat_model.h
+	models/voip_calls_info_model.h
 )
 
 # All .h files which inherit from QObject aka which use the Q_OBJECT macro
@@ -64,7 +82,6 @@ set(WIRESHARK_QT_HEADERS
 	accordion_frame.h
 	byte_view_tab.h
 	byte_view_text.h
-	cache_proxy_model.h
 	capture_file.h
 	capture_file_dialog.h
 	capture_file_properties_dialog.h
@@ -106,9 +123,6 @@ set(WIRESHARK_QT_HEADERS
 	import_text_dialog.h
 	interface_toolbar.h
 	interface_toolbar_reader.h
-	interface_tree_model.h
-	interface_tree_cache_model.h
-	interface_sort_filter_model.h
 	interface_frame.h
 	io_graph_dialog.h
 	layout_preferences_frame.h
@@ -126,16 +140,12 @@ set(WIRESHARK_QT_HEADERS
 	manage_interfaces_dialog.h
 	module_preferences_scroll_area.h
 	mtp3_summary_dialog.h
-	numeric_value_chooser_delegate.h
 	multicast_statistics_dialog.h
 	packet_comment_dialog.h
 	packet_dialog.h
 	packet_format_group_box.h
 	packet_list.h
-	packet_list_model.h
 	packet_range_group_box.h
-	path_chooser_delegate.h
-	percent_bar_delegate.h
 	preference_editor_frame.h
 	preferences_dialog.h
 	print_dialog.h
@@ -145,7 +155,6 @@ set(WIRESHARK_QT_HEADERS
 	protocol_hierarchy_dialog.h
 	protocol_preferences_menu.h
 	recent_file_status.h
-	related_packet_delegate.h
 	resolved_addresses_dialog.h
 	response_time_delay_dialog.h
 	rpc_service_response_time_dialog.h
@@ -172,14 +181,10 @@ set(WIRESHARK_QT_HEADERS
 	tap_parameter_dialog.h
 	tcp_stream_dialog.h
 	time_shift_dialog.h
-	timeline_delegate.h
 	traffic_table_dialog.h
-	uat_delegate.h
 	uat_dialog.h
 	uat_frame.h
-	uat_model.h
 	voip_calls_dialog.h
-	voip_calls_info_model.h
 	wireless_frame.h
 	wireless_timeline.h
 	wireshark_application.h
@@ -208,8 +213,8 @@ endif()
 
 file(GLOB EXTRA_QT_HEADERS
 	packet_list_record.h
+	models/sparkline_delegate.h
 	utils/qt_ui_utils.h
-	sparkline_delegate.h
 	utils/stock_icon.h
 )
 
@@ -241,6 +246,25 @@ set(WIRESHARK_UTILS_SRCS
 	utils/qt_ui_utils.cpp
 )
 
+set(WIRESHARK_MODEL_SRCS
+	models/cache_proxy_model.cpp
+	models/interface_sort_filter_model.cpp
+	models/interface_tree_cache_model.cpp
+	models/interface_tree_model.cpp
+	models/numeric_value_chooser_delegate.cpp
+	models/packet_list_model.cpp
+	models/packet_list_record.cpp
+	models/path_chooser_delegate.cpp
+	models/percent_bar_delegate.cpp
+	models/related_packet_delegate.cpp
+	models/sparkline_delegate.cpp
+	models/sparkline_delegate.cpp
+	models/timeline_delegate.cpp
+	models/uat_delegate.cpp
+	models/uat_model.cpp
+	models/voip_calls_info_model.cpp
+)
+
 set(WIRESHARK_QT_SRC
 	about_dialog.cpp
 	accordion_frame.cpp
@@ -251,7 +275,6 @@ set(WIRESHARK_QT_SRC
 	bluetooth_hci_summary_dialog.cpp
 	byte_view_tab.cpp
 	byte_view_text.cpp
-	cache_proxy_model.cpp
 	capture_file.cpp
 	capture_file_dialog.cpp
 	capture_file_properties_dialog.cpp
@@ -290,9 +313,6 @@ set(WIRESHARK_QT_SRC
 	interface_frame.cpp
 	interface_toolbar.cpp
 	interface_toolbar_reader.cpp
-	interface_tree_model.cpp
-	interface_tree_cache_model.cpp
-	interface_sort_filter_model.cpp
 	layout_preferences_frame.cpp
 	lbm_lbtrm_transport_dialog.cpp
 	lbm_lbtru_transport_dialog.cpp
@@ -308,16 +328,11 @@ set(WIRESHARK_QT_SRC
 	main_window_slots.cpp
 	manage_interfaces_dialog.cpp
 	module_preferences_scroll_area.cpp
-	numeric_value_chooser_delegate.cpp
 	packet_comment_dialog.cpp
 	packet_dialog.cpp
 	packet_format_group_box.cpp
 	packet_list.cpp
-	packet_list_model.cpp
-	packet_list_record.cpp
 	packet_range_group_box.cpp
-	path_chooser_delegate.cpp
-	percent_bar_delegate.cpp
 	preference_editor_frame.cpp
 	preferences_dialog.cpp
 	print_dialog.cpp
@@ -327,7 +342,6 @@ set(WIRESHARK_QT_SRC
 	protocol_hierarchy_dialog.cpp
 	protocol_preferences_menu.cpp
 	recent_file_status.cpp
-	related_packet_delegate.cpp
 	resolved_addresses_dialog.cpp
 	response_time_delay_dialog.cpp
 	rpc_service_response_time_dialog.cpp
@@ -348,21 +362,16 @@ set(WIRESHARK_QT_SRC
 	show_packet_bytes_dialog.cpp
 	simple_dialog.cpp
 	simple_statistics_dialog.cpp
-	sparkline_delegate.cpp
 	splash_overlay.cpp
 	supported_protocols_dialog.cpp
 	tabnav_tree_widget.cpp
 	tap_parameter_dialog.cpp
 	tcp_stream_dialog.cpp
 	time_shift_dialog.cpp
-	timeline_delegate.cpp
 	traffic_table_dialog.cpp
-	uat_delegate.cpp
 	uat_dialog.cpp
 	uat_frame.cpp
-	uat_model.cpp
 	voip_calls_dialog.cpp
-	voip_calls_info_model.cpp
 	wireless_frame.cpp
 	wireless_timeline.cpp
 	wireshark_application.cpp
@@ -571,25 +580,30 @@ register_tap_files(wireshark-tap-register.c
 	${WIRESHARK_QT_TAP_SRC}
 )
 
-source_group("moc Source Files" FILES ${WIRESHARK_QT_MOC_SRC})
-source_group("ui Header Files" FILES ${WIRESHARK_QT_UI_SRC})
-source_group("ui Files" FILES ${WIRESHARK_QT_UI})
-source_group("qrc Files" FILES ${WIRESHARK_QT_QRC_SRC} ${WIRESHARK_QT_QRC})
-source_group("Header Files" FILES ${WIRESHARK_QT_HEADERS})
-source_group("Widget Header Files" FILES ${WIRESHARK_WIDGET_HEADERS})
-source_group("Widget Source Files" FILES ${WIRESHARK_WIDGET_SRCS})
-source_group("Utils Header Files" FILES ${WIRESHARK_UTILS_HEADERS})
-source_group("Utils Source Files" FILES ${WIRESHARK_UTILS_SRCS})
+source_group("ui\\moc Source Files" FILES ${WIRESHARK_QT_MOC_SRC})
+source_group("ui\\Header" FILES ${WIRESHARK_QT_UI_SRC})
+source_group("ui\\UIC Files" FILES ${WIRESHARK_QT_UI})
+source_group("ui\\qrc" FILES ${WIRESHARK_QT_QRC_SRC} ${WIRESHARK_QT_QRC})
+source_group("ui\\Header" FILES ${WIRESHARK_QT_HEADERS})
+source_group("ui\\Widget Header" FILES ${WIRESHARK_WIDGET_HEADERS})
+source_group("ui\\Widget Source" FILES ${WIRESHARK_WIDGET_SRCS})
+source_group("ui\\Utils Headers Files" FILES ${WIRESHARK_UTILS_HEADERS})
+source_group("ui\\Utils Source" FILES ${WIRESHARK_UTILS_SRCS})
+source_group("ui\\Models Headers" FILES ${WIRESHARK_MODEL_HEADERS})
+source_group("ui\\Models Headers" FILES ${WIRESHARK_MODEL_SRCS})
 
 add_library(qtui STATIC
 	#Included so that Visual Studio can properly put header files in solution
 	${WIRESHARK_QT_HEADERS}
 	${WIRESHARK_WIDGET_HEADERS}
 	${WIRESHARK_UTILS_HEADERS}
+	${WIRESHARK_MODEL_HEADERS}
 
 	${WIRESHARK_QT_SRC}
 	${WIRESHARK_WIDGET_SRCS}
 	${WIRESHARK_UTILS_SRCS}
+	${WIRESHARK_MODEL_SRCS}
+
 	${WIRESHARK_QT_TAP_SRC}
 	${WIRESHARK_QT_UI_SRC}
 	${WIRESHARK_QT_MOC_SRC}
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 2a037342af..a5d0add4be 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -171,6 +171,7 @@ MOC_WIDGET_HDRS = \
 	widgets/tabnav_tree_view.h			\
 	widgets/drag_drop_toolbar.h			\
 	widgets/qcustomplot.h
+
 # Files that are utility classes with multi-purpose, but no widgets
 MOC_UTILS_HDRS = \
 	utils/color_utils.h				\
@@ -178,6 +179,25 @@ MOC_UTILS_HDRS = \
 	utils/qt_ui_utils.h				\
 	utils/variant_pointer.h
 
+# Files for delegates and models
+MOC_MODELS_HDRS = \
+	models/cache_proxy_model.h			\
+	models/interface_sort_filter_model.h		\
+	models/interface_tree_cache_model.h		\
+	models/interface_tree_model.h			\
+	models/numeric_value_chooser_delegate.h		\
+	models/packet_list_model.h			\
+	models/packet_list_record.h			\
+	models/path_chooser_delegate.h			\
+	models/percent_bar_delegate.h			\
+	models/related_packet_delegate.h		\
+	models/timeline_delegate.h			\
+	models/sparkline_delegate.h			\
+	models/uat_delegate.h				\
+	models/uat_model.h				\
+	models/voip_calls_info_model.h
+
+
 #
 # Headers that have to be run through moc.
 #
@@ -191,7 +211,6 @@ MOC_HDRS = \
 	bluetooth_hci_summary_dialog.h			\
 	byte_view_tab.h					\
 	byte_view_text.h				\
-	cache_proxy_model.h				\
 	capture_file.h					\
 	capture_file_dialog.h				\
 	capture_file_properties_dialog.h		\
@@ -233,9 +252,6 @@ MOC_HDRS = \
 	interface_frame.h				\
 	interface_toolbar.h				\
 	interface_toolbar_reader.h			\
-	interface_tree_model.h				\
-	interface_tree_cache_model.h			\
-	interface_sort_filter_model.h			\
 	io_graph_dialog.h				\
 	layout_preferences_frame.h			\
 	lbm_lbtrm_transport_dialog.h			\
@@ -253,15 +269,11 @@ MOC_HDRS = \
 	module_preferences_scroll_area.h		\
 	multicast_statistics_dialog.h			\
 	mtp3_summary_dialog.h				\
-	numeric_value_chooser_delegate.h		\
 	packet_comment_dialog.h				\
-	path_chooser_delegate.h				\
 	packet_dialog.h					\
 	packet_format_group_box.h			\
 	packet_list.h					\
-	packet_list_model.h				\
 	packet_range_group_box.h			\
-	percent_bar_delegate.h				\
 	preference_editor_frame.h			\
 	preferences_dialog.h				\
 	print_dialog.h					\
@@ -271,7 +283,6 @@ MOC_HDRS = \
 	protocol_hierarchy_dialog.h			\
 	protocol_preferences_menu.h			\
 	recent_file_status.h				\
-	related_packet_delegate.h			\
 	remote_capture_dialog.h				\
 	remote_settings_dialog.h			\
 	resolved_addresses_dialog.h			\
@@ -294,7 +305,6 @@ MOC_HDRS = \
 	service_response_time_dialog.h			\
 	show_packet_bytes_dialog.h			\
 	simple_statistics_dialog.h			\
-	sparkline_delegate.h				\
 	splash_overlay.h				\
 	stats_tree_dialog.h				\
 	supported_protocols_dialog.h			\
@@ -302,21 +312,18 @@ MOC_HDRS = \
 	tap_parameter_dialog.h				\
 	tcp_stream_dialog.h				\
 	time_shift_dialog.h				\
-	timeline_delegate.h				\
 	traffic_table_dialog.h				\
-	uat_delegate.h					\
 	uat_dialog.h					\
 	uat_frame.h					\
-	uat_model.h					\
 	voip_calls_dialog.h				\
-	voip_calls_info_model.h				\
 	wireless_frame.h				\
 	wireless_timeline.h				\
 	wireshark_application.h				\
 	wireshark_dialog.h				\
 	wlan_statistics_dialog.h			\
 	$(MOC_WIDGET_HDRS)				\
-	$(MOC_UTILS_HDRS)
+	$(MOC_UTILS_HDRS)				\
+	$(MOC_MODELS_HDRS)
 
 #
 # .ui files.
@@ -482,6 +489,23 @@ WIRESHARK_QT_UTILS_SRC = \
 	utils/stock_icon.cpp				\
 	utils/qt_ui_utils.cpp
 
+WIRESHARK_QT_MODELS_SRCS = \
+	models/cache_proxy_model.cpp			\
+	models/interface_sort_filter_model.cpp		\
+	models/interface_tree_cache_model.cpp		\
+	models/interface_tree_model.cpp			\
+	models/numeric_value_chooser_delegate.cpp	\
+	models/packet_list_model.cpp			\
+	models/packet_list_record.cpp			\
+	models/path_chooser_delegate.cpp		\
+	models/percent_bar_delegate.cpp			\
+	models/related_packet_delegate.cpp		\
+	models/sparkline_delegate.cpp			\
+	models/timeline_delegate.cpp			\
+	models/uat_model.cpp				\
+	models/uat_delegate.cpp				\
+	models/voip_calls_info_model.cpp
+
 WIRESHARK_QT_SRC = \
 	about_dialog.cpp				\
 	accordion_frame.cpp				\
@@ -492,7 +516,6 @@ WIRESHARK_QT_SRC = \
 	bluetooth_hci_summary_dialog.cpp		\
 	byte_view_tab.cpp				\
 	byte_view_text.cpp				\
-	cache_proxy_model.cpp				\
 	capture_file.cpp				\
 	capture_file_dialog.cpp				\
 	capture_file_properties_dialog.cpp		\
@@ -531,9 +554,6 @@ WIRESHARK_QT_SRC = \
 	interface_frame.cpp				\
 	interface_toolbar.cpp				\
 	interface_toolbar_reader.cpp			\
-	interface_tree_model.cpp			\
-	interface_tree_cache_model.cpp			\
-	interface_sort_filter_model.cpp			\
 	layout_preferences_frame.cpp			\
 	lbm_lbtrm_transport_dialog.cpp			\
 	lbm_lbtru_transport_dialog.cpp			\
@@ -549,16 +569,11 @@ WIRESHARK_QT_SRC = \
 	main_window_slots.cpp				\
 	manage_interfaces_dialog.cpp			\
 	module_preferences_scroll_area.cpp		\
-	numeric_value_chooser_delegate.cpp		\
 	packet_comment_dialog.cpp			\
 	packet_dialog.cpp				\
 	packet_format_group_box.cpp			\
 	packet_list.cpp					\
-	packet_list_model.cpp				\
-	packet_list_record.cpp				\
 	packet_range_group_box.cpp			\
-	path_chooser_delegate.cpp			\
-	percent_bar_delegate.cpp			\
 	preference_editor_frame.cpp			\
 	preferences_dialog.cpp				\
 	print_dialog.cpp				\
@@ -568,7 +583,6 @@ WIRESHARK_QT_SRC = \
 	protocol_hierarchy_dialog.cpp			\
 	protocol_preferences_menu.cpp			\
 	recent_file_status.cpp				\
-	related_packet_delegate.cpp			\
 	remote_capture_dialog.cpp			\
 	remote_settings_dialog.cpp			\
 	resolved_addresses_dialog.cpp			\
@@ -591,27 +605,23 @@ WIRESHARK_QT_SRC = \
 	show_packet_bytes_dialog.cpp			\
 	simple_dialog.cpp				\
 	simple_statistics_dialog.cpp			\
-	sparkline_delegate.cpp				\
 	splash_overlay.cpp				\
 	supported_protocols_dialog.cpp			\
 	tabnav_tree_widget.cpp				\
 	tap_parameter_dialog.cpp			\
 	tcp_stream_dialog.cpp				\
 	time_shift_dialog.cpp				\
-	timeline_delegate.cpp				\
 	traffic_table_dialog.cpp			\
-	uat_delegate.cpp				\
 	uat_dialog.cpp					\
 	uat_frame.cpp					\
-	uat_model.cpp					\
 	voip_calls_dialog.cpp				\
-	voip_calls_info_model.cpp			\
 	wireless_frame.cpp				\
 	wireless_timeline.cpp				\
 	wireshark_application.cpp			\
 	wireshark_dialog.cpp				\
 	$(WIRESHARK_QT_WIDGET_SRC)			\
-	$(WIRESHARK_QT_UTILS_SRC)
+	$(WIRESHARK_QT_UTILS_SRC)			\
+	${WIRESHARK_QT_MODELS_SRCS}
 
 WIRESHARK_QT_TAP_SRC = \
 	expert_info_dialog.cpp			\
@@ -630,8 +640,8 @@ WIRESHARK_QT_TAP_SRC = \
 
 noinst_HEADERS = \
 	$(MOC_HDRS)			\
-	packet_list_record.h		\
 	simple_dialog.h			\
+	models/packet_list_record.h	\
 	widgets/qcustomplot.h		\
 	utils/qt_ui_utils.h		\
 	utils/stock_icon.h		\
diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h
index 06b5243224..548d3eacd2 100644
--- a/ui/qt/capture_file_dialog.h
+++ b/ui/qt/capture_file_dialog.h
@@ -30,7 +30,7 @@
 
 #include <ui/packet_range.h>
 
-#include "packet_list_record.h"
+#include <ui/qt/models/packet_list_record.h>
 #include "cfile.h"
 
 #include "ui/file_dialog.h"
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index efafd6d99a..9938fef49f 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -58,7 +58,7 @@
 #include <wiretap/wtap.h>
 
 #include <ui/qt/utils/qt_ui_utils.h>
-#include <ui/qt/sparkline_delegate.h>
+#include <ui/qt/models/sparkline_delegate.h>
 
 // To do:
 // - Set a size hint for item delegates.
diff --git a/ui/qt/capture_interfaces_dialog.h b/ui/qt/capture_interfaces_dialog.h
index c679724e76..22843b6443 100644
--- a/ui/qt/capture_interfaces_dialog.h
+++ b/ui/qt/capture_interfaces_dialog.h
@@ -27,7 +27,7 @@
 
 #ifdef HAVE_LIBPCAP
 
-#include "ui/qt/interface_tree_model.h"
+#include <ui/qt/models/interface_tree_model.h>
 
 #include "geometry_state_dialog.h"
 #include <QPushButton>
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index fe3a35582c..413ce966a0 100644
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -31,7 +31,7 @@
 #include "wsutil/str_util.h"
 
 #include <ui/qt/utils/qt_ui_utils.h>
-#include <ui/qt/timeline_delegate.h>
+#include <ui/qt/models/timeline_delegate.h>
 #include "wireshark_application.h"
 
 #include <QCheckBox>
diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp
index e1c22a6eb0..b355090b03 100644
--- a/ui/qt/filter_expression_frame.cpp
+++ b/ui/qt/filter_expression_frame.cpp
@@ -26,7 +26,7 @@
 #include <epan/uat-int.h>
 #include <ui/preference_utils.h>
 
-#include <ui/qt/uat_model.h>
+#include <ui/qt/models/uat_model.h>
 
 #include <QPushButton>
 
diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp
index f2cc2e7530..be638fbd87 100644
--- a/ui/qt/interface_frame.cpp
+++ b/ui/qt/interface_frame.cpp
@@ -25,9 +25,9 @@
 
 #include "caputils/capture_ifinfo.h"
 #include "ui/qt/interface_frame.h"
-#include "ui/qt/interface_tree_model.h"
+#include <ui/qt/models/interface_tree_model.h>
 
-#include <ui/qt/sparkline_delegate.h>
+#include <ui/qt/models/sparkline_delegate.h>
 #include "wireshark_application.h"
 
 #ifdef HAVE_EXTCAP
diff --git a/ui/qt/interface_frame.h b/ui/qt/interface_frame.h
index 790bf2f794..d3b7c7c910 100644
--- a/ui/qt/interface_frame.h
+++ b/ui/qt/interface_frame.h
@@ -30,8 +30,8 @@
 
 #include "ui/qt/accordion_frame.h"
 
-#include "ui/qt/interface_tree_model.h"
-#include "ui/qt/interface_sort_filter_model.h"
+#include <ui/qt/models/interface_tree_model.h>
+#include <ui/qt/models/interface_sort_filter_model.h>
 
 #include <QFrame>
 #include <QHBoxLayout>
diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp
index f00f420470..40ceaf27f9 100644
--- a/ui/qt/lte_mac_statistics_dialog.cpp
+++ b/ui/qt/lte_mac_statistics_dialog.cpp
@@ -31,7 +31,7 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 
-#include <ui/qt/percent_bar_delegate.h>
+#include <ui/qt/models/percent_bar_delegate.h>
 #include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index c92d0a5b25..02a45e4713 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -28,8 +28,8 @@
 #include "capture_opts.h"
 #include "ui/capture_globals.h"
 #include "ui/qt/capture_interfaces_dialog.h"
-#include "ui/qt/interface_tree_cache_model.h"
-#include "ui/qt/interface_sort_filter_model.h"
+#include <ui/qt/models/interface_tree_cache_model.h>
+#include <ui/qt/models/interface_sort_filter_model.h>
 #ifdef HAVE_PCAP_REMOTE
 #include "ui/qt/remote_capture_dialog.h"
 #include "ui/qt/remote_settings_dialog.h"
@@ -49,7 +49,7 @@
 
 #include "ui/capture_ui_utils.h"
 
-#include <ui/qt/path_chooser_delegate.h>
+#include <ui/qt/models/path_chooser_delegate.h>
 
 #include <QCheckBox>
 #include <QFileDialog>
diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h
index 739795a962..2f95d27faa 100644
--- a/ui/qt/manage_interfaces_dialog.h
+++ b/ui/qt/manage_interfaces_dialog.h
@@ -27,8 +27,8 @@
 #include <glib.h>
 #include "capture_opts.h"
 
-#include "ui/qt/interface_tree_cache_model.h"
-#include "ui/qt/interface_sort_filter_model.h"
+#include <ui/qt/models/interface_tree_cache_model.h>
+#include <ui/qt/models/interface_sort_filter_model.h>
 
 #include "geometry_state_dialog.h"
 #include <QStyledItemDelegate>
diff --git a/ui/qt/cache_proxy_model.cpp b/ui/qt/models/cache_proxy_model.cpp
index 63b1aac70c..f98f59528b 100644
--- a/ui/qt/cache_proxy_model.cpp
+++ b/ui/qt/models/cache_proxy_model.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "cache_proxy_model.h"
+#include <ui/qt/models/cache_proxy_model.h>
 
 CacheProxyModel::CacheProxyModel(QObject *parent) : QIdentityProxyModel(parent)
 {
diff --git a/ui/qt/cache_proxy_model.h b/ui/qt/models/cache_proxy_model.h
index 9163a4695c..9163a4695c 100644
--- a/ui/qt/cache_proxy_model.h
+++ b/ui/qt/models/cache_proxy_model.h
diff --git a/ui/qt/interface_sort_filter_model.cpp b/ui/qt/models/interface_sort_filter_model.cpp
index 2a75e53590..ddaebb1c9c 100644
--- a/ui/qt/interface_sort_filter_model.cpp
+++ b/ui/qt/models/interface_sort_filter_model.cpp
@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ui/qt/interface_tree_model.h"
-#include "ui/qt/interface_tree_cache_model.h"
-#include "ui/qt/interface_sort_filter_model.h"
+#include <ui/qt/models/interface_tree_model.h>
+#include <ui/qt/models/interface_tree_cache_model.h>
+#include <ui/qt/models/interface_sort_filter_model.h>
 
 #include <glib.h>
 
diff --git a/ui/qt/interface_sort_filter_model.h b/ui/qt/models/interface_sort_filter_model.h
index 8d421563aa..5a6f35b97c 100644
--- a/ui/qt/interface_sort_filter_model.h
+++ b/ui/qt/models/interface_sort_filter_model.h
@@ -25,7 +25,7 @@
 
 #include <config.h>
 
-#include "ui/qt/interface_tree_model.h"
+#include <ui/qt/models/interface_tree_model.h>
 
 #include <glib.h>
 
diff --git a/ui/qt/interface_tree_cache_model.cpp b/ui/qt/models/interface_tree_cache_model.cpp
index 46e95bd525..0937dbcde6 100644
--- a/ui/qt/interface_tree_cache_model.cpp
+++ b/ui/qt/models/interface_tree_cache_model.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "ui/qt/interface_tree_cache_model.h"
+#include <ui/qt/models/interface_tree_cache_model.h>
 
 #include "glib.h"
 
@@ -35,6 +35,8 @@
 
 #include "wireshark_application.h"
 
+#include <QIdentityProxyModel>
+
 InterfaceTreeCacheModel::InterfaceTreeCacheModel(QObject *parent) :
     QIdentityProxyModel(parent)
 {
@@ -616,4 +618,3 @@ void InterfaceTreeCacheModel::deleteDevice(const QModelIndex &index)
  * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
-
diff --git a/ui/qt/interface_tree_cache_model.h b/ui/qt/models/interface_tree_cache_model.h
index b5bd1ba8e3..3898857463 100644
--- a/ui/qt/interface_tree_cache_model.h
+++ b/ui/qt/models/interface_tree_cache_model.h
@@ -23,7 +23,7 @@
 #ifndef INTERFACE_TREE_CACHE_MODEL_H_
 #define INTERFACE_TREE_CACHE_MODEL_H_
 
-#include "ui/qt/interface_tree_model.h"
+#include <ui/qt/models/interface_tree_model.h>
 
 #include <QMap>
 #include <QAbstractItemModel>
@@ -90,4 +90,3 @@ private:
  * ex: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
-
diff --git a/ui/qt/interface_tree_model.cpp b/ui/qt/models/interface_tree_model.cpp
index 8b23daead0..7acda1340e 100644
--- a/ui/qt/interface_tree_model.cpp
+++ b/ui/qt/models/interface_tree_model.cpp
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "interface_tree_model.h"
+#include <ui/qt/models/interface_tree_model.h>
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
@@ -39,7 +39,7 @@
 #include "wireshark_application.h"
 
 /* Needed for the meta type declaration of QList<int>* */
-#include <ui/qt/sparkline_delegate.h>
+#include <ui/qt/models/sparkline_delegate.h>
 
 #ifdef HAVE_EXTCAP
 #include "extcap.h"
diff --git a/ui/qt/interface_tree_model.h b/ui/qt/models/interface_tree_model.h
index a441b39e33..a441b39e33 100644
--- a/ui/qt/interface_tree_model.h
+++ b/ui/qt/models/interface_tree_model.h
diff --git a/ui/qt/numeric_value_chooser_delegate.cpp b/ui/qt/models/numeric_value_chooser_delegate.cpp
index 66098d62a3..cdcd41f359 100644
--- a/ui/qt/numeric_value_chooser_delegate.cpp
+++ b/ui/qt/models/numeric_value_chooser_delegate.cpp
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "ui/qt/numeric_value_chooser_delegate.h"
+#include <ui/qt/models/numeric_value_chooser_delegate.h>
 
 #include <QStyledItemDelegate>
 #include <QSpinBox>
diff --git a/ui/qt/numeric_value_chooser_delegate.h b/ui/qt/models/numeric_value_chooser_delegate.h
index 87a504ada1..87a504ada1 100644
--- a/ui/qt/numeric_value_chooser_delegate.h
+++ b/ui/qt/models/numeric_value_chooser_delegate.h
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/models/packet_list_model.cpp
index d2d5b2f15a..d2d5b2f15a 100644
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/models/packet_list_model.cpp
diff --git a/ui/qt/packet_list_model.h b/ui/qt/models/packet_list_model.h
index 3dadb55011..3dadb55011 100644
--- a/ui/qt/packet_list_model.h
+++ b/ui/qt/models/packet_list_model.h
diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/models/packet_list_record.cpp
index bf6f866702..bf6f866702 100644
--- a/ui/qt/packet_list_record.cpp
+++ b/ui/qt/models/packet_list_record.cpp
diff --git a/ui/qt/packet_list_record.h b/ui/qt/models/packet_list_record.h
index 80d9cf7efa..80d9cf7efa 100644
--- a/ui/qt/packet_list_record.h
+++ b/ui/qt/models/packet_list_record.h
diff --git a/ui/qt/path_chooser_delegate.cpp b/ui/qt/models/path_chooser_delegate.cpp
index 0fe2130ffd..8538c75ea9 100644
--- a/ui/qt/path_chooser_delegate.cpp
+++ b/ui/qt/models/path_chooser_delegate.cpp
@@ -25,7 +25,7 @@
 #include "epan/prefs.h"
 #include "ui/last_open_dir.h"
 
-#include "ui/qt/path_chooser_delegate.h"
+#include <ui/qt/models/path_chooser_delegate.h>
 
 #include <QHBoxLayout>
 #include <QPushButton>
diff --git a/ui/qt/path_chooser_delegate.h b/ui/qt/models/path_chooser_delegate.h
index 32ecd96eab..32ecd96eab 100644
--- a/ui/qt/path_chooser_delegate.h
+++ b/ui/qt/models/path_chooser_delegate.h
diff --git a/ui/qt/percent_bar_delegate.cpp b/ui/qt/models/percent_bar_delegate.cpp
index 5894060b9e..5158ac6ca0 100644
--- a/ui/qt/percent_bar_delegate.cpp
+++ b/ui/qt/models/percent_bar_delegate.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "percent_bar_delegate.h"
+#include <ui/qt/models/percent_bar_delegate.h>
 
 #include <ui/qt/utils/color_utils.h>
 
diff --git a/ui/qt/percent_bar_delegate.h b/ui/qt/models/percent_bar_delegate.h
index 2c8d47288f..2c8d47288f 100644
--- a/ui/qt/percent_bar_delegate.h
+++ b/ui/qt/models/percent_bar_delegate.h
diff --git a/ui/qt/related_packet_delegate.cpp b/ui/qt/models/related_packet_delegate.cpp
index 042fe10cb8..6d02224f70 100644
--- a/ui/qt/related_packet_delegate.cpp
+++ b/ui/qt/models/related_packet_delegate.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "related_packet_delegate.h"
+#include <ui/qt/models/related_packet_delegate.h>
 #include "packet_list_record.h"
 
 #include <ui/qt/utils/color_utils.h>
diff --git a/ui/qt/related_packet_delegate.h b/ui/qt/models/related_packet_delegate.h
index 152448dfe6..152448dfe6 100644
--- a/ui/qt/related_packet_delegate.h
+++ b/ui/qt/models/related_packet_delegate.h
diff --git a/ui/qt/sparkline_delegate.cpp b/ui/qt/models/sparkline_delegate.cpp
index b9935d94e8..2c3fc9c232 100644
--- a/ui/qt/sparkline_delegate.cpp
+++ b/ui/qt/models/sparkline_delegate.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "sparkline_delegate.h"
+#include <ui/qt/models/sparkline_delegate.h>
 
 #include <QPainter>
 #include <QApplication>
diff --git a/ui/qt/sparkline_delegate.h b/ui/qt/models/sparkline_delegate.h
index 62599abea6..62599abea6 100644
--- a/ui/qt/sparkline_delegate.h
+++ b/ui/qt/models/sparkline_delegate.h
diff --git a/ui/qt/timeline_delegate.cpp b/ui/qt/models/timeline_delegate.cpp
index 887eff5645..c9b0122b6a 100644
--- a/ui/qt/timeline_delegate.cpp
+++ b/ui/qt/models/timeline_delegate.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "timeline_delegate.h"
+#include <ui/qt/models/timeline_delegate.h>
 
 #include <ui/qt/utils/color_utils.h>
 
diff --git a/ui/qt/timeline_delegate.h b/ui/qt/models/timeline_delegate.h
index bc64c24877..bc64c24877 100644
--- a/ui/qt/timeline_delegate.h
+++ b/ui/qt/models/timeline_delegate.h
diff --git a/ui/qt/uat_delegate.cpp b/ui/qt/models/uat_delegate.cpp
index 3068e23cf1..ee149a2fc8 100644
--- a/ui/qt/uat_delegate.cpp
+++ b/ui/qt/models/uat_delegate.cpp
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "uat_delegate.h"
+#include <ui/qt/models/uat_delegate.h>
 #include "epan/value_string.h"
 #include <QComboBox>
 #include <QEvent>
diff --git a/ui/qt/uat_delegate.h b/ui/qt/models/uat_delegate.h
index 795161a686..795161a686 100644
--- a/ui/qt/uat_delegate.h
+++ b/ui/qt/models/uat_delegate.h
diff --git a/ui/qt/uat_model.cpp b/ui/qt/models/uat_model.cpp
index 5b0813f0a6..5b0813f0a6 100644
--- a/ui/qt/uat_model.cpp
+++ b/ui/qt/models/uat_model.cpp
diff --git a/ui/qt/uat_model.h b/ui/qt/models/uat_model.h
index c52646d7c3..c52646d7c3 100644
--- a/ui/qt/uat_model.h
+++ b/ui/qt/models/uat_model.h
diff --git a/ui/qt/voip_calls_info_model.cpp b/ui/qt/models/voip_calls_info_model.cpp
index dbb691fe8b..dbb691fe8b 100644
--- a/ui/qt/voip_calls_info_model.cpp
+++ b/ui/qt/models/voip_calls_info_model.cpp
diff --git a/ui/qt/voip_calls_info_model.h b/ui/qt/models/voip_calls_info_model.h
index 835d38e76a..835d38e76a 100644
--- a/ui/qt/voip_calls_info_model.h
+++ b/ui/qt/models/voip_calls_info_model.h
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index 8907dffb9f..2aa92d99c5 100644
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -23,11 +23,11 @@
 #define PACKET_LIST_H
 
 #include "byte_view_tab.h"
-#include "packet_list_model.h"
+#include <ui/qt/models/packet_list_model.h>
 #include "preferences_dialog.h"
 #include "proto_tree.h"
 #include "protocol_preferences_menu.h"
-#include <ui/qt/related_packet_delegate.h>
+#include <ui/qt/models/related_packet_delegate.h>
 
 #include <QMenu>
 #include <QTime>
diff --git a/ui/qt/protocol_hierarchy_dialog.h b/ui/qt/protocol_hierarchy_dialog.h
index 34d6304537..baf25156af 100644
--- a/ui/qt/protocol_hierarchy_dialog.h
+++ b/ui/qt/protocol_hierarchy_dialog.h
@@ -25,7 +25,7 @@
 #include <QMenu>
 
 #include "filter_action.h"
-#include <ui/qt/percent_bar_delegate.h>
+#include <ui/qt/models/percent_bar_delegate.h>
 #include "wireshark_dialog.h"
 
 class QPushButton;
diff --git a/ui/qt/uat_dialog.h b/ui/qt/uat_dialog.h
index 6f2fbfec67..b90c758066 100644
--- a/ui/qt/uat_dialog.h
+++ b/ui/qt/uat_dialog.h
@@ -27,8 +27,8 @@
 #include <glib.h>
 
 #include "geometry_state_dialog.h"
-#include "uat_model.h"
-#include <ui/qt/uat_delegate.h>
+#include <ui/qt/models/uat_model.h>
+#include <ui/qt/models/uat_delegate.h>
 
 class QComboBox;
 class QPushButton;
diff --git a/ui/qt/uat_frame.h b/ui/qt/uat_frame.h
index 2d056ef20b..31499245ba 100644
--- a/ui/qt/uat_frame.h
+++ b/ui/qt/uat_frame.h
@@ -25,8 +25,8 @@
 #include <QFrame>
 
 #include <ui/qt/geometry_state_dialog.h>
-#include <ui/qt/uat_model.h>
-#include <ui/qt/uat_delegate.h>
+#include <ui/qt/models/uat_model.h>
+#include <ui/qt/models/uat_delegate.h>
 
 namespace Ui {
 class UatFrame;
diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp
index ae57bcbb3e..ef7ce35760 100644
--- a/ui/qt/voip_calls_dialog.cpp
+++ b/ui/qt/voip_calls_dialog.cpp
@@ -34,7 +34,7 @@
 #include "sequence_dialog.h"
 #include <ui/qt/utils/stock_icon.h>
 #include "wireshark_application.h"
-#include "voip_calls_info_model.h"
+#include <ui/qt/models/voip_calls_info_model.h>
 
 #include <QClipboard>
 #include <QContextMenuEvent>
diff --git a/ui/qt/voip_calls_dialog.h b/ui/qt/voip_calls_dialog.h
index 15285f553c..486a0c4a1f 100644
--- a/ui/qt/voip_calls_dialog.h
+++ b/ui/qt/voip_calls_dialog.h
@@ -28,8 +28,8 @@
 
 #include "ui/voip_calls.h"
 
-#include "voip_calls_info_model.h"
-#include "cache_proxy_model.h"
+#include <ui/qt/models/voip_calls_info_model.h>
+#include <ui/qt/models/cache_proxy_model.h>
 #include "wireshark_dialog.h"
 
 #include <QMenu>
diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp
index 74834f3e25..e2f734617c 100644
--- a/ui/qt/wireless_timeline.cpp
+++ b/ui/qt/wireless_timeline.cpp
@@ -57,7 +57,7 @@
 #include <QToolTip>
 
 #include "packet_list.h"
-#include "packet_list_model.h"
+#include <ui/qt/models/packet_list_model.h>
 
 #include "ui/main_statusbar.h"
 
diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp
index 9ace1ee178..068142e05a 100644
--- a/ui/qt/wlan_statistics_dialog.cpp
+++ b/ui/qt/wlan_statistics_dialog.cpp
@@ -31,7 +31,7 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 
-#include <ui/qt/percent_bar_delegate.h>
+#include <ui/qt/models/percent_bar_delegate.h>
 #include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"