diff --git a/.gitattributes b/.gitattributes
index 60926fbc93d..8fac46b9171 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10702,6 +10702,7 @@ src/main/java/forge/control/ControlAllUI.java -text
 src/main/java/forge/control/ControlEditorUI.java -text
 src/main/java/forge/control/ControlHomeUI.java -text
 src/main/java/forge/control/ControlMatchUI.java -text
+src/main/java/forge/control/ControlWinLose.java -text
 src/main/java/forge/control/match/ControlCardviewer.java -text
 src/main/java/forge/control/match/ControlDock.java -text
 src/main/java/forge/control/match/ControlField.java -text
@@ -10882,8 +10883,6 @@ src/main/java/forge/view/swing/ApplicationView.java svneol=native#text/plain
 src/main/java/forge/view/swing/GuiHomeScreen.java svneol=native#text/plain
 src/main/java/forge/view/swing/Main.java svneol=native#text/plain
 src/main/java/forge/view/swing/OldGuiNewGame.java svneol=native#text/plain
-src/main/java/forge/view/swing/WinLoseFrame.java -text
-src/main/java/forge/view/swing/WinLoseModeHandler.java -text
 src/main/java/forge/view/swing/package-info.java svneol=native#text/plain
 src/main/java/forge/view/toolbox/CardDetailPanel.java -text
 src/main/java/forge/view/toolbox/CardViewer.java -text
@@ -10893,6 +10892,7 @@ src/main/java/forge/view/toolbox/FPanel.java -text
 src/main/java/forge/view/toolbox/FRoundedPanel.java -text
 src/main/java/forge/view/toolbox/FSkin.java -text
 src/main/java/forge/view/toolbox/FVerticalTabPanel.java -text
+src/main/java/forge/view/toolbox/WinLoseFrame.java -text
 src/main/java/net/slightlymagic/braids/LICENSE.txt svneol=native#text/plain
 src/main/java/net/slightlymagic/braids/util/ClumsyRunnable.java svneol=native#text/plain
 src/main/java/net/slightlymagic/braids/util/ImmutableIterableFrom.java svneol=native#text/plain
diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index cc21b310079..8bf70c82b68 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -43,7 +43,7 @@ import forge.properties.NewConstants.Lang.GameAction.GameActionText;
 import forge.quest.gui.QuestWinLoseHandler;
 import forge.quest.gui.main.QuestEvent;
 import forge.view.match.ViewTopLevel;
-import forge.view.swing.WinLoseFrame;
+import forge.view.toolbox.WinLoseFrame;
 
 /**
  * <p>
diff --git a/src/main/java/forge/view/swing/WinLoseModeHandler.java b/src/main/java/forge/control/ControlWinLose.java
similarity index 88%
rename from src/main/java/forge/view/swing/WinLoseModeHandler.java
rename to src/main/java/forge/control/ControlWinLose.java
index 8e795c4d172..bc593bb4b21 100644
--- a/src/main/java/forge/view/swing/WinLoseModeHandler.java
+++ b/src/main/java/forge/control/ControlWinLose.java
@@ -1,11 +1,14 @@
-package forge.view.swing;
+package forge.control;
 
 import forge.AllZone;
 import forge.Constant;
+import forge.view.swing.GuiHomeScreen;
+import forge.view.swing.OldGuiNewGame;
+import forge.view.toolbox.WinLoseFrame;
 
 /**
  * <p>
- * WinLoseModeHandler.
+ * ControlWinLose.
  * </p>
  * 
  * Superclass of custom mode handling for win/lose UI. Can add swing components
@@ -13,7 +16,7 @@ import forge.Constant;
  * extend this class.
  * 
  */
-public class WinLoseModeHandler {
+public class ControlWinLose {
 
     /** The view. */
     private WinLoseFrame view;
diff --git a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
index e0259891351..7c0cd07b3f9 100644
--- a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
+++ b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
@@ -17,6 +17,7 @@ import forge.Constant;
 import forge.MyRandom;
 import forge.Player;
 import forge.SetUtils;
+import forge.control.ControlWinLose;
 import forge.game.GameEndReason;
 import forge.game.GameFormat;
 import forge.game.GameLossReason;
@@ -31,7 +32,6 @@ import forge.quest.data.QuestPreferences;
 import forge.quest.data.QuestUtil;
 import forge.quest.gui.main.QuestChallenge;
 import forge.quest.gui.main.QuestEvent;
-import forge.view.swing.WinLoseModeHandler;
 
 /**
  * <p>
@@ -42,7 +42,7 @@ import forge.view.swing.WinLoseModeHandler;
  * WinLoseFrame should use MigLayout.
  * 
  */
-public class QuestWinLoseHandler extends WinLoseModeHandler {
+public class QuestWinLoseHandler extends ControlWinLose {
     private final boolean wonMatch;
     private ImageIcon icoTemp;
     private JLabel lblTemp1;
diff --git a/src/main/java/forge/view/swing/WinLoseFrame.java b/src/main/java/forge/view/toolbox/WinLoseFrame.java
similarity index 94%
rename from src/main/java/forge/view/swing/WinLoseFrame.java
rename to src/main/java/forge/view/toolbox/WinLoseFrame.java
index 37fc30eecc6..1e53360d523 100644
--- a/src/main/java/forge/view/swing/WinLoseFrame.java
+++ b/src/main/java/forge/view/toolbox/WinLoseFrame.java
@@ -1,4 +1,4 @@
-package forge.view.swing;
+package forge.view.toolbox;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -20,12 +20,11 @@ import forge.AllZone;
 import forge.Constant;
 import forge.Phase;
 import forge.Player;
+import forge.control.ControlWinLose;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants.Lang.WinLoseFrame.WinLoseText;
 import forge.quest.data.QuestMatchState;
 import forge.view.match.ViewTopLevel;
-import forge.view.toolbox.FButton;
-import forge.view.toolbox.FPanel;
 
 /**
  * <p>
@@ -39,7 +38,7 @@ import forge.view.toolbox.FPanel;
 public class WinLoseFrame extends JFrame {
 
     private final QuestMatchState matchState;
-    private final WinLoseModeHandler modeHandler;
+    private final ControlWinLose modeHandler;
 
     /** The btn continue. */
     private FButton btnContinue;
@@ -67,7 +66,7 @@ public class WinLoseFrame extends JFrame {
      * 
      */
     public WinLoseFrame() {
-        this(new WinLoseModeHandler());
+        this(new ControlWinLose());
     }
 
     /**
@@ -78,9 +77,9 @@ public class WinLoseFrame extends JFrame {
      * modes (quest, puzzle, etc.)
      * 
      * @param mh
-     *            the mh {@link forge.view.swing.WinLoseModeHandler}
+     *            the mh {@link forge.control.ControlWinLose}
      */
-    public WinLoseFrame(final WinLoseModeHandler mh) {
+    public WinLoseFrame(final ControlWinLose mh) {
         super();
 
         // modeHandler handles the unique display for different game modes.