minor refactoring - moved some auxiliary classes to forge.util package

.gitattributes

@@ -10722,7 +10722,6 @@ src/main/java/arcane/util/package-info.java svneol=native#text/plain
 src/main/java/forge/AIPlayer.java svneol=native#text/plain
 src/main/java/forge/AllZone.java svneol=native#text/plain
 src/main/java/forge/AllZoneUtil.java svneol=native#text/plain
-src/main/java/forge/Base64Coder.java svneol=native#text/plain
 src/main/java/forge/ButtonUtil.java svneol=native#text/plain
 src/main/java/forge/Card.java svneol=native#text/plain
 src/main/java/forge/CardColor.java svneol=native#text/plain
@@ -10752,7 +10751,6 @@ src/main/java/forge/ComputerUtilAttack.java svneol=native#text/plain
 src/main/java/forge/ComputerUtilBlock.java svneol=native#text/plain
 src/main/java/forge/Constant.java svneol=native#text/plain
 src/main/java/forge/ConstantStringArrayList.java svneol=native#text/plain
-src/main/java/forge/CopyFiles.java svneol=native#text/plain
 src/main/java/forge/Counters.java svneol=native#text/plain
 src/main/java/forge/DefaultPlayerZone.java svneol=native#text/plain
 src/main/java/forge/Display.java svneol=native#text/plain
@@ -10760,7 +10758,6 @@ src/main/java/forge/EndOfCombat.java svneol=native#text/plain
 src/main/java/forge/EndOfTurn.java svneol=native#text/plain
 src/main/java/forge/ExternalPanel.java svneol=native#text/plain
 src/main/java/forge/FileFinder.java svneol=native#text/plain
-src/main/java/forge/FileUtil.java svneol=native#text/plain
 src/main/java/forge/GameAction.java svneol=native#text/plain
 src/main/java/forge/GameActionUtil.java svneol=native#text/plain
 src/main/java/forge/GameEntity.java -text
@@ -10777,7 +10774,6 @@ src/main/java/forge/GuiMigrateLocalMWSSetPicturesHQ.java svneol=native#text/plai
 src/main/java/forge/GuiMultipleBlockers.java svneol=native#text/plain
 src/main/java/forge/GuiProgressBarWindow.java svneol=native#text/plain
 src/main/java/forge/HandSizeOp.java svneol=native#text/plain
-src/main/java/forge/HttpUtil.java svneol=native#text/plain
 src/main/java/forge/HumanPlayer.java svneol=native#text/plain
 src/main/java/forge/IPlayerZone.java svneol=native#text/plain
 src/main/java/forge/ImageCache.java svneol=native#text/plain
@@ -10786,7 +10782,6 @@ src/main/java/forge/MagicStack.java svneol=native#text/plain
 src/main/java/forge/Move.java svneol=native#text/plain
 src/main/java/forge/MyButton.java svneol=native#text/plain
 src/main/java/forge/MyObservable.java svneol=native#text/plain
-src/main/java/forge/MyRandom.java svneol=native#text/plain
 src/main/java/forge/NameChanger.java svneol=native#text/plain
 src/main/java/forge/Phase.java svneol=native#text/plain
 src/main/java/forge/PhaseHandler.java -text
@@ -10802,7 +10797,6 @@ src/main/java/forge/SimpleCombat.java svneol=native#text/plain
 src/main/java/forge/Singletons.java svneol=native#text/plain
 src/main/java/forge/StaticEffect.java svneol=native#text/plain
 src/main/java/forge/StaticEffects.java svneol=native#text/plain
-src/main/java/forge/Time.java svneol=native#text/plain
 src/main/java/forge/UndoCommand.java svneol=native#text/plain
 src/main/java/forge/Untap.java -text
 src/main/java/forge/Upkeep.java svneol=native#text/plain
