diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
similarity index 100%
rename from cockatrice/src/tabs/abstract_tab_deck_editor.cpp
rename to cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
similarity index 100%
rename from cockatrice/src/tabs/abstract_tab_deck_editor.h
rename to cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/tab_edhrec.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
diff --git a/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
similarity index 100%
rename from cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h
rename to cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
diff --git a/cockatrice/src/tabs/tab.cpp b/cockatrice/src/interface/widgets/tabs/tab.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab.cpp
rename to cockatrice/src/interface/widgets/tabs/tab.cpp
diff --git a/cockatrice/src/tabs/tab.h b/cockatrice/src/interface/widgets/tabs/tab.h
similarity index 100%
rename from cockatrice/src/tabs/tab.h
rename to cockatrice/src/interface/widgets/tabs/tab.h
diff --git a/cockatrice/src/tabs/tab_account.cpp b/cockatrice/src/interface/widgets/tabs/tab_account.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_account.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_account.cpp
diff --git a/cockatrice/src/tabs/tab_account.h b/cockatrice/src/interface/widgets/tabs/tab_account.h
similarity index 100%
rename from cockatrice/src/tabs/tab_account.h
rename to cockatrice/src/interface/widgets/tabs/tab_account.h
diff --git a/cockatrice/src/tabs/tab_admin.cpp b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_admin.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_admin.cpp
diff --git a/cockatrice/src/tabs/tab_admin.h b/cockatrice/src/interface/widgets/tabs/tab_admin.h
similarity index 100%
rename from cockatrice/src/tabs/tab_admin.h
rename to cockatrice/src/interface/widgets/tabs/tab_admin.h
diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_deck_editor.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
diff --git a/cockatrice/src/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
similarity index 100%
rename from cockatrice/src/tabs/tab_deck_editor.h
rename to cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
diff --git a/cockatrice/src/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_deck_storage.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
diff --git a/cockatrice/src/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
similarity index 100%
rename from cockatrice/src/tabs/tab_deck_storage.h
rename to cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
diff --git a/cockatrice/src/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_game.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_game.cpp
diff --git a/cockatrice/src/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h
similarity index 100%
rename from cockatrice/src/tabs/tab_game.h
rename to cockatrice/src/interface/widgets/tabs/tab_game.h
diff --git a/cockatrice/src/tabs/tab_home.cpp b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_home.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_home.cpp
diff --git a/cockatrice/src/tabs/tab_home.h b/cockatrice/src/interface/widgets/tabs/tab_home.h
similarity index 100%
rename from cockatrice/src/tabs/tab_home.h
rename to cockatrice/src/interface/widgets/tabs/tab_home.h
diff --git a/cockatrice/src/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_logs.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_logs.cpp
diff --git a/cockatrice/src/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h
similarity index 100%
rename from cockatrice/src/tabs/tab_logs.h
rename to cockatrice/src/interface/widgets/tabs/tab_logs.h
diff --git a/cockatrice/src/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_message.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_message.cpp
diff --git a/cockatrice/src/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h
similarity index 100%
rename from cockatrice/src/tabs/tab_message.h
rename to cockatrice/src/interface/widgets/tabs/tab_message.h
diff --git a/cockatrice/src/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_replays.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_replays.cpp
diff --git a/cockatrice/src/tabs/tab_replays.h b/cockatrice/src/interface/widgets/tabs/tab_replays.h
similarity index 100%
rename from cockatrice/src/tabs/tab_replays.h
rename to cockatrice/src/interface/widgets/tabs/tab_replays.h
diff --git a/cockatrice/src/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_room.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_room.cpp
diff --git a/cockatrice/src/tabs/tab_room.h b/cockatrice/src/interface/widgets/tabs/tab_room.h
similarity index 100%
rename from cockatrice/src/tabs/tab_room.h
rename to cockatrice/src/interface/widgets/tabs/tab_room.h
diff --git a/cockatrice/src/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_server.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_server.cpp
diff --git a/cockatrice/src/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h
similarity index 100%
rename from cockatrice/src/tabs/tab_server.h
rename to cockatrice/src/interface/widgets/tabs/tab_server.h
diff --git a/cockatrice/src/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_supervisor.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
diff --git a/cockatrice/src/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
similarity index 100%
rename from cockatrice/src/tabs/tab_supervisor.h
rename to cockatrice/src/interface/widgets/tabs/tab_supervisor.h
diff --git a/cockatrice/src/tabs/tab_visual_database_display.cpp b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
similarity index 100%
rename from cockatrice/src/tabs/tab_visual_database_display.cpp
rename to cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
diff --git a/cockatrice/src/tabs/tab_visual_database_display.h b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
similarity index 100%
rename from cockatrice/src/tabs/tab_visual_database_display.h
rename to cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
similarity index 100%
rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
similarity index 100%
rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h
rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
similarity index 100%
rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
similarity index 100%
rename from cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
rename to cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
diff --git a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
similarity index 100%
rename from cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
rename to cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
diff --git a/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
similarity index 100%
rename from cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h
rename to cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h