diff --git a/cockatrice/src/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_connect.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
diff --git a/cockatrice/src/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_connect.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_connect.h
diff --git a/cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
diff --git a/cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
diff --git a/cockatrice/src/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_create_game.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
diff --git a/cockatrice/src/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_create_game.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
diff --git a/cockatrice/src/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_default_tags_editor.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
diff --git a/cockatrice/src/dialogs/dlg_default_tags_editor.h b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_default_tags_editor.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_avatar.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_avatar.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
diff --git a/cockatrice/src/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_password.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
diff --git a/cockatrice/src/dialogs/dlg_edit_password.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_password.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_tokens.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_tokens.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
diff --git a/cockatrice/src/dialogs/dlg_edit_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_user.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
diff --git a/cockatrice/src/dialogs/dlg_edit_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_edit_user.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
diff --git a/cockatrice/src/dialogs/dlg_filter_games.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_filter_games.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
diff --git a/cockatrice/src/dialogs/dlg_filter_games.h b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_filter_games.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
diff --git a/cockatrice/src/dialogs/dlg_forgot_password_challenge.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_forgot_password_challenge.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_forgot_password_request.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
diff --git a/cockatrice/src/dialogs/dlg_forgot_password_request.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_forgot_password_request.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
diff --git a/cockatrice/src/dialogs/dlg_forgot_password_reset.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_forgot_password_reset.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
diff --git a/cockatrice/src/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_deck.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
diff --git a/cockatrice/src/dialogs/dlg_load_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_deck.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_deck_from_website.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
diff --git a/cockatrice/src/dialogs/dlg_load_deck_from_website.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_deck_from_website.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
diff --git a/cockatrice/src/dialogs/dlg_load_remote_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_remote_deck.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
diff --git a/cockatrice/src/dialogs/dlg_load_remote_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_load_remote_deck.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_manage_sets.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
diff --git a/cockatrice/src/dialogs/dlg_manage_sets.h b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_manage_sets.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
diff --git a/cockatrice/src/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_register.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
diff --git a/cockatrice/src/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_register.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_register.h
diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_select_set_for_cards.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_settings.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
diff --git a/cockatrice/src/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_settings.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_settings.h
diff --git a/cockatrice/src/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_startup_card_check.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
diff --git a/cockatrice/src/dialogs/dlg_startup_card_check.h b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_startup_card_check.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_tip_of_the_day.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
diff --git a/cockatrice/src/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_update.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
diff --git a/cockatrice/src/dialogs/dlg_update.h b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_update.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_update.h
diff --git a/cockatrice/src/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
similarity index 100%
rename from cockatrice/src/dialogs/dlg_view_log.cpp
rename to cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
diff --git a/cockatrice/src/dialogs/dlg_view_log.h b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
similarity index 100%
rename from cockatrice/src/dialogs/dlg_view_log.h
rename to cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
diff --git a/cockatrice/src/dialogs/tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
similarity index 100%
rename from cockatrice/src/dialogs/tip_of_the_day.cpp
rename to cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
diff --git a/cockatrice/src/dialogs/tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
similarity index 100%
rename from cockatrice/src/dialogs/tip_of_the_day.h
rename to cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h