@@ -11140,6 +11134,12 @@ src/main/java/forge/quest/gui/main/QuestSelectablePanel.java -text
 src/main/java/forge/quest/gui/main/package-info.java svneol=native#text/plain
 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/util/Base64Coder.java svneol=native#text/plain
+src/main/java/forge/util/CopyFiles.java svneol=native#text/plain
+src/main/java/forge/util/FileUtil.java svneol=native#text/plain
+src/main/java/forge/util/HttpUtil.java svneol=native#text/plain
+src/main/java/forge/util/MyRandom.java svneol=native#text/plain
+src/main/java/forge/util/package-info.java -text
 src/main/java/forge/view/FView.java svneol=native#text/plain
 src/main/java/forge/view/GuiTopLevel.java -text
 src/main/java/forge/view/Main.java -text

src/main/java/forge/AIPlayer.java

@@ -22,6 +22,7 @@ import java.util.Random;
 import forge.Constant.Zone;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/Card.java

@@ -44,6 +44,7 @@ import forge.card.spellability.SpellPermanent;
 import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
 import forge.item.CardDb;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/CardList.java

@@ -27,6 +27,7 @@ import com.google.code.jyield.Generator;
 import com.google.code.jyield.Yieldable;
 
 import forge.card.spellability.SpellAbility;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/CardUtil.java

@@ -38,6 +38,7 @@ import forge.gui.input.InputPayManaCostUtil;
 import forge.item.CardPrinted;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/ComputerUtilAttack.java

@@ -24,6 +24,7 @@ import java.util.Random;
 import forge.Constant.Zone;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.trigger.Trigger;
+import forge.util.MyRandom;
 
 //doesHumanAttackAndWin() uses the global variable AllZone.getComputerPlayer()
 /**

src/main/java/forge/GameAction.java

@@ -58,6 +58,7 @@ import forge.gui.input.InputPayManaCostUtil;
 import forge.item.CardPrinted;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants.Lang.GameAction.GameActionText;
+import forge.util.MyRandom;
 import forge.view.GuiTopLevel;
 import forge.view.match.ViewWinLose;
 

src/main/java/forge/GameActionUtil.java

@@ -33,6 +33,7 @@ import forge.game.GameLossReason;
 import forge.gui.GuiUtils;
 import forge.gui.input.InputPayManaCostAbility;
 import forge.gui.input.InputPayManaCostUtil;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/GuiDownloadSetPicturesLQ.java

@@ -29,6 +29,7 @@ import forge.item.CardDb;
 import forge.item.CardPrinted;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.Base64Coder;
 
 /**
  * <p>

src/main/java/forge/GuiDownloader.java

@@ -58,6 +58,7 @@ import com.esotericsoftware.minlog.Log;
 import forge.error.ErrorViewer;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/GuiImportPicture.java

@@ -43,6 +43,7 @@ import javax.swing.event.MouseInputAdapter;
 
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.CopyFiles;
 
 /**
  * <p>

src/main/java/forge/Player.java

@@ -35,6 +35,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.staticability.StaticAbility;
 import forge.game.GameLossReason;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 import forge.view.GuiTopLevel;
 import forge.view.match.MatchTopLevel;
 

src/main/java/forge/SetUtils.java

@@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
 import forge.card.CardBlock;
 import forge.card.CardSet;
 import forge.game.GameFormat;
+import forge.util.FileUtil;
 
 /**
  * <p>

src/main/java/forge/Time.java

@@ -1,72 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package forge;
-
-/**
- * <p>
- * Time class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
-public class Time {
-    private long startTime;
-    private long stopTime;
-
-    /**
-     * <p>
-     * Constructor for Time.
-     * </p>
-     */
-    public Time() {
-        this.start();
-    }
-
-    /**
-     * <p>
-     * start.
-     * </p>
-     */
-    public final void start() {
-        this.startTime = System.currentTimeMillis();
-    }
-
-    /**
-     * <p>
-     * stop.
-     * </p>
-     * 
-     * @return a double.
-     */
-    public final double stop() {
-        this.stopTime = System.currentTimeMillis();
-        return this.getTime();
-    }
-
-    /**
-     * <p>
-     * getTime.
-     * </p>
-     * 
-     * @return a double.
-     */
-    public final double getTime() {
-        return (this.stopTime - this.startTime) / 1000.0;
-    }
-}

