Quick fix the first, and a quick reorganize.

.gitattributes

@@ -10790,10 +10790,6 @@ src/main/java/forge/gui/input/InputPayManaCostAbility.java svneol=native#text/pl
 src/main/java/forge/gui/input/InputPayManaCostUtil.java svneol=native#text/plain
 src/main/java/forge/gui/input/package-info.java svneol=native#text/plain
 src/main/java/forge/gui/package-info.java svneol=native#text/plain
-src/main/java/forge/gui/skin/FButton.java -text
-src/main/java/forge/gui/skin/FPanel.java -text
-src/main/java/forge/gui/skin/FRoundedPanel.java -text
-src/main/java/forge/gui/skin/FSkin.java -text
 src/main/java/forge/gui/skin/package-info.java svneol=native#text/plain
 src/main/java/forge/item/BoosterPack.java -text
 src/main/java/forge/item/CardDb.java -text
@@ -10867,6 +10863,7 @@ src/main/java/forge/quest/gui/package-info.java svneol=native#text/plain
 src/main/java/forge/quest/package-info.java svneol=native#text/plain
 src/main/java/forge/view/FView.java svneol=native#text/plain
 src/main/java/forge/view/GuiTopLevel.java -text
+src/main/java/forge/view/editor/EditorTopLevel.java -text
 src/main/java/forge/view/home/HomeTopLevel.java -text
 src/main/java/forge/view/match/ViewAreaBattlefield.java -text
 src/main/java/forge/view/match/ViewAreaSidebar.java -text
@@ -10891,7 +10888,11 @@ 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
+src/main/java/forge/view/toolbox/FButton.java -text
 src/main/java/forge/view/toolbox/FOverlay.java -text
+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/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/forge/AllZone.java

@@ -12,7 +12,7 @@ import forge.deck.DeckManager;
 import forge.game.GameSummary;
 import forge.gui.input.InputControl;
 import forge.view.toolbox.FOverlay;
-import forge.gui.skin.FSkin;
+import forge.view.toolbox.FSkin;
 import forge.model.FGameState;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
