refactor: group gui-related packages

This is just a first step...
Probably there are many other classes that should be either completely
added here, or decomposed and partially added here.

forge-gui-desktop/src/main/java/forge/GuiDesktop.java

@@ -2,17 +2,18 @@ package forge;
 
 import com.google.common.base.Function;
 
-import forge.download.GuiDownloadService;
 import forge.download.GuiDownloader;
 import forge.error.BugReportDialog;
 import forge.gamemodes.match.HostedMatch;
 import forge.gui.BoxedProductCardListViewer;
 import forge.gui.CardListChooser;
 import forge.gui.CardListViewer;
+import forge.gui.FThreads;
 import forge.gui.GuiChoose;
+import forge.gui.download.GuiDownloadService;
 import forge.gui.framework.FScreen;
-import forge.interfaces.IGuiBase;
+import forge.gui.interfaces.IGuiBase;
-import forge.interfaces.IGuiGame;
+import forge.gui.interfaces.IGuiGame;
 import forge.item.PaperCard;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.assets.ISkinImage;

forge-gui-desktop/src/main/java/forge/ImageCache.java

@@ -24,6 +24,7 @@ import com.mortennobel.imagescaling.ResampleOp;
 
 import forge.game.card.CardView;
 import forge.game.player.PlayerView;
+import forge.gui.FThreads;
 import forge.item.InventoryItem;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;

forge-gui-desktop/src/main/java/forge/ImageLoader.java

@@ -2,7 +2,7 @@ package forge;
 
 import com.google.common.cache.CacheLoader;
 
-import forge.error.BugReporter;
+import forge.gui.error.BugReporter;
 import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
 

forge-gui-desktop/src/main/java/forge/Singletons.java

@@ -18,6 +18,7 @@
 package forge;
 
 import forge.control.FControl;
+import forge.gui.FThreads;
 import forge.model.FModel;
 import forge.view.FView;
 

forge-gui-desktop/src/main/java/forge/control/FControl.java

@@ -40,19 +40,20 @@ import javax.swing.WindowConstants;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-import forge.GuiBase;
 import forge.ImageCache;
 import forge.LobbyPlayer;
 import forge.Singletons;
 import forge.gamemodes.match.HostedMatch;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
 import forge.gamemodes.quest.io.QuestDataIO;
+import forge.gui.GuiBase;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.InvalidLayoutFileException;
 import forge.gui.framework.SLayoutIO;
 import forge.gui.framework.SOverflowUtil;
 import forge.gui.framework.SResizingUtil;
+import forge.gui.util.SOptionPane;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
@@ -65,7 +66,6 @@ import forge.toolbox.FOptionPane;
 import forge.toolbox.FSkin;
 import forge.util.Localizer;
 import forge.util.RestartUtil;
-import forge.util.gui.SOptionPane;
 import forge.view.FFrame;
 import forge.view.FView;
 

forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java

@@ -19,14 +19,14 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableList;
 
-import forge.FThreads;
-import forge.UiCommand;
 import forge.game.GameType;
 import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestEvent;
 import forge.gamemodes.quest.QuestEventChallenge;
 import forge.gamemodes.quest.QuestUtil;
+import forge.gui.FThreads;
+import forge.gui.UiCommand;
 import forge.itemmanager.DeckManager;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.ItemManagerContainer;

forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java

@@ -25,8 +25,9 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import net.miginfocom.swing.MigLayout;
-import forge.UiCommand;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
+import forge.gui.download.GuiDownloadService;
 import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;

forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java

@@ -40,6 +40,7 @@ import javax.swing.KeyStroke;
 import forge.model.FModel;
 import net.miginfocom.swing.MigLayout;
 import forge.gui.WrapLayout;
+import forge.gui.error.BugReporter;
 import forge.localinstance.properties.ForgePreferences;
 
 /**

forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java

@@ -30,8 +30,6 @@ import javax.swing.border.EmptyBorder;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.card.CardDetailUtil;
-import forge.card.CardDetailUtil.DetailColors;
 import forge.card.CardEdition;
 import forge.card.CardRarity;
 import forge.game.GameView;
@@ -39,6 +37,8 @@ import forge.game.card.Card;
 import forge.game.card.CardView;
 import forge.game.card.CardView.CardStateView;
 import forge.game.zone.ZoneType;
+import forge.gui.card.CardDetailUtil;
+import forge.gui.card.CardDetailUtil.DetailColors;
 import forge.item.IPaperCard;
 import forge.item.InventoryItemFromSet;
 import forge.model.FModel;

forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java

@@ -17,7 +17,6 @@
  */
 package forge.gui;
 
-import forge.GuiBase;
 import forge.ImageCache;
 import forge.ImageKeys;
 import forge.game.card.CardView.CardStateView;

forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java

@@ -19,7 +19,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Function;
 
-import forge.FThreads;
 import forge.card.ICardFace;
 import forge.game.card.Card;
 import forge.game.card.CardView;

forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java

@@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableList;
 
-import forge.FThreads;
 import forge.game.card.CardView;
 import forge.screens.match.CMatchUI;
 import forge.toolbox.FOptionPane;

forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java

@@ -58,9 +58,8 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.collect.ImmutableList;
 
-import forge.UiCommand;
-import forge.error.BugReporter;
 import forge.gui.ImportSourceAnalyzer.OpType;
+import forge.gui.error.BugReporter;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.toolbox.FButton;

forge-gui-desktop/src/main/java/forge/gui/ListChooser.java

@@ -40,7 +40,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-import forge.FThreads;
 import forge.toolbox.FList;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FOptionPane;

forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java

