move game Card class to forge.game.card package to ease further translation to game module

.gitattributes

@@ -14683,30 +14683,12 @@ forge-gui/src/main/html/js/jquery/jquery-1.9.1.js -text
 forge-gui/src/main/html/js/jquery/jquery-1.9.1.min.js -text
 forge-gui/src/main/html/js/observable.js -text
 forge-gui/src/main/html/js/socket.js -text
-forge-gui/src/main/java/forge/Card.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardColor.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardDamageHistory.java -text
-forge-gui/src/main/java/forge/CardKeywords.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardLists.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardPowerToughness.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardPredicates.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardType.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardUtil.java svneol=native#text/plain
 forge-gui/src/main/java/forge/Command.java svneol=native#text/plain
 forge-gui/src/main/java/forge/Constant.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CounterType.java svneol=native#text/plain
 forge-gui/src/main/java/forge/FThreads.java -text
-forge-gui/src/main/java/forge/GameEntity.java -text
-forge-gui/src/main/java/forge/GameLog.java -text
-forge-gui/src/main/java/forge/GameLogEntry.java -text
-forge-gui/src/main/java/forge/GameLogEntryType.java -text
-forge-gui/src/main/java/forge/GameLogFormatter.java -text
-forge-gui/src/main/java/forge/GameObject.java -text
 forge-gui/src/main/java/forge/ImageCache.java svneol=native#text/plain
 forge-gui/src/main/java/forge/ImageLoader.java -text
 forge-gui/src/main/java/forge/Singletons.java svneol=native#text/plain
-forge-gui/src/main/java/forge/StaticEffect.java svneol=native#text/plain
-forge-gui/src/main/java/forge/StaticEffects.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/CardBlock.java -text
 forge-gui/src/main/java/forge/card/CardCharacteristics.java -text
 forge-gui/src/main/java/forge/card/CardEditionPredicates.java -text
@@ -15102,14 +15084,21 @@ forge-gui/src/main/java/forge/game/Game.java -text
 forge-gui/src/main/java/forge/game/GameAction.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/GameActionUtil.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/GameEndReason.java -text
+forge-gui/src/main/java/forge/game/GameEntity.java -text
+forge-gui/src/main/java/forge/game/GameLog.java -text
+forge-gui/src/main/java/forge/game/GameLogEntry.java -text
+forge-gui/src/main/java/forge/game/GameLogEntryType.java -text
+forge-gui/src/main/java/forge/game/GameLogFormatter.java -text
 forge-gui/src/main/java/forge/game/GameNew.java -text
+forge-gui/src/main/java/forge/game/GameObject.java -text
 forge-gui/src/main/java/forge/game/GameOutcome.java -text
 forge-gui/src/main/java/forge/game/GameStage.java -text
 forge-gui/src/main/java/forge/game/GameType.java -text
 forge-gui/src/main/java/forge/game/GlobalRuleChange.java -text
 forge-gui/src/main/java/forge/game/Match.java -text
 forge-gui/src/main/java/forge/game/PlanarDice.java -text
-forge-gui/src/main/java/forge/game/RegisteredPlayer.java -text
+forge-gui/src/main/java/forge/game/StaticEffect.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/StaticEffects.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/ai/AiAttackController.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/ai/AiBlockController.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/ai/AiController.java svneol=native#text/plain
@@ -15119,6 +15108,17 @@ forge-gui/src/main/java/forge/game/ai/ComputerUtilCard.java -text
 forge-gui/src/main/java/forge/game/ai/ComputerUtilCombat.java -text
 forge-gui/src/main/java/forge/game/ai/ComputerUtilCost.java -text
 forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java -text
+forge-gui/src/main/java/forge/game/card/Card.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardDamageHistory.java -text
+forge-gui/src/main/java/forge/game/card/CardKeywords.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardLists.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardPowerToughness.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardPredicates.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardType.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardUtil.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CounterType.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/package-info.java -text
 forge-gui/src/main/java/forge/game/combat/AttackingBand.java -text
 forge-gui/src/main/java/forge/game/combat/Combat.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/combat/CombatLki.java -text