src/main/java/forge/card/BoosterGenerator.java

@@ -26,10 +26,10 @@ import java.util.Map.Entry;
 import net.slightlymagic.braids.util.lambda.Lambda1;
 import net.slightlymagic.maxmtg.Closure1;
 import net.slightlymagic.maxmtg.Predicate;
-import forge.MyRandom;
 import forge.deck.Deck;
 import forge.item.CardDb;
 import forge.item.CardPrinted;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/BoosterUtils.java

@@ -26,9 +26,9 @@ import net.slightlymagic.maxmtg.Predicate;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.Constant;
-import forge.MyRandom;
 import forge.item.CardDb;
 import forge.item.CardPrinted;
+import forge.util.MyRandom;
 
 // The BoosterPack generates cards for the Card Pool in Quest Mode
 /**

src/main/java/forge/card/MtgDataParser.java

@@ -25,10 +25,10 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.FileUtil;
 import forge.card.CardManaCost.ManaParser;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.FileUtil;
 
 /** This class can read CardRules from Arch's mtg-data.txt file. */
 public final class MtgDataParser implements Iterator<CardRules> {

src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java

@@ -28,7 +28,6 @@ import forge.Card;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Counters;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cost.Cost;
 import forge.card.cost.CostUtil;
@@ -37,6 +36,7 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java

@@ -35,7 +35,6 @@ import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameEntity;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -47,6 +46,7 @@ import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.card.staticability.StaticAbility;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * The Class AbilityFactory_Attach.

src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java

@@ -34,7 +34,6 @@ import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.MyRandom;
 import forge.Player;
 import forge.PlayerZone;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -47,6 +46,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellPermanent;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java

@@ -32,7 +32,6 @@ import forge.Command;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.Ability;
 import forge.card.spellability.AbilityActivated;
@@ -41,6 +40,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java

@@ -23,7 +23,6 @@ import java.util.HashMap;
 import forge.AllZone;
 import forge.Card;
 import forge.ComputerUtil;
-import forge.MyRandom;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
 import forge.card.cost.CostUtil;
@@ -34,6 +33,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityStackInstance;
 import forge.card.spellability.Target;
 import forge.card.spellability.TargetSelection;
+import forge.util.MyRandom;
 
 //Destination - send countered spell to: (only applies to Spells; ignored for Abilities)
 // -Graveyard (Default)

src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java

@@ -32,7 +32,6 @@ import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
-import forge.MyRandom;
 import forge.PhaseHandler;
 import forge.Player;
 import forge.PlayerZone;
@@ -46,6 +45,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
 import forge.gui.input.Input;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java

@@ -30,7 +30,6 @@ import forge.CardUtil;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java

@@ -33,7 +33,6 @@ import forge.Command;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
 import forge.card.cost.CostUtil;
@@ -43,6 +42,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityRestriction;
 import forge.card.spellability.Target;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java

@@ -30,7 +30,6 @@ import forge.CardListFilter;
 import forge.CardUtil;
 import forge.ComputerUtil;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java

@@ -30,7 +30,6 @@ import forge.Command;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.PhaseHandler;
 import forge.Player;
 import forge.card.spellability.AbilityActivated;
@@ -40,6 +39,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java

@@ -30,7 +30,6 @@ import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -42,6 +41,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
 import forge.gui.input.InputPayManaCostUtil;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java

@@ -30,7 +30,6 @@ import forge.CardListFilter;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.PhaseHandler;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -42,6 +41,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java

@@ -32,7 +32,6 @@ import forge.Command;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -43,6 +42,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityRestriction;
 import forge.card.spellability.Target;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java

@@ -34,7 +34,6 @@ import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.MyRandom;
 import forge.Player;
 import forge.PlayerZone;
 import forge.card.cost.Cost;
@@ -45,6 +44,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java

@@ -28,7 +28,6 @@ import forge.CardList;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -39,6 +38,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java

@@ -28,7 +28,6 @@ import forge.CardList;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java

@@ -31,7 +31,6 @@ import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
-import forge.MyRandom;
 import forge.Player;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
@@ -42,6 +41,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/AbstractCardFactory.java

@@ -40,7 +40,6 @@ import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
-import forge.FileUtil;
 import forge.GameActionUtil;
 import forge.Player;
 import forge.PlayerZone;
@@ -59,6 +58,7 @@ import forge.gui.input.Input;
 import forge.gui.input.InputPayManaCost;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.FileUtil;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/CardFactoryCreatures.java

@@ -37,7 +37,6 @@ import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameActionUtil;
-import forge.MyRandom;
 import forge.Player;
 import forge.PlayerZone;
 import forge.card.abilityfactory.AbilityFactory;
@@ -55,6 +54,7 @@ import forge.card.trigger.Trigger;
 import forge.gui.GuiUtils;
 import forge.gui.input.Input;
 import forge.gui.input.InputPayManaCost;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/CardFactoryInstants.java

@@ -29,7 +29,6 @@ import forge.Command;
 import forge.ComputerUtil;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.PhaseUtil;
 import forge.Player;
 import forge.PlayerZone;
@@ -40,6 +39,7 @@ import forge.card.spellability.Spell;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/CardFactoryLands.java

@@ -30,7 +30,6 @@ import forge.Constant;
 import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameActionUtil;
-import forge.MyRandom;
 import forge.Player;
 import forge.PlayerZone;
 import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.AbilityMana;
 import forge.card.spellability.SpellAbility;
 import forge.gui.GuiUtils;
 import forge.gui.input.Input;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/card/cardfactory/CardFactoryUtil.java

@@ -45,7 +45,6 @@ import forge.Constant.Zone;
 import forge.Counters;
 import forge.GameActionUtil;
 import forge.HandSizeOp;
-import forge.MyRandom;
 import forge.PhaseHandler;
 import forge.Player;
 import forge.PlayerZone;
@@ -67,6 +66,7 @@ import forge.gui.GuiUtils;
 import forge.gui.input.Input;
 import forge.gui.input.InputPayManaCost;
 import forge.gui.input.InputPayManaCostUtil;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/deck/DeckGeneration.java

@@ -22,7 +22,6 @@ import java.util.Random;
 
 import forge.CardList;
 import forge.Constant;
-import forge.MyRandom;
 import forge.PlayerType;
 import forge.deck.generate.Generate2ColorDeck;
 import forge.deck.generate.Generate3ColorDeck;
@@ -32,6 +31,7 @@ import forge.deck.generate.GenerateConstructedMultiColorDeck;
 import forge.deck.generate.GenerateThemeDeck;
 import forge.game.GameType;
 import forge.gui.GuiUtils;
+import forge.util.MyRandom;
 
 /**
  * Utility class to hold add deck generation routines, methods moved from

src/main/java/forge/deck/DeckManager.java

@@ -41,7 +41,6 @@ import javax.swing.filechooser.FileFilter;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.Card;
-import forge.FileUtil;
 import forge.PlayerType;
 import forge.error.ErrorViewer;
 import forge.game.GameType;
@@ -50,6 +49,7 @@ import forge.item.CardPrinted;
 import forge.item.ItemPoolView;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.FileUtil;
 import freemarker.template.Configuration;
 import freemarker.template.DefaultObjectWrapper;
 import freemarker.template.Template;

src/main/java/forge/deck/generate/Generate2ColorDeck.java

@@ -28,11 +28,11 @@ import forge.CardFilter;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Constant;
-import forge.MyRandom;
 import forge.PlayerType;
 import forge.Singletons;
 import forge.error.ErrorViewer;
 import forge.properties.ForgeProps;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/deck/generate/Generate3ColorDeck.java

@@ -28,11 +28,11 @@ import forge.CardFilter;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Constant;
-import forge.MyRandom;
 import forge.PlayerType;
 import forge.Singletons;
 import forge.error.ErrorViewer;
 import forge.properties.ForgeProps;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/deck/generate/Generate5ColorDeck.java

@@ -28,11 +28,11 @@ import forge.CardFilter;
 import forge.CardList;
 import forge.CardListFilter;
 import forge.Constant;
-import forge.MyRandom;
 import forge.PlayerType;
 import forge.Singletons;
 import forge.error.ErrorViewer;
 import forge.properties.ForgeProps;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/deck/generate/GenerateThemeDeck.java

@@ -29,8 +29,8 @@ import java.util.Random;
 import forge.AllZone;
 import forge.Card;
 import forge.CardList;
-import forge.MyRandom;
 import forge.error.ErrorViewer;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/game/limited/BoosterDraft.java

@@ -35,8 +35,6 @@ import forge.AllZone;
 import forge.Card;
 import forge.CardList;
 import forge.Constant;
-import forge.FileUtil;
-import forge.HttpUtil;
 import forge.SetUtils;
 import forge.card.BoosterGenerator;
 import forge.card.CardBlock;
@@ -50,6 +48,8 @@ import forge.item.ItemPool;
 import forge.item.ItemPoolView;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.FileUtil;
+import forge.util.HttpUtil;
 
 /**
  * 

src/main/java/forge/game/limited/BoosterDraftAI.java

@@ -31,10 +31,10 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.CardListUtil;
 import forge.Constant;
-import forge.MyRandom;
 import forge.card.spellability.AbilityMana;
 import forge.deck.Deck;
 import forge.game.GameType;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/game/limited/CardRatings.java

@@ -23,10 +23,10 @@ import java.util.TreeMap;
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import forge.FileUtil;
-import forge.HttpUtil;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.FileUtil;
+import forge.util.HttpUtil;
 
 /**
  * Contains Maps of card ratings.

src/main/java/forge/game/limited/SealedDeck.java

@@ -31,8 +31,6 @@ import forge.CardList;
 import forge.CardListFilter;
 import forge.CardListUtil;
 import forge.Constant;
-import forge.FileUtil;
-import forge.MyRandom;
 import forge.SetUtils;
 import forge.card.BoosterGenerator;
 import forge.card.CardBlock;
@@ -45,6 +43,8 @@ import forge.gui.GuiUtils;
 import forge.item.CardDb;
 import forge.item.CardPrinted;
 import forge.item.ItemPool;
+import forge.util.FileUtil;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/gui/deckeditor/DeckAnalysis.java

@@ -46,11 +46,11 @@ import javax.swing.event.MouseInputAdapter;
 import javax.swing.table.DefaultTableModel;
 
 import net.miginfocom.swing.MigLayout;
-import forge.MyRandom;
 import forge.card.CardRules;
 import forge.card.CardType;
 import forge.item.CardPrinted;
 import forge.item.ItemPoolView;
+import forge.util.MyRandom;
 
 /**
  * This code was edited or generated using CloudGarden's Jigloo SWT/Swing GUI

src/main/java/forge/model/FModel.java

@@ -31,13 +31,13 @@ import forge.ComputerAIGeneral;
 import forge.ComputerAIInput;
 import forge.Constant;
 import forge.ConstantStringArrayList;
-import forge.FileUtil;
-import forge.HttpUtil;
 import forge.game.GameSummary;
 import forge.gui.input.InputControl;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.FileUtil;
+import forge.util.HttpUtil;
 
 /**
  * The default Model implementation for Forge.

src/main/java/forge/quest/data/QuestData.java

@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 
 import net.slightlymagic.maxmtg.Predicate;
-import forge.MyRandom;
 import forge.SetUtils;
 import forge.deck.Deck;
 import forge.error.ErrorViewer;
@@ -34,6 +33,7 @@ import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.data.item.QuestInventory;
 import forge.quest.data.pet.QuestPetManager;
+import forge.util.MyRandom;
 
 //when you create QuestDataOld and AFTER you copy the AI decks over
 //you have to call one of these two methods below

src/main/java/forge/quest/data/QuestUtilCards.java

@@ -23,7 +23,6 @@ import java.util.Map.Entry;
 
 import net.slightlymagic.braids.util.lambda.Lambda1;
 import net.slightlymagic.maxmtg.Predicate;
-import forge.MyRandom;
 import forge.SetUtils;
 import forge.card.BoosterGenerator;
 import forge.card.BoosterUtils;
@@ -36,6 +35,7 @@ import forge.item.CardPrinted;
 import forge.item.InventoryItem;
 import forge.item.ItemPool;
 import forge.item.ItemPoolView;
+import forge.util.MyRandom;
 
 /**
  * This is a helper class to execute operations on QuestData. It has been

src/main/java/forge/quest/data/ReadPriceList.java

@@ -26,10 +26,10 @@ import java.util.Random;
 
 import com.esotericsoftware.minlog.Log;
 
-import forge.MyRandom;
 import forge.error.ErrorViewer;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
+import forge.util.MyRandom;
 
 /**
  * <p>

src/main/java/forge/quest/gui/QuestWinLoseHandler.java

@@ -31,7 +31,6 @@ import forge.AllZone;
 import forge.CardList;
 import forge.Constant;
 import forge.Constant.Zone;
-import forge.MyRandom;
 import forge.Player;
 import forge.SetUtils;
 import forge.Singletons;
@@ -51,6 +50,7 @@ import forge.quest.data.QuestPreferences;
 import forge.quest.data.QuestUtil;
 import forge.quest.gui.main.QuestChallenge;
 import forge.quest.gui.main.QuestEvent;
+import forge.util.MyRandom;
 import forge.view.GuiTopLevel;
 import forge.view.match.ViewWinLose;
 import forge.view.toolbox.FSkin;

src/main/java/forge/quest/gui/main/QuestEventManager.java

@@ -24,12 +24,12 @@ import java.util.List;
 import java.util.Random;
 
 import forge.AllZone;
-import forge.FileUtil;
 import forge.deck.DeckManager;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.data.QuestPreferences;
 import forge.quest.data.QuestUtil;
+import forge.util.FileUtil;
 
 /**
  * <p>

src/main/java/forge/util/Base64Coder.java

@@ -29,7 +29,7 @@
 // Please contact the author if you need another license.
 // This module is provided "as is", without warranties of any kind.
 
-package forge;
+package forge.util;
 
 /**
  * A Base64 encoder/decoder.

src/main/java/forge/util/CopyFiles.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge;
+package forge.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,6 +29,7 @@ import javax.swing.JLabel;
 import javax.swing.JProgressBar;
 import javax.swing.SwingWorker;
 
+import forge.GuiDisplayUtil;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 

src/main/java/forge/util/FileUtil.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge;
+package forge.util;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

src/main/java/forge/util/HttpUtil.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge;
+package forge.util;
 
 import java.io.DataOutputStream;
 import java.io.File;
@@ -27,6 +27,8 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import forge.Constant;
+
 /**
  * <p>
  * HttpUtil class.

src/main/java/forge/util/MyRandom.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge;
+package forge.util;
 
 import java.util.Random;
 

src/main/java/forge/util/package-info.java

@@ -0,0 +1,3 @@
+/** Utils namespace to hold auxiliary classes for Forge. */
+package forge.util;
+