@@ -17,7 +17,7 @@ import java.util.TimerTask;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
-import forge.FThreads;
+import forge.gui.FThreads;
 import forge.view.FFrame;
 
 /**

forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java

@@ -26,9 +26,10 @@ import javax.xml.stream.events.Attribute;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 
-import forge.FThreads;
 import forge.Singletons;
+import forge.gui.FThreads;
 import forge.gui.SOverlayUtils;
+import forge.gui.util.SOptionPane;
 import forge.localinstance.properties.FileLocation;
 import forge.localinstance.properties.ForgeConstants;
 import forge.toolbox.FAbsolutePositioner;
@@ -36,7 +37,6 @@ import forge.toolbox.SaveOpenDialog;
 import forge.toolbox.SaveOpenDialog.Filetypes;
 import forge.util.CollectionSuppliers;
 import forge.util.ThreadUtil;
-import forge.util.gui.SOptionPane;
 import forge.util.maps.HashMapOfLists;
 import forge.util.maps.MapOfLists;
 import forge.view.FFrame;

forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java

@@ -19,7 +19,6 @@ import forge.util.Localizer;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.deck.DeckBase;
 import forge.deck.DeckProxy;
 import forge.deck.io.DeckPreferences;
@@ -28,6 +27,7 @@ import forge.game.GameType;
 import forge.game.IHasGameType;
 import forge.gamemodes.quest.QuestWorld;
 import forge.gui.GuiUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.item.InventoryItem;
 import forge.itemmanager.filters.AdvancedSearchFilter;
@@ -121,7 +121,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
     /**
      * Sets the delete command.
      *
-     * @param c0 &emsp; {@link forge.UiCommand} command executed on delete.
+     * @param c0 &emsp; {@link forge.forge.gui.UiCommand} command executed on delete.
      */
     public void setDeleteCommand(final UiCommand c0) {
         this.cmdDelete = c0;
@@ -130,7 +130,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
     /**
      * Sets the select command.
      *
-     * @param c0 &emsp; {@link forge.UiCommand} command executed on row select.
+     * @param c0 &emsp; {@link forge.forge.gui.UiCommand} command executed on row select.
      */
     public void setSelectCommand(final UiCommand c0) {
         this.cmdSelect = c0;

forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java

@@ -42,8 +42,8 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
-import forge.UiCommand;
 import forge.gui.GuiUtils;
+import forge.gui.UiCommand;
 import forge.item.InventoryItem;
 import forge.itemmanager.filters.ItemFilter;
 import forge.itemmanager.views.ImageView;

forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java

@@ -6,9 +6,9 @@ import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.MouseEvent;
 
-import forge.UiCommand;
 import forge.gui.GuiUtils;
-import forge.interfaces.IButton;
+import forge.gui.UiCommand;
+import forge.gui.interfaces.IButton;
 import forge.item.InventoryItem;
 import forge.itemmanager.AdvancedSearch;
 import forge.itemmanager.ItemManager;

forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java

@@ -2,7 +2,7 @@ package forge.itemmanager.filters;
 
 import com.google.common.base.Predicate;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
 import forge.itemmanager.ItemManager;

forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java

@@ -2,7 +2,7 @@ package forge.itemmanager.filters;
 
 import com.google.common.base.Predicates;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.item.InventoryItem;
 import forge.item.ItemPredicate;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java

@@ -7,7 +7,7 @@ import java.util.List;
 import javax.swing.Icon;
 import javax.swing.JPanel;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.item.InventoryItem;
 import forge.itemmanager.ItemManager;
 import forge.toolbox.FLabel;

forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java

@@ -1,7 +1,8 @@
 package forge.itemmanager.filters;
 
 import com.google.common.base.Predicate;
-import forge.UiCommand;
+
+import forge.gui.UiCommand;
 import forge.item.InventoryItem;
 import forge.item.PaperToken;
 import forge.itemmanager.ItemManager;

forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java

@@ -17,7 +17,7 @@
  */
 package forge.itemmanager.views;
 
-import forge.card.CardPreferences;
+import forge.gui.card.CardPreferences;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
 import forge.localinstance.assets.FSkinProp;

forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java

@@ -1,8 +1,8 @@
 package forge.screens.bazaar;
 
-import forge.GuiBase;
-import forge.UiCommand;
 import forge.gamemodes.quest.bazaar.QuestBazaarManager;
+import forge.gui.GuiBase;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.IVTopLevelUI;
 import forge.localinstance.assets.FSkinProp;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java

@@ -35,7 +35,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import forge.ImageCache;
 import forge.StaticData;
-import forge.UiCommand;
 import forge.card.CardEdition;
 import forge.card.CardRules;
 import forge.card.mana.ManaCostShard;
@@ -43,6 +42,7 @@ import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckProxy;
 import forge.deck.DeckgenUtil;
+import forge.gui.UiCommand;
 import forge.item.PaperCard;
 import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java

@@ -27,10 +27,10 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.deck.DeckBase;
 import forge.deck.DeckProxy;
 import forge.deck.io.DeckPreferences;
+import forge.gui.UiCommand;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java

@@ -19,11 +19,12 @@ package forge.screens.deckeditor.controllers;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-import forge.UiCommand;
+
 import forge.deck.*;
 import forge.game.GameType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.*;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java

@@ -11,11 +11,11 @@ import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
 import forge.localinstance.properties.ForgeConstants;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java

@@ -5,7 +5,6 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.card.CardDb;
 import forge.card.CardRulesPredicates;
 import forge.card.MagicColor;
@@ -17,6 +16,7 @@ import forge.deck.generation.DeckGenerator3Color;
 import forge.deck.generation.DeckGenerator5Color;
 import forge.deck.generation.DeckGeneratorBase;
 import forge.deck.generation.DeckGeneratorMonoColor;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java

@@ -20,7 +20,7 @@ package forge.screens.deckeditor.controllers;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
-import forge.UiCommand;
+
 import forge.card.CardDb;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
@@ -28,6 +28,7 @@ import forge.deck.Deck;
 import forge.deck.DeckSection;
 import forge.game.GameFormat;
 import forge.game.GameType;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java

@@ -20,13 +20,14 @@ package forge.screens.deckeditor.controllers;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
-import forge.UiCommand;
+
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
 import forge.game.GameType;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.item.PaperCard;
 import forge.itemmanager.CardManager;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java

@@ -18,13 +18,14 @@
 package forge.screens.deckeditor.controllers;
 
 import com.google.common.base.Supplier;
-import forge.UiCommand;
+
 import forge.card.CardEdition;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.deck.DeckSection;
 import forge.game.GameType;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java

@@ -21,7 +21,7 @@ import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
-import forge.UiCommand;
+
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
 import forge.card.ColorSet;
@@ -33,6 +33,7 @@ import forge.game.GameType;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.data.DeckConstructionRules;
 import forge.gui.GuiUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.item.InventoryItem;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java

@@ -17,12 +17,12 @@
  */
 package forge.screens.deckeditor.controllers;
 
-import forge.UiCommand;
 import forge.deck.DeckBase;
 import forge.game.GameType;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestSpellShop;
 import forge.gamemodes.quest.QuestUtil;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.item.*;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java

@@ -19,13 +19,14 @@ package forge.screens.deckeditor.controllers;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
-import forge.UiCommand;
+
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.deck.DeckSection;
 import forge.game.GameType;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestEventDraft;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.item.InventoryItem;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java

@@ -20,10 +20,11 @@ package forge.screens.deckeditor.controllers;
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.collect.Iterables;
-import forge.UiCommand;
+
 import forge.deck.Deck;
 import forge.deck.DeckSection;
 import forge.game.GameType;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java

@@ -18,7 +18,6 @@
 package forge.screens.deckeditor.controllers;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.card.MagicColor;
 import forge.deck.CardPool;
 import forge.deck.Deck;
@@ -28,6 +27,7 @@ import forge.game.GameType;
 import forge.gamemodes.limited.BoosterDraft;
 import forge.gamemodes.limited.IBoosterDraft;
 import forge.gamemodes.limited.WinstonDraft;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.FScreen;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java

@@ -7,8 +7,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import forge.UiCommand;
 import forge.deck.DeckBase;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java

@@ -23,13 +23,14 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.ai.AIOption;
 import forge.deck.DeckSection;
 import forge.game.GameType;
 import forge.gamemodes.match.LobbySlot;
 import forge.gamemodes.match.LobbySlotType;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
+import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences;
@@ -51,7 +52,6 @@ import forge.toolbox.FSkin.SkinImage;
 import forge.toolbox.FTextField;
 import forge.util.MyRandom;
 import forge.util.NameGenerator;
-import forge.util.gui.SOptionPane;
 import forge.util.Localizer;
 
 @SuppressWarnings("serial")

forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java

@@ -285,7 +285,7 @@ public enum VHomeUI implements IVTopLevelUI {
     }
 
     /* (non-Javadoc)
-     * @see forge.gui.framework.IVTopLevelUI#onClosing(forge.control.FControl.Screens)
+     * @see forge.gui.framework.IVTopLevelUI#onClosing(forge.gui.control.FControl.Screens)
      */
     @Override
     public boolean onClosing(FScreen screen) {

forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java

@@ -3,8 +3,7 @@ package forge.screens.home;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import forge.GuiBase;
+
-import forge.UiCommand;
 import forge.ai.AIOption;
 import forge.deck.*;
 import forge.deckchooser.FDeckChooser;
@@ -15,7 +14,10 @@ import forge.gamemodes.match.LobbySlot;
 import forge.gamemodes.match.LobbySlotType;
 import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
 import forge.gui.CardDetailPanel;
-import forge.interfaces.ILobbyView;
+import forge.gui.GuiBase;
+import forge.gui.UiCommand;
+import forge.gui.interfaces.ILobbyView;
+import forge.gui.util.SOptionPane;
 import forge.interfaces.IPlayerChangeListener;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgePreferences;
@@ -27,7 +29,6 @@ import forge.util.Aggregates;
 import forge.util.Lang;
 import forge.util.Localizer;
 import forge.util.NameGenerator;
-import forge.util.gui.SOptionPane;
 import net.miginfocom.swing.MigLayout;
 
 import javax.swing.*;

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java

@@ -11,10 +11,10 @@ import javax.swing.filechooser.FileFilter;
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.gamemodes.gauntlet.GauntletData;
 import forge.gamemodes.gauntlet.GauntletIO;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.localinstance.properties.ForgeConstants;
 import forge.toolbox.FOptionPane;

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java

@@ -9,7 +9,6 @@ import java.util.List;
 import javax.swing.JButton;
 import javax.swing.SwingUtilities;
 
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.deck.DeckType;
 import forge.deckchooser.FDeckChooser;
@@ -17,6 +16,7 @@ import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.gauntlet.GauntletData;
 import forge.gamemodes.gauntlet.GauntletIO;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.model.FModel;
 import forge.player.GamePlayerUtil;

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java

@@ -12,9 +12,9 @@ import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 
 import net.miginfocom.swing.MigLayout;
-import forge.UiCommand;
 import forge.gamemodes.gauntlet.GauntletData;
 import forge.gamemodes.gauntlet.GauntletIO;
+import forge.gui.UiCommand;
 import forge.toolbox.FLabel;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinnedPanel;
@@ -182,7 +182,7 @@ public class ContestGauntletLister extends JPanel {
         return true;
     }
 
-    /** @param c0   {@link forge.UiCommand} command executed on row select. */
+    /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row select. */
     public void setSelectCommand(final UiCommand c0) {
         this.cmdRowSelect = c0;
     }

forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java

@@ -13,10 +13,10 @@ import javax.swing.SwingConstants;
 import javax.swing.border.Border;
 
 import net.miginfocom.swing.MigLayout;
-import forge.UiCommand;
 import forge.gamemodes.gauntlet.GauntletData;
 import forge.gamemodes.gauntlet.GauntletIO;
 import forge.gamemodes.quest.QuestUtil;
+import forge.gui.UiCommand;
 import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FLabel;
 import forge.toolbox.FMouseAdapter;
@@ -281,17 +281,17 @@ public class QuickGauntletLister extends JPanel {
         return true;
     }
 
-    /** @param c0   {@link forge.UiCommand} command executed on row select. */
+    /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row select. */
     public void setCmdSelect(final UiCommand c0) {
         this.cmdRowSelect = c0;
     }
 
-    /** @param c0   {@link forge.UiCommand} command executed on row delete. */
+    /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row delete. */
     public void setCmdDelete(final UiCommand c0) {
         this.cmdRowDelete = c0;
     }
 
-    /** @param c0   {@link forge.UiCommand} command executed on row activate. */
+    /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row activate. */
     public void setCmdActivate(final UiCommand c0) {
         this.cmdRowActivate = c0;
     }

forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java

@@ -7,21 +7,21 @@ import java.util.List;
 import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
 
-import forge.FThreads;
-import forge.error.BugReporter;
 import forge.gamemodes.net.ChatMessage;
 import forge.gamemodes.net.NetConnectUtil;
 import forge.gui.FNetOverlay;
+import forge.gui.FThreads;
 import forge.gui.SOverlayUtils;
+import forge.gui.error.BugReporter;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
+import forge.gui.util.SOptionPane;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.screens.home.CHomeUI;
 import forge.screens.home.CLobby;
 import forge.screens.home.VLobby;
 import forge.screens.home.sanctioned.ConstructedGameMenu;
-import forge.util.gui.SOptionPane;
 import forge.util.Localizer;
 
 public enum CSubmenuOnlineLobby implements ICDoc, IMenuProvider {

forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java

@@ -20,10 +20,10 @@ import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.IVTopLevelUI;
-import forge.interfaces.ILobbyView;
+import forge.gui.interfaces.ILobbyView;
+import forge.gui.util.SOptionPane;
 import forge.toolbox.FButton;
 import forge.toolbox.FSkin;
-import forge.util.gui.SOptionPane;
 import forge.util.Localizer;
 
 public enum VSubmenuOnlineLobby implements IVSubmenu<CSubmenuOnlineLobby>, IOnlineLobby, IVTopLevelUI {

forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java

@@ -1,20 +1,21 @@
 package forge.screens.home.puzzle;
 
 import com.google.common.collect.Maps;
-import forge.GuiBase;
+
 import forge.deck.Deck;
 import forge.game.GameRules;
 import forge.game.GameType;
 import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.match.HostedMatch;
 import forge.gamemodes.puzzle.Puzzle;
+import forge.gui.GuiBase;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.ICDoc;
+import forge.gui.util.SGuiChoose;
+import forge.gui.util.SOptionPane;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.player.GamePlayerUtil;
-import forge.util.gui.SGuiChoose;
-import forge.util.gui.SOptionPane;
 import forge.util.Localizer;
 
 import javax.swing.*;

forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java

@@ -1,7 +1,5 @@
 package forge.screens.home.puzzle;
 
-import forge.GuiBase;
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.game.GameRules;
 import forge.game.GameType;
@@ -9,15 +7,17 @@ import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.match.HostedMatch;
 import forge.gamemodes.puzzle.Puzzle;
 import forge.gamemodes.puzzle.PuzzleIO;
+import forge.gui.GuiBase;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
+import forge.gui.util.SOptionPane;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;
-import forge.util.gui.SOptionPane;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuTutorial.java

@@ -1,7 +1,5 @@
 package forge.screens.home.puzzle;
 
-import forge.GuiBase;
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.game.GameRules;
 import forge.game.GameType;
@@ -9,15 +7,17 @@ import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.match.HostedMatch;
 import forge.gamemodes.puzzle.Puzzle;
 import forge.gamemodes.puzzle.PuzzleIO;
+import forge.gui.GuiBase;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
+import forge.gui.util.SOptionPane;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.player.GamePlayerUtil;
 import forge.util.Localizer;
-import forge.util.gui.SOptionPane;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java

@@ -16,12 +16,12 @@ import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestEventChallenge;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gamemodes.quest.bazaar.QuestItemType;
 import forge.gamemodes.quest.bazaar.QuestPetController;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.model.FModel;
 import forge.toolbox.FLabel;
@@ -43,7 +43,7 @@ public enum CSubmenuChallenges implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#initialize()
+     * @see forge.gui.control.home.IControlSubmenu#initialize()
      */
     @SuppressWarnings("serial")
     @Override
@@ -136,7 +136,7 @@ public enum CSubmenuChallenges implements ICDoc {
     };
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuDuels.java

@@ -1,10 +1,10 @@
 package forge.screens.home.quest;
 
-import forge.UiCommand;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestEventDuel;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gamemodes.quest.bazaar.QuestPetController;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.model.FModel;
 import forge.toolbox.JXButtonPanel;
@@ -28,7 +28,7 @@ public enum CSubmenuDuels implements ICDoc {
 	}
 
 	/* (non-Javadoc)
-	 * @see forge.control.home.IControlSubmenu#initialize()
+	 * @see forge.gui.control.home.IControlSubmenu#initialize()
 	 */
 	@SuppressWarnings("serial")
 	@Override
@@ -160,7 +160,7 @@ public enum CSubmenuDuels implements ICDoc {
 	};
 
 	/* (non-Javadoc)
-	 * @see forge.control.home.IControlSubmenu#update()
+	 * @see forge.gui.control.home.IControlSubmenu#update()
 	 */
 	@Override
 	public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDecks.java

@@ -3,11 +3,11 @@ package forge.screens.home.quest;
 import javax.swing.SwingUtilities;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.deck.DeckProxy;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
 import forge.itemmanager.ItemManagerConfig;
@@ -52,7 +52,7 @@ public enum CSubmenuQuestDecks implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -71,7 +71,7 @@ public enum CSubmenuQuestDecks implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java

@@ -1,8 +1,8 @@
 package forge.screens.home.quest;
 
-import forge.UiCommand;
 import forge.deck.DeckGroup;
 import forge.gamemodes.quest.QuestTournamentController;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 
 import java.awt.event.*;

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestLoadData.java

@@ -1,10 +1,10 @@
 package forge.screens.home.quest;
 
-import forge.UiCommand;
 import forge.gamemodes.quest.QuestController;
 import forge.gamemodes.quest.data.QuestData;
 import forge.gamemodes.quest.data.QuestPreferences.QPref;
 import forge.gamemodes.quest.io.QuestDataIO;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
@@ -45,14 +45,14 @@ public enum CSubmenuQuestLoadData implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestPrefs.java

@@ -25,14 +25,14 @@ public enum CSubmenuQuestPrefs implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestStart.java

@@ -1,6 +1,5 @@
 package forge.screens.home.quest;
 
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
 import forge.game.GameFormat;
@@ -9,6 +8,7 @@ import forge.gamemodes.quest.data.DeckConstructionRules;
 import forge.gamemodes.quest.data.GameFormatQuest;
 import forge.gamemodes.quest.data.QuestData;
 import forge.gamemodes.quest.data.QuestPreferences;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.item.PaperCard;
 import forge.model.FModel;
@@ -44,7 +44,7 @@ public enum CSubmenuQuestStart implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -143,7 +143,7 @@ public enum CSubmenuQuestStart implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java

@@ -1,9 +1,9 @@
 package forge.screens.home.quest;
 
-import forge.UiCommand;
 import forge.card.MagicColor;
 import forge.gamemodes.quest.StartingPoolPreferences.PoolType;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.*;
 import forge.util.Localizer;

forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java

@@ -1,8 +1,8 @@
 package forge.screens.home.quest;
 
-import forge.UiCommand;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gamemodes.quest.data.QuestData;
+import forge.gui.UiCommand;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.FModel;
@@ -312,17 +312,17 @@ public class QuestFileLister extends JPanel {
         return false;
     }
 
-    /** @param c0   {@link forge.UiCommand} command executed on row select. */
+    /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row select. */
     public void setSelectCommand(UiCommand c0) {
         this.cmdRowSelect = c0;
     }
 
-    /** @param c0   {@link forge.UiCommand} command executed on row edit. */
+    /** @param c0   {@link forge.forge.gui.UiCommand} command executed on row edit. */
     public void setEditCommand(UiCommand c0) {
         this.cmdRowEdit = c0;
     }
 
-    /** @param c0   {@link forge.UiCommand} command executed on delete. */
+    /** @param c0   {@link forge.forge.gui.UiCommand} command executed on delete. */
     public void setDeleteCommand(UiCommand c0) {
         this.cmdRowDelete = c0;
     }

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuDuels.java

@@ -4,7 +4,7 @@ import forge.gamemodes.quest.IVQuestStats;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
-import forge.interfaces.IButton;
+import forge.gui.interfaces.IButton;
 import forge.localinstance.assets.FSkinProp;
 import forge.screens.home.*;
 import forge.toolbox.*;

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java

@@ -1,6 +1,5 @@
 package forge.screens.home.quest;
 
-import forge.GuiBase;
 import forge.Singletons;
 import forge.game.GameType;
 import forge.gamemodes.limited.BoosterDraft;
@@ -8,6 +7,7 @@ import forge.gamemodes.quest.IQuestTournamentView;
 import forge.gamemodes.quest.QuestEventDraft;
 import forge.gamemodes.quest.QuestDraftUtils.Mode;
 import forge.gamemodes.quest.data.QuestEventDraftContainer;
+import forge.gui.GuiBase;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;

forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java

@@ -1,10 +1,10 @@
 package forge.screens.home.quest;
 
-import forge.GuiBase;
-import forge.UiCommand;
 import forge.gamemodes.quest.QuestUtil;
 import forge.gamemodes.quest.bazaar.IQuestBazaarItem;
 import forge.gamemodes.quest.data.QuestAssets;
+import forge.gui.GuiBase;
+import forge.gui.UiCommand;
 import forge.localinstance.assets.FSkinProp;
 import forge.model.FModel;
 import forge.screens.bazaar.VBazaarUI;

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java

@@ -1,8 +1,6 @@
 package forge.screens.home.sanctioned;
 
-import forge.GuiBase;
 import forge.Singletons;
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.deck.DeckProxy;
@@ -11,8 +9,10 @@ import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.limited.BoosterDraft;
 import forge.gamemodes.limited.LimitedPoolType;
 import forge.gamemodes.match.HostedMatch;
+import forge.gui.GuiBase;
 import forge.gui.GuiChoose;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
 import forge.itemmanager.ItemManagerConfig;
@@ -63,7 +63,7 @@ public enum CSubmenuDraft implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -92,7 +92,7 @@ public enum CSubmenuDraft implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java

@@ -7,9 +7,7 @@ import java.util.List;
 
 import javax.swing.*;
 
-import forge.GuiBase;
 import forge.Singletons;
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
 import forge.deck.DeckGroup;
@@ -18,7 +16,9 @@ import forge.game.GameType;
 import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.limited.SealedCardPoolGenerator;
 import forge.gamemodes.match.HostedMatch;
+import forge.gui.GuiBase;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
 import forge.item.InventoryItem;
@@ -62,7 +62,7 @@ public enum CSubmenuSealed implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -97,7 +97,7 @@ public enum CSubmenuSealed implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java

@@ -8,9 +8,7 @@ import java.util.List;
 import javax.swing.JButton;
 import javax.swing.SwingUtilities;
 
-import forge.GuiBase;
 import forge.Singletons;
-import forge.UiCommand;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.deck.DeckProxy;
@@ -19,8 +17,10 @@ import forge.game.player.RegisteredPlayer;
 import forge.gamemodes.limited.LimitedPoolType;
 import forge.gamemodes.limited.WinstonDraft;
 import forge.gamemodes.match.HostedMatch;
+import forge.gui.GuiBase;
 import forge.gui.GuiChoose;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
 import forge.itemmanager.ItemManagerConfig;
@@ -54,7 +54,7 @@ public enum CSubmenuWinston implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -78,7 +78,7 @@ public enum CSubmenuWinston implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuAchievements.java

@@ -13,7 +13,7 @@ public enum CSubmenuAchievements implements ICDoc {
     SINGLETON_INSTANCE;
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -24,7 +24,7 @@ public enum CSubmenuAchievements implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuDownloaders.java

@@ -1,9 +1,16 @@
 package forge.screens.home.settings;
 
-import forge.UiCommand;
 import forge.download.*;
-import forge.error.BugReporter;
 import forge.gui.ImportDialog;
+import forge.gui.UiCommand;
+import forge.gui.download.GuiDownloadAchievementImages;
+import forge.gui.download.GuiDownloadPicturesHQ;
+import forge.gui.download.GuiDownloadPicturesLQ;
+import forge.gui.download.GuiDownloadPrices;
+import forge.gui.download.GuiDownloadQuestImages;
+import forge.gui.download.GuiDownloadSetPicturesLQ;
+import forge.gui.download.GuiDownloadSkins;
+import forge.gui.error.BugReporter;
 import forge.gui.framework.ICDoc;
 
 import javax.swing.*;
@@ -91,7 +98,7 @@ public enum CSubmenuDownloaders implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -112,7 +119,7 @@ public enum CSubmenuDownloaders implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java

@@ -6,6 +6,8 @@ import forge.control.FControl.CloseAction;
 import forge.download.AutoUpdater;
 import forge.game.GameLogEntryType;
 import forge.gamemodes.net.server.FServerManager;
+import forge.gui.GuiBase;
+import forge.gui.UiCommand;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
 import forge.localinstance.properties.ForgeConstants;
@@ -55,7 +57,7 @@ public enum CSubmenuPreferences implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @SuppressWarnings("serial")
     @Override
@@ -260,7 +262,7 @@ public enum CSubmenuPreferences implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java

@@ -41,7 +41,7 @@ public enum CSubmenuReleaseNotes implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void initialize() {
@@ -50,7 +50,7 @@ public enum CSubmenuReleaseNotes implements ICDoc {
     }
 
     /* (non-Javadoc)
-     * @see forge.control.home.IControlSubmenu#update()
+     * @see forge.gui.control.home.IControlSubmenu#update()
      */
     @Override
     public void update() {

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAvatars.java

@@ -1,6 +1,6 @@
 package forge.screens.home.settings;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.gui.WrapLayout;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java

@@ -2,11 +2,11 @@ package forge.screens.home.settings;
 
 import forge.ImageKeys;
 import forge.StaticData;
-import forge.UiCommand;
 import forge.card.CardDb;
 import forge.card.CardEdition;
 import forge.card.CardEdition.CardInSet;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -45,8 +45,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 
-import forge.FThreads;
-import forge.GuiBase;
 import forge.ImageCache;
 import forge.LobbyPlayer;
 import forge.Singletons;
@@ -80,6 +78,8 @@ import forge.game.spellability.TargetChoices;
 import forge.game.zone.ZoneType;
 import forge.gamemodes.match.AbstractGuiGame;
 import forge.gui.FNetOverlay;
+import forge.gui.FThreads;
+import forge.gui.GuiBase;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;
 import forge.gui.GuiUtils;
@@ -92,6 +92,7 @@ import forge.gui.framework.IVDoc;
 import forge.gui.framework.SDisplayUtil;
 import forge.gui.framework.SLayoutIO;
 import forge.gui.framework.VEmptyDoc;
+import forge.gui.util.SOptionPane;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
 import forge.localinstance.assets.FSkinProp;
@@ -129,7 +130,6 @@ import forge.util.ITriggerEvent;
 import forge.util.Localizer;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
-import forge.util.gui.SOptionPane;
 import forge.view.FView;
 import forge.view.arcane.CardPanel;
 import forge.view.arcane.FloatingZone;

forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java

@@ -9,7 +9,7 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import forge.Singletons;
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.toolbox.FButton;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FList;

forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java

@@ -17,12 +17,12 @@ import net.miginfocom.swing.MigLayout;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.UiCommand;
 import forge.game.GameLogEntry;
 import forge.game.GameLogEntryType;
 import forge.game.GameView;
 import forge.gui.SOverlayUtils;
-import forge.interfaces.IWinLoseView;
+import forge.gui.UiCommand;
+import forge.gui.interfaces.IWinLoseView;
 import forge.item.PaperCard;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDetailPicture.java

@@ -3,7 +3,7 @@ package forge.screens.match.controllers;
 import forge.game.GameView;
 import forge.game.card.Card;
 import forge.game.card.CardView;
-import forge.interfaces.IMayViewCards;
+import forge.gui.interfaces.IMayViewCards;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
 

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java

@@ -23,8 +23,8 @@ import com.google.common.collect.Iterators;
 import com.google.common.primitives.Ints;
 
 import forge.Singletons;
-import forge.UiCommand;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.SLayoutIO;
 import forge.localinstance.assets.FSkinProp;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java

@@ -29,10 +29,10 @@ import javax.swing.SwingUtilities;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-import forge.FThreads;
 import forge.Singletons;
 import forge.game.card.CardView;
 import forge.game.player.PlayerView;
+import forge.gui.FThreads;
 import forge.gui.framework.ICDoc;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.views.VField;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CLog.java

@@ -3,7 +3,7 @@ package forge.screens.match.controllers;
 import java.util.Observable;
 import java.util.Observer;
 
-import forge.FThreads;
+import forge.gui.FThreads;
 import forge.gui.framework.ICDoc;
 import forge.screens.match.CMatchUI;
 import forge.screens.match.views.VLog;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java

@@ -32,9 +32,9 @@ import java.beans.PropertyChangeListener;
 
 import javax.swing.JButton;
 
-import forge.FThreads;
 import forge.game.GameView;
 import forge.game.card.CardView;
+import forge.gui.FThreads;
 import forge.gui.framework.ICDoc;
 import forge.gui.framework.SDisplayUtil;
 import forge.localinstance.properties.ForgePreferences;

forge-gui-desktop/src/main/java/forge/screens/match/views/VDock.java

@@ -17,7 +17,7 @@
  */
 package forge.screens.match.views;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.gui.framework.*;
 import forge.localinstance.assets.FSkinProp;
 import forge.screens.match.controllers.CDock;

forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java

@@ -18,11 +18,11 @@
 package forge.screens.match.views;
 
 import forge.CachedCardImage;
-import forge.card.CardDetailUtil;
-import forge.card.CardDetailUtil.DetailColors;
 import forge.game.GameView;
 import forge.game.card.CardView.CardStateView;
 import forge.game.spellability.StackItemView;
+import forge.gui.card.CardDetailUtil;
+import forge.gui.card.CardDetailUtil.DetailColors;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;

forge-gui-desktop/src/main/java/forge/screens/workshop/controllers/CCardScript.java

@@ -16,9 +16,9 @@ import com.google.common.collect.ImmutableList;
 import forge.Singletons;
 import forge.card.CardDb;
 import forge.card.CardRules;
-import forge.card.CardScriptInfo;
-import forge.card.CardScriptParser;
 import forge.game.card.Card;
+import forge.gui.card.CardScriptInfo;
+import forge.gui.card.CardScriptParser;
 import forge.gui.framework.FScreen;
 import forge.gui.framework.ICDoc;
 import forge.item.PaperCard;

forge-gui-desktop/src/main/java/forge/toolbox/FButton.java

@@ -35,9 +35,9 @@ import java.awt.event.MouseEvent;
 
 import javax.swing.BorderFactory;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.gui.framework.ILocalRepaint;
-import forge.interfaces.IButton;
+import forge.gui.interfaces.IButton;
 import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin.Colors;
 import forge.toolbox.FSkin.SkinImage;

forge-gui-desktop/src/main/java/forge/toolbox/FCheckBox.java

@@ -1,6 +1,6 @@
 package forge.toolbox;
 
-import forge.interfaces.ICheckBox;
+import forge.gui.interfaces.ICheckBox;
 import forge.toolbox.FSkin.SkinnedCheckBox;
 
 /**

forge-gui-desktop/src/main/java/forge/toolbox/FComboBox.java

@@ -22,7 +22,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.basic.BasicComboBoxUI;
 import javax.swing.plaf.basic.ComboPopup;
 
-import forge.interfaces.IComboBox;
+import forge.gui.interfaces.IComboBox;
 import forge.toolbox.FSkin.SkinFont;
 import forge.toolbox.FSkin.SkinnedComboBox;
 

forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java

@@ -13,7 +13,7 @@ import javax.swing.ListCellRenderer;
 
 import com.google.common.collect.ObjectArrays;
 
-import forge.interfaces.IComboBox;
+import forge.gui.interfaces.IComboBox;
 import forge.toolbox.FComboBox.TextAlignment;
 import forge.toolbox.FSkin.SkinFont;
 

forge-gui-desktop/src/main/java/forge/toolbox/FHyperlink.java

@@ -9,7 +9,7 @@ import java.net.URISyntaxException;
 
 import javax.swing.SwingWorker;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 
 
 @SuppressWarnings("serial")

forge-gui-desktop/src/main/java/forge/toolbox/FLabel.java

@@ -18,9 +18,9 @@ import javax.swing.Timer;
 import javax.swing.event.AncestorEvent;
 import javax.swing.event.AncestorListener;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.gui.framework.ILocalRepaint;
-import forge.interfaces.IButton;
+import forge.gui.interfaces.IButton;
 import forge.localinstance.assets.FSkinProp;
 import forge.toolbox.FSkin.Colors;
 import forge.toolbox.FSkin.SkinColor;
@@ -125,7 +125,7 @@ public class FLabel extends SkinnedLabel implements ILocalRepaint, IButton {
          * @return {@link forge.toolbox.FLabel.Builder} */
         public Builder useSkinColors(final boolean b0) { bldUseSkinColors = b0; return this; }
 
-        /**@param c0   {@link forge.UiCommand} to execute if clicked
+        /**@param c0   {@link forge.forge.gui.UiCommand} to execute if clicked
          * @return {@link forge.toolbox.FLabel.Builder} */
         public Builder cmdClick(final UiCommand c0) { this.bldCmd = c0; return this; }
 
@@ -458,12 +458,12 @@ public class FLabel extends SkinnedLabel implements ILocalRepaint, IButton {
         return this.resizeTimer;
     }
 
-    /** @return {@link forge.UiCommand} */
+    /** @return {@link forge.forge.gui.UiCommand} */
     public Runnable getCommand() {
         return this.cmdClick;
     }
 
-    /** @return {@link forge.UiCommand} */
+    /** @return {@link forge.forge.gui.UiCommand} */
     public Runnable getRightClickCommand() {
         return this.cmdRightClick;
     }
@@ -500,12 +500,12 @@ public class FLabel extends SkinnedLabel implements ILocalRepaint, IButton {
         }
     }
 
-    /** @param c0   {@link forge.UiCommand} on click */
+    /** @param c0   {@link forge.forge.gui.UiCommand} on click */
     public void setCommand(final Runnable c0) {
         this.cmdClick = c0;
     }
 
-    /** @param c0   {@link forge.UiCommand} on right-click */
+    /** @param c0   {@link forge.forge.gui.UiCommand} on right-click */
     public void setRightClickCommand(final Runnable c0) {
         this.cmdRightClick = c0;
     }

forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java

@@ -32,7 +32,7 @@ import java.util.List;
 
 import javax.swing.SwingConstants;
 
-import forge.UiCommand;
+import forge.gui.UiCommand;
 import forge.gui.framework.ILocalRepaint;
 import forge.toolbox.FSkin.FPanelBase;
 import forge.toolbox.FSkin.SkinColor;
@@ -115,12 +115,12 @@ public class FPanel extends FPanelBase implements ILocalRepaint {
         this.cornerDiameter = (int0 <= 0 ? 0 : int0);
     }
 
-    /** @param cmd0 &emsp; {@link forge.UiCommand} on click */
+    /** @param cmd0 &emsp; {@link forge.forge.gui.UiCommand} on click */
     public void setCommand(final UiCommand cmd0) {
         this.cmdClick = cmd0;
     }
 
-    /** @return {@link forge.UiCommand} */
+    /** @return {@link forge.forge.gui.UiCommand} */
     public UiCommand getCommand() {
         return this.cmdClick;
     }

forge-gui-desktop/src/main/java/forge/toolbox/FPasswordField.java

@@ -14,7 +14,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import forge.gui.MouseUtil;
-import forge.interfaces.ITextField;
+import forge.gui.interfaces.ITextField;
 import forge.toolbox.FSkin.SkinnedPasswordField;
 
 /** 

forge-gui-desktop/src/main/java/forge/toolbox/FProgressBar.java

@@ -1,8 +1,9 @@
 package forge.toolbox;
 
-import forge.interfaces.IProgressBar;
-
 import javax.swing.*;
+
+import forge.gui.interfaces.IProgressBar;
+
 import java.util.Date;
 
 /**

forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java

@@ -17,8 +17,8 @@
  */
 package forge.toolbox;
 
-import forge.FThreads;
 import forge.Singletons;
+import forge.gui.FThreads;
 import forge.gui.GuiUtils;
 import forge.gui.framework.ILocalRepaint;
 import forge.localinstance.assets.FSkinProp;

forge-gui-desktop/src/main/java/forge/toolbox/FTextField.java

@@ -17,7 +17,7 @@ import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
 
 import forge.gui.MouseUtil;
-import forge.interfaces.ITextField;
+import forge.gui.interfaces.ITextField;
 import forge.toolbox.FSkin.SkinnedTextField;
 
 /**

forge-gui-desktop/src/main/java/forge/view/FView.java

@@ -2,9 +2,9 @@ package forge.view;
 
 import com.google.common.collect.Lists;
 import forge.Singletons;
-import forge.UiCommand;
 import forge.gui.ImportDialog;
 import forge.gui.SOverlayUtils;
+import forge.gui.UiCommand;
 import forge.gui.framework.*;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgeConstants;

forge-gui-desktop/src/main/java/forge/view/Main.java

@@ -17,11 +17,11 @@
  */
 package forge.view;
 
-import forge.GuiBase;
 import forge.GuiDesktop;
 import forge.Singletons;
-import forge.card.CardReaderExperiments;
 import forge.error.ExceptionHandler;
+import forge.gui.GuiBase;
+import forge.gui.card.CardReaderExperiments;
 import forge.util.BuildInfo;
 import io.sentry.Sentry;
 import io.sentry.SentryClient;

forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java

@@ -18,7 +18,6 @@
 package forge.view.arcane;
 
 import forge.CachedCardImage;
-import forge.FThreads;
 import forge.StaticData;
 import forge.card.CardEdition;
 import forge.card.mana.ManaCost;
@@ -29,6 +28,7 @@ import forge.game.keyword.Keyword;
 import forge.game.card.CounterType;
 import forge.game.zone.ZoneType;
 import forge.gui.CardContainer;
+import forge.gui.FThreads;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgeConstants.CounterDisplayType;

forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java

@@ -29,8 +29,8 @@ import java.util.List;
 
 import javax.swing.SwingUtilities;
 
-import forge.FThreads;
 import forge.game.card.CardView;
+import forge.gui.FThreads;
 import forge.screens.match.CMatchUI;
 import forge.toolbox.FScrollPane;
 import forge.toolbox.FSkin.SkinnedPanel;

forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java

@@ -17,10 +17,10 @@
  */
 package forge.view.arcane;
 
-import forge.FThreads;
 import forge.game.card.CardView;
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;
+import forge.gui.FThreads;
 import forge.localinstance.assets.FSkinProp;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.screens.match.CMatchUI;

forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java

@@ -27,11 +27,11 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
-import forge.FThreads;
 import forge.game.card.CardView;
 import forge.game.card.CardView.CardStateView;
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;
+import forge.gui.FThreads;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
 import forge.screens.match.CMatchUI;