@@ -613,7 +613,7 @@ public final class AllZone {
      * </p>
      * Gets current display skin.
      * 
-     * @return a {@link forge.gui.skin.FSkin} object.
+     * @return a {@link forge.view.toolbox.FSkin} object.
      * @since 1.0.15
      */
     public static FSkin getSkin() {
@@ -627,7 +627,7 @@ public final class AllZone {
      * Sets current display skin.
      * 
      * @param fs
-     *            a {@link forge.gui.skin.FSkin} object.
+     *            a {@link forge.view.toolbox.FSkin} object.
      * @since 1.0.15
      */
     public static void setSkin(final FSkin fs) {

src/main/java/forge/view/editor/EditorTopLevel.java

@@ -0,0 +1,16 @@
+package forge.view.editor;
+
+import forge.view.toolbox.FPanel;
+
+/**
+ * Lays out battle, sidebar, user areas in locked % vals and repaints
+ * as necessary.
+ * 
+ */
+
+@SuppressWarnings("serial")
+public class EditorTopLevel extends FPanel {
+	public EditorTopLevel() {
+	    super();
+	}
+}

src/main/java/forge/view/home/HomeTopLevel.java

@@ -1,6 +1,6 @@
 package forge.view.home;
 
-import forge.gui.skin.FPanel;
+import forge.view.toolbox.FPanel;
 
 /**
  * Lays out battle, sidebar, user areas in locked % vals and repaints

src/main/java/forge/view/match/ViewAreaBattlefield.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
-import forge.gui.skin.FPanel;
+import forge.view.toolbox.FPanel;
 
 /**
  * Battlefield, assembles and contains instances of MatchPlayer.

src/main/java/forge/view/match/ViewAreaSidebar.java

@@ -2,8 +2,8 @@ package forge.view.match;
 
 import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
-import forge.gui.skin.FPanel;
+import forge.view.toolbox.FPanel;
-import forge.gui.skin.FRoundedPanel;
+import forge.view.toolbox.FRoundedPanel;
 
 /** 
  * Handles display of child components of sidebar area in match UI.

src/main/java/forge/view/match/ViewAreaUser.java

@@ -3,7 +3,7 @@ package forge.view.match;
 import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
-import forge.gui.skin.FPanel;
+import forge.view.toolbox.FPanel;
 
 /** 
  * Parent panel for display of input, hand, and dock.

src/main/java/forge/view/match/ViewCardviewer.java

@@ -10,8 +10,8 @@ import javax.swing.JPanel;
 import forge.Card;
 import forge.ImageCache;
 import forge.control.match.ControlCardviewer;
-import forge.gui.skin.FPanel;
 import forge.view.toolbox.CardDetailPanel;
+import forge.view.toolbox.FPanel;
 import forge.view.toolbox.FVerticalTabPanel;
 
 /** 

src/main/java/forge/view/match/ViewDock.java

@@ -31,12 +31,12 @@ import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
 import forge.Singletons;
 import forge.control.match.ControlDock;
-import forge.gui.skin.FButton;
-import forge.gui.skin.FPanel;
-import forge.gui.skin.FRoundedPanel;
-import forge.gui.skin.FSkin;
 import forge.properties.ForgePreferences;
+import forge.view.toolbox.FButton;
 import forge.view.toolbox.FOverlay;
+import forge.view.toolbox.FPanel;
+import forge.view.toolbox.FRoundedPanel;
+import forge.view.toolbox.FSkin;
 
 /** 
  * Swing component for button dock.

src/main/java/forge/view/match/ViewField.java

@@ -29,9 +29,9 @@ import forge.Player;
 import forge.Constant.Zone;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.control.match.ControlField;
-import forge.gui.skin.FPanel;
+import forge.view.toolbox.FPanel;
-import forge.gui.skin.FRoundedPanel;
+import forge.view.toolbox.FRoundedPanel;
-import forge.gui.skin.FSkin;
+import forge.view.toolbox.FSkin;
 
 /** 
  * Assembles Swing components of player field instance.

src/main/java/forge/view/match/ViewHand.java

@@ -21,7 +21,7 @@ import forge.GuiDisplayUtil;
 import forge.ImageCache;
 import forge.control.match.ControlHand;
 
-import forge.gui.skin.FRoundedPanel;
+import forge.view.toolbox.FRoundedPanel;
 
 /** 
  * VIEW - Swing components for user hand.

src/main/java/forge/view/match/ViewInput.java

@@ -8,9 +8,9 @@ import javax.swing.JTextArea;
 import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
 import forge.control.match.ControlInput;
-import forge.gui.skin.FButton;
+import forge.view.toolbox.FButton;
-import forge.gui.skin.FRoundedPanel;
+import forge.view.toolbox.FRoundedPanel;
-import forge.gui.skin.FSkin;
+import forge.view.toolbox.FSkin;
 
 /** 
  * Assembles Swing components of input area.

src/main/java/forge/view/match/ViewTabber.java

@@ -27,8 +27,8 @@ import forge.Player;
 import forge.card.spellability.SpellAbilityStackInstance;
 import forge.control.match.ControlTabber;
 import forge.gui.MultiLineLabelUI;
-import forge.gui.skin.FPanel;
+import forge.view.toolbox.FPanel;
-import forge.gui.skin.FSkin;
+import forge.view.toolbox.FSkin;
 import forge.view.toolbox.FVerticalTabPanel;
 
 /** 

src/main/java/forge/view/match/ViewTopLevel.java

@@ -21,8 +21,8 @@ import forge.control.match.ControlField;
 import forge.control.match.ControlHand;
 import forge.control.match.ControlInput;
 import forge.control.match.ControlTabber;
-import forge.gui.skin.FPanel;
 import forge.properties.ForgePreferences;
+import forge.view.toolbox.FPanel;
 
 /**
  * - Lays out battle, sidebar, user areas in locked % vals and repaints

src/main/java/forge/view/swing/ApplicationView.java

@@ -16,13 +16,13 @@ import forge.Constant;
 import forge.ImageCache;
 import forge.error.ErrorViewer;
 import forge.game.GameType;
-import forge.gui.skin.FSkin;
 import forge.model.FModel;
 import forge.properties.ForgePreferences;
 import forge.view.FView;
 import forge.view.swing.OldGuiNewGame.CardSizesAction;
 import forge.view.swing.OldGuiNewGame.CardStackAction;
 import forge.view.swing.OldGuiNewGame.CardStackOffsetAction;
+import forge.view.toolbox.FSkin;
 
 /**
  * The main view for Forge: a java swing application. All view class instances

src/main/java/forge/view/swing/Main.java

@@ -4,9 +4,9 @@ import forge.AllZone;
 import forge.Singletons;
 import forge.error.ErrorViewer;
 import forge.error.ExceptionHandler;
-import forge.gui.skin.FSkin;
 import forge.model.FModel;
 import forge.view.FView;
+import forge.view.toolbox.FSkin;
 
 /**
  * Main class for Forge's swing application view.

src/main/java/forge/view/swing/SplashFrame.java

@@ -19,7 +19,7 @@ import javax.swing.UIManager;
 import javax.swing.border.LineBorder;
 
 import net.slightlymagic.braids.util.progress_monitor.BraidsProgressMonitor;
-import forge.gui.skin.FSkin;
+import forge.view.toolbox.FSkin;
 
 /**
  * Shows the splash frame as the application starts.

src/main/java/forge/view/swing/WinLoseFrame.java

@@ -20,12 +20,12 @@ import forge.AllZone;
 import forge.Constant;
 import forge.Phase;
 import forge.Player;
-import forge.gui.skin.FButton;
-import forge.gui.skin.FPanel;
 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>
@@ -291,42 +291,42 @@ public class WinLoseFrame extends JFrame {
     }
 
     /**
-     * @return {@link forge.gui.skin.FButton} btnContinue
+     * @return {@link forge.view.toolbox.FButton} btnContinue
      */
     public FButton getBtnContinue() {
         return this.btnContinue;
     }
 
     /**
-     * @param btnContinue {@link forge.gui.skin.FButton}
+     * @param btnContinue {@link forge.view.toolbox.FButton}
      */
     public void setBtnContinue(final FButton btnContinue) {
         this.btnContinue = btnContinue;
     }
 
     /**
-     * @return {@link forge.gui.skin.FButton} btnRestart
+     * @return {@link forge.view.toolbox.FButton} btnRestart
      */
     public FButton getBtnRestart() {
         return this.btnRestart;
     }
 
     /**
-     * @param btnRestart {@link forge.gui.skin.FButton}
+     * @param btnRestart {@link forge.view.toolbox.FButton}
      */
     public void setBtnRestart(final FButton btnRestart) {
         this.btnRestart = btnRestart;
     }
 
     /**
-     * @return {@link forge.gui.skin.FButton} btnQuit
+     * @return {@link forge.view.toolbox.FButton} btnQuit
      */
     public FButton getBtnQuit() {
         return this.btnQuit;
     }
 
     /**
-     * @param btnQuit {@link forge.gui.skin.FButton}
+     * @param btnQuit {@link forge.view.toolbox.FButton}
      */
     public void setBtnQuit(final FButton btnQuit) {
         this.btnQuit = btnQuit;

src/main/java/forge/view/toolbox/CardDetailPanel.java

@@ -19,7 +19,6 @@ import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameEntity;
 import forge.GuiDisplayUtil;
-import forge.gui.skin.FSkin;
 
 /** Shows details of card if moused over. */
 @SuppressWarnings("serial")

src/main/java/forge/view/toolbox/FButton.java

@@ -1,4 +1,4 @@
-package forge.gui.skin;
+package forge.view.toolbox;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;

src/main/java/forge/view/toolbox/FPanel.java

@@ -1,4 +1,4 @@
-package forge.gui.skin;
+package forge.view.toolbox;
 
 import java.awt.Dimension;
 import java.awt.Graphics;

src/main/java/forge/view/toolbox/FRoundedPanel.java

@@ -1,4 +1,4 @@
-package forge.gui.skin;
+package forge.view.toolbox;
 
 import java.awt.Color;
 import java.awt.Graphics;

src/main/java/forge/view/toolbox/FSkin.java

@@ -1,4 +1,4 @@
-package forge.gui.skin;
+package forge.view.toolbox;
 
 import java.awt.Color;
 import java.awt.Font;

src/main/java/forge/view/toolbox/FVerticalTabPanel.java

@@ -17,8 +17,6 @@ import javax.swing.border.MatteBorder;
 
 import net.miginfocom.swing.MigLayout;
 import forge.AllZone;
-import forge.gui.skin.FPanel;
-import forge.gui.skin.FSkin;
 
 /** 
  * TODO: Write javadoc for this type.