@@ -15201,6 +15201,7 @@ forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java -text
 forge-gui/src/main/java/forge/game/player/PlayerOutcome.java -text
 forge-gui/src/main/java/forge/game/player/PlayerStatistics.java -text
 forge-gui/src/main/java/forge/game/player/PlayerType.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/player/RegisteredPlayer.java -text
 forge-gui/src/main/java/forge/game/player/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/zone/MagicStack.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/zone/PlayerZone.java svneol=native#text/plain

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

@@ -34,6 +34,7 @@ import com.mortennobel.imagescaling.ResampleOp;
 
 import forge.card.CardRules;
 import forge.card.CardSplitType;
+import forge.game.card.Card;
 import forge.game.player.IHasIcon;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinIcon;

forge-gui/src/main/java/forge/card/CardCharacteristics.java

@@ -25,12 +25,12 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.google.common.collect.Lists;
 
-import forge.CardColor;
 import forge.card.mana.ManaCost;
 import forge.card.replacement.ReplacementEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
+import forge.game.card.CardColor;
 
 /**
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/card/TriggerReplacementBase.java

@@ -5,14 +5,14 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardUtil;
-import forge.GameEntity;
 import forge.card.ability.AbilityUtils;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
+import forge.game.GameEntity;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardUtil;
 import forge.game.player.Player;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
@@ -33,7 +33,7 @@ public abstract class TriggerReplacementBase {
      * Getter for the field <code>hostCard</code>.
      * </p>
      * 
-     * @return a {@link forge.Card} object.
+     * @return a {@link forge.game.card.Card} object.
      */
     public final Card getHostCard() {
         return this.hostCard;
@@ -45,7 +45,7 @@ public abstract class TriggerReplacementBase {
      * </p>
      * 
      * @param c
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      */
     public final void setHostCard(final Card c) {
         this.hostCard = c;
@@ -107,7 +107,7 @@ public abstract class TriggerReplacementBase {
      * @param valids
      *            an array of {@link java.lang.String} objects.
      * @param srcCard
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @return a boolean.
      */
     public static boolean matchesValid(final Object o, final String[] valids, final Card srcCard) {

forge-gui/src/main/java/forge/card/ability/AbilityApiBased.java

@@ -2,7 +2,6 @@ package forge.card.ability;
 
 import java.util.Map;
 
-import forge.Card;
 import forge.card.ability.effects.ChangeZoneAllEffect;
 import forge.card.ability.effects.ChangeZoneEffect;
 import forge.card.ability.effects.ManaEffect;
@@ -12,6 +11,7 @@ import forge.card.cost.Cost;
 import forge.card.spellability.AbilityActivated;
 import forge.card.spellability.AbilityManaPart;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
 import forge.game.player.Player;
 
 public class AbilityApiBased extends AbilityActivated {

forge-gui/src/main/java/forge/card/ability/AbilityFactory.java

@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import forge.Card;
 import forge.card.CardCharacteristicName;
 import forge.card.cost.Cost;
 import forge.card.spellability.AbilitySub;
@@ -29,6 +28,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityCondition;
 import forge.card.spellability.SpellAbilityRestriction;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
 import forge.game.zone.ZoneType;
 import forge.util.FileSection;
 
@@ -88,7 +88,7 @@ public final class AbilityFactory {
      * @param abString
      *            a {@link java.lang.String} object.
      * @param hostCard
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @return a {@link forge.card.spellability.SpellAbility} object.
      */
     public static final SpellAbility getAbility(final String abString, final Card hostCard) {

forge-gui/src/main/java/forge/card/ability/AbilityUtils.java

@@ -10,11 +10,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardUtil;
-import forge.CounterType;
-import forge.GameObject;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.cost.Cost;
 import forge.card.mana.ManaCostBeingPaid;
@@ -24,8 +19,13 @@ import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityStackInstance;
 import forge.game.Game;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardUtil;
+import forge.game.card.CounterType;
 import forge.game.player.HumanPlay;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
@@ -70,7 +70,7 @@ public class AbilityUtils {
      * </p>
      * 
      * @param hostCard
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param def
      *            a {@link java.lang.String} object.
      * @param sa
@@ -287,7 +287,7 @@ public class AbilityUtils {
      * </p>
      * 
      * @param card
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param amount
      *            a {@link java.lang.String} object.
      * @param ability
@@ -596,7 +596,7 @@ public class AbilityUtils {
      * </p>
      * 
      * @param card
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param def
      *            a {@link java.lang.String} object.
      * @param sa
@@ -718,7 +718,7 @@ public class AbilityUtils {
      * </p>
      * 
      * @param card
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param def
      *            a {@link java.lang.String} object.
      * @param sa
@@ -1002,7 +1002,7 @@ public class AbilityUtils {
      * </p>
      * 
      * @param card
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param def
      *            a {@link java.lang.String} object.
      * @param sa
@@ -1238,7 +1238,7 @@ public class AbilityUtils {
      * </p>
      * 
      * @param c
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param s
      *            a {@link java.lang.String} object.
      * @param sa

forge-gui/src/main/java/forge/card/ability/SaTargetRoutines.java

@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
-import forge.Card;
-import forge.GameObject;
 import forge.card.spellability.SpellAbility;
+import forge.game.GameObject;
+import forge.game.card.Card;
 import forge.game.player.Player;
 
 // Class contains all that methods that are used by both effects and AI to fetch their targets.

forge-gui/src/main/java/forge/card/ability/SpellAbilityAi.java

@@ -6,12 +6,12 @@ import java.util.List;
 
 import com.google.common.collect.Iterables;
 
-import forge.Card;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/SpellApiBased.java

@@ -2,7 +2,6 @@ package forge.card.ability;
 
 import java.util.Map;
 
-import forge.Card;
 import forge.card.ability.effects.ChangeZoneAllEffect;
 import forge.card.ability.effects.ChangeZoneEffect;
 import forge.card.ability.effects.ManaEffect;
@@ -11,6 +10,7 @@ import forge.card.cost.Cost;
 import forge.card.spellability.AbilityManaPart;
 import forge.card.spellability.Spell;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
 
 public class SpellApiBased extends Spell {
     private static final long serialVersionUID = -6741797239508483250L;

forge-gui/src/main/java/forge/card/ability/ai/AnimateAi.java

@@ -4,13 +4,13 @@ import java.util.List;
 
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardPredicates;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/AttachAi.java

@@ -11,11 +11,6 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.CardUtil;
-import forge.GameObject;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.ApiType;
 import forge.card.ability.SpellAbilityAi;
@@ -26,10 +21,15 @@ import forge.card.spellability.TargetRestrictions;
 import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerType;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
+import forge.game.card.CardUtil;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java

@@ -2,11 +2,11 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/BecomesBlockedAi.java

@@ -3,13 +3,13 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/card/ability/ai/BondAi.java

@@ -19,10 +19,10 @@ package forge.card.ability.ai;
 
 import java.util.Collection;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
 import forge.game.player.Player;
 
 /**

forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAi.java

@@ -11,12 +11,6 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.CardPredicates.Presets;
-import forge.GameEntity;
-import forge.GameObject;
 import forge.card.CardCharacteristicName;
 import forge.card.MagicColor;
 import forge.card.ability.AbilityUtils;
@@ -31,6 +25,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.card.trigger.TriggerType;
 import forge.game.Game;
+import forge.game.GameEntity;
+import forge.game.GameObject;
 import forge.game.GlobalRuleChange;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.AiBlockController;
@@ -38,6 +34,10 @@ import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -445,7 +445,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * 
      * @param list
      *            a {@link forge.CardList} object.
-     * @return a {@link forge.Card} object.
+     * @return a {@link forge.game.card.Card} object.
      */
     private static Card basicManaFixing(final Player ai, final List<Card> list) { // Search for a Basic Land
 

forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAllAi.java

@@ -3,8 +3,6 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -12,6 +10,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/card/ability/ai/ChooseCardAi.java

@@ -5,15 +5,15 @@ import java.util.Collections;
 import java.util.List;
 
 import com.google.common.base.Predicate;
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/ChooseCardNameAi.java

@@ -1,11 +1,11 @@
 package forge.card.ability.ai;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 

forge-gui/src/main/java/forge/card/ability/ai/ChooseSourceAi.java

@@ -4,9 +4,6 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.GameObject;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.ApiType;
 import forge.card.ability.SpellAbilityAi;
@@ -14,8 +11,11 @@ import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/CloneAi.java

@@ -2,12 +2,12 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/ControlExchangeAi.java

@@ -5,13 +5,13 @@ import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/ControlGainAi.java

@@ -23,14 +23,14 @@ import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/CopyPermanentAi.java

@@ -7,13 +7,13 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;

forge-gui/src/main/java/forge/card/ability/ai/CounterAi.java

@@ -1,6 +1,5 @@
 package forge.card.ability.ai;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cardfactory.CardFactoryUtil;
@@ -10,6 +9,7 @@ import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/card/ability/ai/CountersAi.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CounterType;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CounterType;
 import forge.util.Aggregates;
 
 
@@ -50,7 +50,7 @@ public abstract class CountersAi {
      *            a {@link java.lang.String} object.
      * @param amount
      *            a int.
-     * @return a {@link forge.Card} object.
+     * @return a {@link forge.game.card.Card} object.
      */
     public static Card chooseCursedTarget(final List<Card> list, final String type, final int amount) {
         Card choice;
@@ -83,7 +83,7 @@ public abstract class CountersAi {
      *            a {@link forge.CardList} object.
      * @param type
      *            a {@link java.lang.String} object.
-     * @return a {@link forge.Card} object.
+     * @return a {@link forge.game.card.Card} object.
      */
     public static Card chooseBoonTarget(final List<Card> list, final String type) {
         Card choice;

forge-gui/src/main/java/forge/card/ability/ai/CountersMoveAi.java

@@ -3,14 +3,14 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CounterType;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;

forge-gui/src/main/java/forge/card/ability/ai/CountersProliferateAi.java

@@ -4,12 +4,12 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CounterType;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtil;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/ai/CountersPutAi.java

@@ -6,9 +6,6 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CounterType;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -18,6 +15,9 @@ import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CounterType;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/card/ability/ai/CountersPutAllAi.java

@@ -5,8 +5,6 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -15,6 +13,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/CountersPutOrRemoveAi.java

@@ -21,11 +21,11 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/CountersRemoveAi.java

@@ -1,13 +1,13 @@
 package forge.card.ability.ai;
 
-import forge.Card;
-import forge.CounterType;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CounterType;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 

forge-gui/src/main/java/forge/card/ability/ai/DamageAiBase.java

@@ -4,12 +4,12 @@ import java.util.List;
 
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardPredicates;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCombat;
+import forge.game.card.Card;
+import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/card/ability/ai/DamageAllAi.java

@@ -6,8 +6,6 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -17,6 +15,8 @@ import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/DamageDealAi.java

@@ -6,10 +6,6 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.GameObject;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -18,11 +14,15 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetChoices;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -136,7 +136,7 @@ public class DamageDealAi extends DamageAiBase {
      *            a {@link forge.game.player.Player} object.
      * @param mandatory
      *            a boolean.
-     * @return a {@link forge.Card} object.
+     * @return a {@link forge.game.card.Card} object.
      */
     private Card dealDamageChooseTgtC(final Player ai, final SpellAbility sa, final int d, final boolean noPrevention,
             final Player pl, final boolean mandatory) {

forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAi.java

@@ -3,20 +3,20 @@ package forge.card.ability.ai;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.GameObject;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAllAi.java

@@ -1,11 +1,11 @@
 package forge.card.ability.ai;
 
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 

forge-gui/src/main/java/forge/card/ability/ai/DebuffAi.java

@@ -8,8 +8,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -19,6 +17,8 @@ import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/card/ability/ai/DebuffAllAi.java

@@ -5,10 +5,10 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/DestroyAi.java

@@ -6,9 +6,6 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CounterType;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -19,6 +16,9 @@ import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/DestroyAllAi.java

@@ -5,14 +5,14 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/DigAi.java

@@ -2,11 +2,11 @@ package forge.card.ability.ai;
 
 import java.util.Random;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtil;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;

forge-gui/src/main/java/forge/card/ability/ai/DigUntilAi.java

@@ -3,13 +3,13 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/card/ability/ai/DiscardAi.java

@@ -3,7 +3,6 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -12,6 +11,7 @@ import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;

forge-gui/src/main/java/forge/card/ability/ai/DrainManaAi.java

@@ -3,11 +3,11 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/card/ability/ai/DrawAi.java

@@ -18,7 +18,6 @@
  */
 package forge.card.ability.ai;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -32,6 +31,7 @@ import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;

forge-gui/src/main/java/forge/card/ability/ai/EffectAi.java

@@ -6,8 +6,6 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.ApiType;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
@@ -16,6 +14,8 @@ import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/card/ability/ai/EncodeAi.java

@@ -22,11 +22,11 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;

forge-gui/src/main/java/forge/card/ability/ai/FightAi.java

@@ -3,14 +3,14 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/card/ability/ai/LegendaryRuleAi.java

@@ -4,9 +4,9 @@ import java.util.Collection;
 
 import com.google.common.collect.Iterables;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
+import forge.game.card.Card;
 import forge.game.player.Player;
 
 /** 

forge-gui/src/main/java/forge/card/ability/ai/LifeGainAi.java

@@ -1,6 +1,5 @@
 package forge.card.ability.ai;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -12,6 +11,7 @@ import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 

forge-gui/src/main/java/forge/card/ability/ai/LifeLoseAi.java

@@ -1,7 +1,6 @@
 package forge.card.ability.ai;
 
 import java.util.List;
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -10,6 +9,7 @@ import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 

forge-gui/src/main/java/forge/card/ability/ai/LifeSetAi.java

@@ -2,13 +2,13 @@ package forge.card.ability.ai;
 
 import java.util.Random;
 
-import forge.Card;
-import forge.CounterType;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CounterType;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/MillAi.java

@@ -2,7 +2,6 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -11,6 +10,7 @@ import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;

forge-gui/src/main/java/forge/card/ability/ai/MustBlockAi.java

@@ -4,15 +4,15 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/PermanentCreatureAi.java

@@ -5,12 +5,12 @@ import java.util.List;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardPredicates;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
+import forge.game.card.Card;
+import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/card/ability/ai/PhasesAi.java

@@ -3,13 +3,13 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/PlayAi.java

@@ -7,8 +7,6 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -17,6 +15,8 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/card/ability/ai/PoisonAi.java

@@ -2,7 +2,6 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -10,6 +9,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 

forge-gui/src/main/java/forge/card/ability/ai/PowerExchangeAi.java

@@ -6,13 +6,13 @@ import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/ProtectAi.java

@@ -5,8 +5,6 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.MagicColor;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
@@ -19,6 +17,8 @@ import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/ProtectAllAi.java

@@ -1,11 +1,11 @@
 package forge.card.ability.ai;
 
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
 import forge.game.player.Player;
 
 public class ProtectAllAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/card/ability/ai/PumpAi.java

@@ -4,9 +4,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -20,6 +17,9 @@ import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/PumpAiBase.java

@@ -7,16 +7,16 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.CardUtil;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
+import forge.game.card.CardUtil;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseHandler;

forge-gui/src/main/java/forge/card/ability/ai/PumpAllAi.java

@@ -6,8 +6,6 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
@@ -15,6 +13,8 @@ import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/card/ability/ai/RegenerateAi.java

@@ -20,20 +20,20 @@ package forge.card.ability.ai;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.GameObject;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/RegenerateAllAi.java

@@ -2,17 +2,17 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.GameObject;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.combat.Combat;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/RepeatEachAi.java

@@ -5,12 +5,12 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
-import forge.CounterType;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CounterType;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/ai/RevealAi.java

@@ -2,11 +2,11 @@ package forge.card.ability.ai;
 
 import java.util.Random;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/card/ability/ai/RevealHandAi.java

@@ -2,11 +2,11 @@ package forge.card.ability.ai;
 
 import java.util.Random;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/card/ability/ai/RollPlanarDiceAi.java

@@ -1,11 +1,11 @@
 package forge.card.ability.ai;
 
 
-import forge.Card;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.AiController;
 import forge.game.ai.AiProps;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerControllerAi;

forge-gui/src/main/java/forge/card/ability/ai/SacrificeAi.java

@@ -2,15 +2,15 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/ai/SacrificeAllAi.java

@@ -3,14 +3,14 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/StoreSVarAi.java

@@ -3,15 +3,15 @@ package forge.card.ability.ai;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCombat;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseHandler;

forge-gui/src/main/java/forge/card/ability/ai/TapAi.java

@@ -2,12 +2,12 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtil;
+import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/TapAiBase.java

@@ -5,16 +5,16 @@ import java.util.List;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.CardPredicates.Presets;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -101,7 +101,7 @@ public abstract class TapAiBase extends SpellAbilityAi  {
      * </p>
      * 
      * @param source
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param tgt
      *            a {@link forge.card.spellability.TargetRestrictions} object.
      * @param af

forge-gui/src/main/java/forge/card/ability/ai/TapAllAi.java

@@ -6,13 +6,13 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.CombatUtil;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -102,7 +102,7 @@ public class TapAllAi extends SpellAbilityAi {
      * @param valid
      *            a {@link java.lang.String} object.
      * @param source
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @return a {@link forge.CardList} object.
      */
     private List<Card> getTapAllTargets(final String valid, final Card source) {

forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAi.java

@@ -3,10 +3,10 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/card/ability/ai/TokenAi.java

@@ -2,7 +2,6 @@ package forge.card.ability.ai;
 
 import java.util.Random;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -12,6 +11,7 @@ import forge.game.Game;
 import forge.game.ai.ComputerUtil;
 import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/card/ability/ai/TwoPilesAi.java

@@ -3,12 +3,12 @@ package forge.card.ability.ai;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/ai/UnattachAllAi.java

@@ -4,15 +4,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.GameObject;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.GameObject;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilMana;
+import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/ai/UntapAi.java

@@ -3,9 +3,6 @@ package forge.card.ability.ai;
 import java.util.List;
 import java.util.Random;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.cost.Cost;
@@ -13,6 +10,9 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
 import forge.game.ai.ComputerUtilCost;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
@@ -230,7 +230,7 @@ public class UntapAi extends SpellAbilityAi {
      * </p>
      * 
      * @param source
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param tgt
      *            a {@link forge.card.spellability.TargetRestrictions} object.
      * @param af

forge-gui/src/main/java/forge/card/ability/ai/UntapAllAi.java

@@ -2,11 +2,11 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/ai/ZoneExchangeAi.java

@@ -2,12 +2,12 @@ package forge.card.ability.ai;
 
 import java.util.ArrayList;
 import java.util.List;
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/card/ability/effects/AbandonEffect.java

@@ -1,10 +1,10 @@
 package forge.card.ability.effects;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.trigger.TriggerType;
 import forge.game.Game;
+import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/effects/AnimateAllEffect.java

@@ -5,9 +5,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardUtil;
 import forge.Command;
 import forge.card.TriggerReplacementBase;
 import forge.card.ability.AbilityFactory;
@@ -19,6 +16,9 @@ import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardUtil;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/effects/AnimateEffect.java

@@ -5,8 +5,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import forge.Card;
-import forge.CardUtil;
 import forge.Command;
 import forge.card.TriggerReplacementBase;
 import forge.card.ability.AbilityFactory;
@@ -18,6 +16,8 @@ import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardUtil;
 import forge.game.event.GameEventCardStatsChanged;
 
 public class AnimateEffect extends AnimateEffectBase {

forge-gui/src/main/java/forge/card/ability/effects/AnimateEffectBase.java

@@ -19,12 +19,12 @@ package forge.card.ability.effects;
 
 import java.util.ArrayList;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.replacement.ReplacementEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.staticability.StaticAbility;
 import forge.card.trigger.Trigger;
+import forge.game.card.Card;
 
 public abstract class AnimateEffectBase extends SpellAbilityEffect {
 
@@ -34,7 +34,7 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect {
      * </p>
      * 
      * @param c
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param af
      *            a {@link forge.card.ability.AbilityFactory} object.
      * @param power
@@ -115,7 +115,7 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect {
      * </p>
      * 
      * @param c
-     *            a {@link forge.Card} object.
+     *            a {@link forge.game.card.Card} object.
      * @param originalPower
      *            a int.
      * @param originalToughness

forge-gui/src/main/java/forge/card/ability/effects/AttachEffect.java

@@ -3,17 +3,17 @@ package forge.card.ability.effects;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
 import forge.Command;
-import forge.GameEntity;
-import forge.GameObject;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.ApiType;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.GameEntity;
+import forge.game.GameObject;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.Lang;

forge-gui/src/main/java/forge/card/ability/effects/BalanceEffect.java

@@ -3,11 +3,11 @@ package forge.card.ability.effects;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/effects/BecomesBlockedEffect.java

@@ -6,13 +6,13 @@ import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.Card;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.card.trigger.TriggerType;
 import forge.game.Game;
+import forge.game.card.Card;
 
 public class BecomesBlockedEffect extends SpellAbilityEffect {
 

forge-gui/src/main/java/forge/card/ability/effects/BondEffect.java

@@ -2,10 +2,10 @@ package forge.card.ability.effects;
 
 import java.util.List;
 
-import forge.Card;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
+import forge.game.card.Card;
 import forge.game.zone.ZoneType;
 
 public class BondEffect extends SpellAbilityEffect {

forge-gui/src/main/java/forge/card/ability/effects/ChangeTargetsEffect.java

@@ -8,11 +8,11 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.collect.Iterables;
 
-import forge.GameObject;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityStackInstance;
 import forge.card.spellability.TargetChoices;
+import forge.game.GameObject;
 import forge.game.player.Player;
 import forge.game.zone.MagicStack;
 import forge.util.Aggregates;

forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java

@@ -4,14 +4,14 @@ import java.util.ArrayList;
 import java.util.List;
 import com.google.common.collect.Iterables;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
 import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 

forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java

@@ -8,12 +8,6 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
-import forge.CardUtil;
-import forge.CounterType;
-import forge.GameEntity;
 import forge.Singletons;
 import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
@@ -25,6 +19,12 @@ import forge.card.spellability.SpellAbilityStackInstance;
 import forge.card.spellability.TargetRestrictions;
 import forge.card.trigger.TriggerType;
 import forge.game.Game;
+import forge.game.GameEntity;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
+import forge.game.card.CardUtil;
+import forge.game.card.CounterType;
 import forge.game.combat.Combat;
 import forge.game.player.Player;
 import forge.game.zone.Zone;

forge-gui/src/main/java/forge/card/ability/effects/CharmEffect.java

@@ -3,11 +3,11 @@ package forge.card.ability.effects;
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.Card;
 import forge.card.ability.AbilityFactory;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
+import forge.game.card.Card;
 import forge.game.player.Player;
 
 public class CharmEffect extends SpellAbilityEffect {

forge-gui/src/main/java/forge/card/ability/effects/ChooseCardEffect.java

@@ -5,15 +5,15 @@ import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.card.CardType;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.cardfactory.CardFactoryUtil;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;

forge-gui/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java

@@ -10,9 +10,6 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates.Presets;
 import forge.Singletons;
 import forge.card.CardRules;
 import forge.card.CardRulesPredicates;
@@ -21,6 +18,9 @@ import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates.Presets;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;

forge-gui/src/main/java/forge/card/ability/effects/ChooseColorEffect.java

@@ -4,15 +4,15 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import forge.Card;
-import forge.CardLists;
-import forge.CardPredicates;
 import forge.card.MagicColor;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.card.Card;
+import forge.game.card.CardLists;
+import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;

forge-gui/src/main/java/forge/card/ability/effects/ChooseGenericEffect.java

@@ -7,13 +7,13 @@ import java.util.Map;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
-import forge.Card;
 import forge.card.ability.AbilityFactory;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetRestrictions;
+import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.gui.GuiChoose;
 import forge.util.Aggregates;