arrange packages

.gitattributes

@@ -14689,383 +14689,132 @@ forge-gui/src/main/java/forge/FThreads.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/ai/AiAttackController.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/AiBlockController.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/AiController.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/AiProfileUtil.java -text
+forge-gui/src/main/java/forge/ai/ComputerUtil.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/ComputerUtilCard.java -text
+forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java -text
+forge-gui/src/main/java/forge/ai/ComputerUtilCost.java -text
+forge-gui/src/main/java/forge/ai/ComputerUtilMana.java -text
+forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java -text
+forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java -text
+forge-gui/src/main/java/forge/ai/ability/AnimateAi.java -text
+forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/AttachAi.java -text
+forge-gui/src/main/java/forge/ai/ability/BalanceAi.java -text
+forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java -text
+forge-gui/src/main/java/forge/ai/ability/BondAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CharmAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ClashAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CloneAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CounterAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CountersAi.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java -text
+forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java -text
+forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DebuffAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DestroyAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DigAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DiscardAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java -text
+forge-gui/src/main/java/forge/ai/ability/DrawAi.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/ability/EffectAi.java -text
+forge-gui/src/main/java/forge/ai/ability/EncodeAi.java -text
+forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java -text
+forge-gui/src/main/java/forge/ai/ability/FightAi.java -text
+forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java -text
+forge-gui/src/main/java/forge/ai/ability/FogAi.java -text
+forge-gui/src/main/java/forge/ai/ability/GameLossAi.java -text
+forge-gui/src/main/java/forge/ai/ability/GameWinAi.java -text
+forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java -text
+forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java -text
+forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java -text
+forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java -text
+forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java -text
+forge-gui/src/main/java/forge/ai/ability/MillAi.java -text
+forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java -text
+forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PhasesAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PlayAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PoisonAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ProtectAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PumpAi.java -text
+forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java -text
+forge-gui/src/main/java/forge/ai/ability/PumpAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java svneol=native#text/plain
+forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RepeatAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RevealAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java -text
+forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java -text
+forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java -text
+forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java -text
+forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ScryAi.java -text
+forge-gui/src/main/java/forge/ai/ability/SetStateAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java -text
+forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java -text
+forge-gui/src/main/java/forge/ai/ability/TapAi.java -text
+forge-gui/src/main/java/forge/ai/ability/TapAiBase.java -text
+forge-gui/src/main/java/forge/ai/ability/TapAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/TapOrUntapAi.java -text
+forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/TokenAi.java -text
+forge-gui/src/main/java/forge/ai/ability/TwoPilesAi.java -text
+forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/UntapAi.java -text
+forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java -text
+forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text
 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
 forge-gui/src/main/java/forge/card/MetaSet.java -text
-forge-gui/src/main/java/forge/card/TriggerReplacementBase.java -text
 forge-gui/src/main/java/forge/card/UnOpenedMeta.java -text
-forge-gui/src/main/java/forge/card/ability/AbilityApiBased.java -text
-forge-gui/src/main/java/forge/card/ability/AbilityFactory.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/ability/AbilityUtils.java -text
-forge-gui/src/main/java/forge/card/ability/ApiType.java -text
-forge-gui/src/main/java/forge/card/ability/SaTargetRoutines.java -text
-forge-gui/src/main/java/forge/card/ability/SpellAbilityAi.java -text
-forge-gui/src/main/java/forge/card/ability/SpellAbilityEffect.java -text
-forge-gui/src/main/java/forge/card/ability/SpellApiBased.java -text
-forge-gui/src/main/java/forge/card/ability/ai/AddPhaseAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/AddTurnAi.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/ability/ai/AlwaysPlayAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/AnimateAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/AnimateAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/AttachAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/BecomesBlockedAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/BondAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CanPlayAsDrawbackAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CannotPlayAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChangeTargetsAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CharmAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChooseCardAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChooseCardNameAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChooseColorAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChoosePlayerAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChooseSourceAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ChooseTypeAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ClashAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CloneAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ControlExchangeAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ControlGainAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CopyPermanentAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CounterAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CountersAi.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/ability/ai/CountersMoveAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CountersProliferateAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CountersPutAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CountersPutAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CountersPutOrRemoveAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/CountersRemoveAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DamageAiBase.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DamageAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DamageDealAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DamageEachAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DamagePreventAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DebuffAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DebuffAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DelayedTriggerAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DestroyAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DestroyAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DigAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DigUntilAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DiscardAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DrainManaAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/DrawAi.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/ability/ai/EffectAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/EncodeAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/EndTurnAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/FightAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/FlipACoinAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/FogAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/GameLossAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/GameWinAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/LegendaryRuleAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/LifeExchangeAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/LifeGainAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/LifeLoseAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/LifeSetAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ManaEffectAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/MillAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/MustAttackAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/MustBlockAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PeekAndRevealAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PermanentCreatureAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PhasesAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PlayAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PoisonAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PowerExchangeAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ProtectAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ProtectAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PumpAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PumpAiBase.java -text
-forge-gui/src/main/java/forge/card/ability/ai/PumpAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RearrangeTopOfLibraryAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RegenerateAi.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/ability/ai/RegenerateAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RemoveFromCombatAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RepeatAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RepeatEachAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RestartGameAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RevealAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RevealAiBase.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RevealHandAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/RollPlanarDiceAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/SacrificeAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/SacrificeAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ScryAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/SetStateAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ShuffleAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/StoreSVarAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/TapAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/TapAiBase.java -text
-forge-gui/src/main/java/forge/card/ability/ai/TapAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/TapOrUntapAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/TokenAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/TwoPilesAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/UnattachAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/UntapAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/UntapAllAi.java -text
-forge-gui/src/main/java/forge/card/ability/ai/ZoneExchangeAi.java -text
-forge-gui/src/main/java/forge/card/ability/effects/AbandonEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/AddPhaseEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/AddTurnEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/AnimateAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/AnimateEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/AnimateEffectBase.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/ability/effects/AttachEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/BalanceEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/BecomesBlockedEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/BondEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChangeTargetsEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CharmEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChooseCardEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChooseCardNameEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChooseColorEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChooseGenericEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChooseSourceEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ChooseTypeEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ClashEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CleanUpEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CloneEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ControlExchangeEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ControlGainEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CopyPermanentEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CopySpellAbilityEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CounterEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CountersMoveEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CountersProliferateEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CountersPutAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CountersPutEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CountersPutOrRemoveEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/CountersRemoveEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DamageAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DamageDealEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DamageEachEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DamagePreventAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DamagePreventEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DebuffAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DebuffEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DeclareCombatantsEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DelayedTriggerEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DestroyAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DestroyEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DigEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DigUntilEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DrainManaEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/DrawEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ETBReplacementEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/EffectEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/EncodeEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/EndTurnEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/FightEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/FlipCoinEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/FogEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/GameLossEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/GameWinEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/LifeExchangeEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/LifeGainEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/LifeLoseEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/LifeSetEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ManaEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ManaReflectedEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/MillEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/MustAttackEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/MustBlockEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PeekAndRevealEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PermanentCreatureEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PermanentNoncreatureEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PhasesEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PlaneswalkEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PlayEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PoisonEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PowerExchangeEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ProtectAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ProtectEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PumpAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/PumpEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RearrangeTopOfLibraryEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RegenerateAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RegenerateEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RemoveFromCombatEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ReorderZoneEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RepeatEachEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RepeatEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RestartGameEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RevealEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RevealHandEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/RollPlanarDiceEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/SacrificeAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/SacrificeEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ScryEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/SetInMotionEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/SetStateEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ShuffleEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/SkipTurnEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/StoreSVarEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/TapAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/TapEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/TapOrUntapEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/TokenEffect.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/ability/effects/TwoPilesEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/UnattachAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/UntapAllEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/UntapEffect.java -text
-forge-gui/src/main/java/forge/card/ability/effects/ZoneExchangeEffect.java -text
-forge-gui/src/main/java/forge/card/ability/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/cardfactory/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/cost/Cost.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/cost/CostAddMana.java -text
-forge-gui/src/main/java/forge/card/cost/CostDamage.java -text
-forge-gui/src/main/java/forge/card/cost/CostDiscard.java -text
-forge-gui/src/main/java/forge/card/cost/CostDraw.java -text
-forge-gui/src/main/java/forge/card/cost/CostExile.java -text
-forge-gui/src/main/java/forge/card/cost/CostExileAndPay.java -text
-forge-gui/src/main/java/forge/card/cost/CostExiledMoveToGrave.java -text
-forge-gui/src/main/java/forge/card/cost/CostFlipCoin.java -text
-forge-gui/src/main/java/forge/card/cost/CostGainControl.java -text
-forge-gui/src/main/java/forge/card/cost/CostGainLife.java -text
-forge-gui/src/main/java/forge/card/cost/CostMill.java -text
-forge-gui/src/main/java/forge/card/cost/CostPart.java -text
-forge-gui/src/main/java/forge/card/cost/CostPartMana.java -text
-forge-gui/src/main/java/forge/card/cost/CostPartWithList.java -text
-forge-gui/src/main/java/forge/card/cost/CostPayLife.java -text
-forge-gui/src/main/java/forge/card/cost/CostPayment.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/cost/CostPutCardToLib.java -text
-forge-gui/src/main/java/forge/card/cost/CostPutCounter.java -text
-forge-gui/src/main/java/forge/card/cost/CostRemoveAnyCounter.java -text
-forge-gui/src/main/java/forge/card/cost/CostRemoveCounter.java -text
-forge-gui/src/main/java/forge/card/cost/CostReturn.java -text
-forge-gui/src/main/java/forge/card/cost/CostReveal.java -text
-forge-gui/src/main/java/forge/card/cost/CostSacrifice.java -text
-forge-gui/src/main/java/forge/card/cost/CostTap.java -text
-forge-gui/src/main/java/forge/card/cost/CostTapType.java -text
-forge-gui/src/main/java/forge/card/cost/CostUnattach.java -text
-forge-gui/src/main/java/forge/card/cost/CostUntap.java -text
-forge-gui/src/main/java/forge/card/cost/CostUntapType.java -text
-forge-gui/src/main/java/forge/card/cost/PaymentDecision.java -text
-forge-gui/src/main/java/forge/card/cost/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/mana/Mana.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/mana/ManaCostBeingPaid.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/mana/ManaPool.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/mana/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/replacement/ReplaceCounter.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceDamage.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceDestroy.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceDiscard.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceDraw.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceGainLife.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceGameLoss.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceMoved.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceProduceMana.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceSetInMotion.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceTurnFaceUp.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplaceUntap.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplacementEffect.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplacementHandler.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplacementLayer.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplacementResult.java -text
-forge-gui/src/main/java/forge/card/replacement/ReplacementType.java -text
-forge-gui/src/main/java/forge/card/replacement/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/Ability.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/AbilityActivated.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/AbilityManaPart.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/AbilityStatic.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/AbilitySub.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/AbilityTriggered.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/ISpellAbility.java -text
-forge-gui/src/main/java/forge/card/spellability/OptionalCost.java -text
-forge-gui/src/main/java/forge/card/spellability/Spell.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/SpellAbility.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/SpellAbilityCondition.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/SpellAbilityRestriction.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/SpellAbilityStackInstance.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/SpellAbilityVariables.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/SpellPermanent.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/TargetChoices.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/TargetSelection.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/spellability/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/staticability/StaticAbility.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantAttackBlock.java -text
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantBeCast.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityCantTarget.java -text
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityContinuous.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityCostChange.java -text
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityETBTapped.java -text
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityMayLookAt.java -text
-forge-gui/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/staticability/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/Trigger.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerAlways.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerAttached.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerAttackerBlocked.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerAttackerUnblocked.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerAttackersDeclared.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerAttacks.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerBecomeMonstrous.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerBecomesTarget.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerBlockersDeclared.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerBlocks.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerChampioned.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerChangesController.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerChangesZone.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerClashed.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerCombatDamageDoneOnce.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerCounterAdded.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerCounterRemoved.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerCountered.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerCycled.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerDamageDone.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerDestroyed.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerDevoured.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerDiscarded.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerDrawn.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerEvolved.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerFlippedCoin.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerHandler.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerLandPlayed.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerLifeGained.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerLifeLost.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerLosesGame.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerNewGame.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerPayCumulativeUpkeep.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerPhase.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerPlanarDice.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerSacrificed.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerScry.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerSetInMotion.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerShuffled.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerTaps.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerTapsForMana.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerTransformed.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerTurnFaceUp.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerType.java -text
-forge-gui/src/main/java/forge/card/trigger/TriggerUnequip.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerUntaps.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/TriggerWaiting.java -text
-forge-gui/src/main/java/forge/card/trigger/WrappedAbility.java -text
-forge-gui/src/main/java/forge/card/trigger/ZCTrigger.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/trigger/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/control/ChatArea.java -text
 forge-gui/src/main/java/forge/control/FControl.java -text
 forge-gui/src/main/java/forge/control/FControlGameEventHandler.java -text
@@ -15099,15 +14848,129 @@ 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/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/TriggerReplacementBase.java -text
-forge-gui/src/main/java/forge/game/ai/AiBlockController.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java -text
-forge-gui/src/main/java/forge/game/ai/AiController.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/ability/AbilityFactory.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java -text
+forge-gui/src/main/java/forge/game/ability/AbilityUtils.java -text
-forge-gui/src/main/java/forge/game/ai/ComputerUtil.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/ability/ApiType.java -text
-forge-gui/src/main/java/forge/game/ai/ComputerUtilCard.java -text
+forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java -text
-forge-gui/src/main/java/forge/game/ai/ComputerUtilCombat.java -text
+forge-gui/src/main/java/forge/game/ability/SpellAbilityAi.java -text
-forge-gui/src/main/java/forge/game/ai/ComputerUtilCost.java -text
+forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java -text
-forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java -text
+forge-gui/src/main/java/forge/game/ability/SpellApiBased.java -text
+forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/AddPhaseEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/AddTurnEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/AnimateAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/AnimateEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/AnimateEffectBase.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/ability/effects/AttachEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/BalanceEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/BondEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CharmEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChooseColorEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ClashEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CleanUpEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ControlGainEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CountersMoveEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DamageAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DamageDealEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DamagePreventEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DebuffAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DebuffEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DestroyAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DestroyEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DigEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DigUntilEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DrainManaEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/DrawEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/EffectEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/EncodeEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/EndTurnEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/FightEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/FlipCoinEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/FogEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/GameLossEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/GameWinEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/LifeGainEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/LifeLoseEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/LifeSetEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ManaEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/MillEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/MustAttackEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/MustBlockEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PhasesEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PlayEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PoisonEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ProtectAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ProtectEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RegenerateEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RestartGameEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RevealEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RevealHandEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/SacrificeEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ScryEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/SetInMotionEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/SetStateEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ShuffleEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/SkipTurnEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/TapAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/TapEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/ability/effects/TwoPilesEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/UnattachAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/UntapAllEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java -text
+forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java -text
+forge-gui/src/main/java/forge/game/ability/package-info.java svneol=native#text/plain
 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
@@ -15123,6 +14986,37 @@ 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
 forge-gui/src/main/java/forge/game/combat/CombatUtil.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/cost/Cost.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/cost/CostAddMana.java -text
+forge-gui/src/main/java/forge/game/cost/CostDamage.java -text
+forge-gui/src/main/java/forge/game/cost/CostDiscard.java -text
+forge-gui/src/main/java/forge/game/cost/CostDraw.java -text
+forge-gui/src/main/java/forge/game/cost/CostExile.java -text
+forge-gui/src/main/java/forge/game/cost/CostExileAndPay.java -text
+forge-gui/src/main/java/forge/game/cost/CostExiledMoveToGrave.java -text
+forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java -text
+forge-gui/src/main/java/forge/game/cost/CostGainControl.java -text
+forge-gui/src/main/java/forge/game/cost/CostGainLife.java -text
+forge-gui/src/main/java/forge/game/cost/CostMill.java -text
+forge-gui/src/main/java/forge/game/cost/CostPart.java -text
+forge-gui/src/main/java/forge/game/cost/CostPartMana.java -text
+forge-gui/src/main/java/forge/game/cost/CostPartWithList.java -text
+forge-gui/src/main/java/forge/game/cost/CostPayLife.java -text
+forge-gui/src/main/java/forge/game/cost/CostPayment.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java -text
+forge-gui/src/main/java/forge/game/cost/CostPutCounter.java -text
+forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java -text
+forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java -text
+forge-gui/src/main/java/forge/game/cost/CostReturn.java -text
+forge-gui/src/main/java/forge/game/cost/CostReveal.java -text
+forge-gui/src/main/java/forge/game/cost/CostSacrifice.java -text
+forge-gui/src/main/java/forge/game/cost/CostTap.java -text
+forge-gui/src/main/java/forge/game/cost/CostTapType.java -text
+forge-gui/src/main/java/forge/game/cost/CostUnattach.java -text
+forge-gui/src/main/java/forge/game/cost/CostUntap.java -text
+forge-gui/src/main/java/forge/game/cost/CostUntapType.java -text
+forge-gui/src/main/java/forge/game/cost/PaymentDecision.java -text
+forge-gui/src/main/java/forge/game/cost/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/event/EventValueChangeType.java -text
 forge-gui/src/main/java/forge/game/event/GameEvent.java -text
 forge-gui/src/main/java/forge/game/event/GameEventAnteCardsSelected.java -text
@@ -15178,6 +15072,10 @@ forge-gui/src/main/java/forge/game/limited/ReadDraftRankings.java -text
 forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/limited/SealedDeckBuilder.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/limited/package-info.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/mana/Mana.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/mana/ManaPool.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/mana/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/package-info.java -text
 forge-gui/src/main/java/forge/game/phase/EndOfTurn.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/phase/ExtraTurn.java -text
@@ -15203,6 +15101,108 @@ 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/replacement/ReplaceCounter.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceDestroy.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceDiscard.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceDraw.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceGainLife.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceGameLoss.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceMoved.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceProduceMana.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceSetInMotion.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplaceUntap.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplacementHandler.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplacementLayer.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplacementResult.java -text
+forge-gui/src/main/java/forge/game/replacement/ReplacementType.java -text
+forge-gui/src/main/java/forge/game/replacement/package-info.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/Ability.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/AbilityActivated.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/AbilityManaPart.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/AbilityStatic.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/AbilitySub.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/HumanPlaySpellAbility.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/ISpellAbility.java -text
+forge-gui/src/main/java/forge/game/spellability/OptionalCost.java -text
+forge-gui/src/main/java/forge/game/spellability/Spell.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/SpellAbility.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/SpellAbilityVariables.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/SpellPermanent.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/TargetChoices.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/TargetRestrictions.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/TargetSelection.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/spellability/package-info.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/staticability/StaticAbility.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java -text
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java -text
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java -text
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java -text
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java -text
+forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/staticability/package-info.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/Trigger.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerAlways.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerAttached.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerAttacks.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerBecomesTarget.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerBlocks.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerChampioned.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerChangesController.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerClashed.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerCounterAdded.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerCounterRemoved.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerCountered.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerCycled.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerDamageDone.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerDestroyed.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerDevoured.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerDiscarded.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerDrawn.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerEvolved.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerFlippedCoin.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerHandler.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerLandPlayed.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerLifeGained.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerLifeLost.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerLosesGame.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerNewGame.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerPhase.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerPlanarDice.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerSacrificed.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerScry.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerSetInMotion.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerShuffled.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerTaps.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerTapsForMana.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerTransformed.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerType.java -text
+forge-gui/src/main/java/forge/game/trigger/TriggerUnequip.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerUntaps.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/TriggerWaiting.java -text
+forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java -text
+forge-gui/src/main/java/forge/game/trigger/ZCTrigger.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/trigger/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/game/zone/PlayerZoneBattlefield.java svneol=native#text/plain

forge-gui/src/main/java/forge/ai/AiAttackController.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.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,8 +24,6 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
-import forge.card.trigger.Trigger;
-import forge.card.trigger.TriggerType;
 import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
@@ -33,6 +31,8 @@ import forge.game.card.CounterType;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.player.Player;
+import forge.game.trigger.Trigger;
+import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 
 

forge-gui/src/main/java/forge/ai/AiBlockController.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.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,10 +24,8 @@ import java.util.List;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 
-import forge.card.TriggerReplacementBase;
-import forge.card.trigger.Trigger;
-import forge.card.trigger.TriggerType;
 import forge.game.GameEntity;
+import forge.game.TriggerReplacementBase;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
@@ -35,6 +33,8 @@ import forge.game.card.CounterType;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.player.Player;
+import forge.game.trigger.Trigger;
+import forge.game.trigger.TriggerType;
 
 
 /**

forge-gui/src/main/java/forge/ai/AiController.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.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,25 +30,26 @@ import com.google.common.collect.Iterables;
 
 import forge.card.CardType;
 import forge.card.MagicColor;
-import forge.card.ability.ApiType;
 import forge.card.cardfactory.CardFactoryUtil;
-import forge.card.cost.CostDiscard;
-import forge.card.cost.CostPart;
-import forge.card.spellability.AbilityManaPart;
-import forge.card.spellability.Spell;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.SpellPermanent;
 import forge.game.GameActionUtil;
 import forge.game.Game;
 import forge.game.GameEntity;
+import forge.game.ability.ApiType;
+import forge.game.ai.AiProps;
 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.cost.CostDiscard;
+import forge.game.cost.CostPart;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.AbilityManaPart;
+import forge.game.spellability.Spell;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellPermanent;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.Expressions;
@@ -163,7 +164,7 @@ public class AiController {
      * 
      * @param l
      *            a {@link forge.CardList} object.
-     * @return an array of {@link forge.card.spellability.SpellAbility} objects.
+     * @return an array of {@link forge.game.spellability.SpellAbility} objects.
      */
     private ArrayList<SpellAbility> getSpellAbilities(final List<Card> l) {
         final ArrayList<SpellAbility> spellAbilities = new ArrayList<SpellAbility>();
@@ -442,7 +443,7 @@ public class AiController {
      * </p>
      * 
      * @param all
-     *            an array of {@link forge.card.spellability.SpellAbility}
+     *            an array of {@link forge.game.spellability.SpellAbility}
      *            objects.
      * @return a boolean.
      */
@@ -552,7 +553,7 @@ public class AiController {
      *            an array of {@link java.lang.String} objects. May be null for
      *            no restrictions.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a List<Card> of discarded cards.
      */
     public List<Card> getCardsToDiscard(final int numDiscard, final String[] uTypes, final SpellAbility sa) {

forge-gui/src/main/java/forge/ai/AiProfileUtil.java

@@ -15,8 +15,9 @@
  * 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.game.ai;
+package forge.ai;
 
+import forge.game.ai.AiProps;
 import forge.game.player.LobbyPlayer;
 import forge.game.player.LobbyPlayerAi;
 import forge.util.Aggregates;

forge-gui/src/main/java/forge/ai/ComputerUtil.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.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,26 +31,14 @@ import com.google.common.collect.Iterables;
 
 import forge.card.CardType;
 import forge.card.MagicColor;
-import forge.card.ability.AbilityFactory;
-import forge.card.ability.AbilityUtils;
-import forge.card.ability.ApiType;
-import forge.card.ability.effects.CharmEffect;
-import forge.card.cost.Cost;
-import forge.card.cost.CostDiscard;
-import forge.card.cost.CostPart;
-import forge.card.cost.CostPayment;
-import forge.card.cost.CostPutCounter;
-import forge.card.cost.CostSacrifice;
-import forge.card.spellability.AbilityManaPart;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.SpellAbilityStackInstance;
-import forge.card.spellability.TargetRestrictions;
-import forge.card.staticability.StaticAbility;
-import forge.card.trigger.Trigger;
-import forge.card.trigger.TriggerType;
 import forge.error.BugReporter;
 import forge.game.Game;
 import forge.game.GameObject;
+import forge.game.ability.AbilityFactory;
+import forge.game.ability.AbilityUtils;
+import forge.game.ability.ApiType;
+import forge.game.ability.effects.CharmEffect;
+import forge.game.ai.AiProps;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
@@ -59,10 +47,23 @@ import forge.game.card.CounterType;
 import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
+import forge.game.cost.Cost;
+import forge.game.cost.CostDiscard;
+import forge.game.cost.CostPart;
+import forge.game.cost.CostPayment;
+import forge.game.cost.CostPutCounter;
+import forge.game.cost.CostSacrifice;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerControllerAi;
+import forge.game.spellability.AbilityManaPart;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellAbilityStackInstance;
+import forge.game.spellability.TargetRestrictions;
+import forge.game.staticability.StaticAbility;
+import forge.game.trigger.Trigger;
+import forge.game.trigger.TriggerType;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
@@ -86,7 +87,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean.
      */
     public static boolean handlePlayingSpellAbility(final Player ai, final SpellAbility sa, final Game game) {
@@ -147,7 +148,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a int.
      */
     public static int counterSpellRestriction(final Player ai, final SpellAbility sa) {
@@ -218,7 +219,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      */
     public static final void playStack(final SpellAbility sa, final Player ai, final Game game) {
         sa.setActivatingPlayer(ai);
@@ -247,7 +248,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      */
     public static final void playSpellAbilityForFree(final Player ai, final SpellAbility sa) {
         sa.setActivatingPlayer(ai);
@@ -266,7 +267,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      */
     public static final void playSpellAbilityWithoutPayingManaCost(final Player ai, final SpellAbility sa, final Game game) {
         final SpellAbility newSA = sa.copyWithNoManaCost();
@@ -293,7 +294,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      */
     public static final void playNoStack(final Player ai, final SpellAbility sa, final Game game) {
         sa.setActivatingPlayer(ai);
@@ -1045,7 +1046,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean (returns true if it's better to wait until blockers are declared).
      */
     public static boolean waitForBlocking(final SpellAbility sa) {
@@ -1066,7 +1067,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean (returns true if it's better to wait until blockers are declared).
      */
     public static boolean castSpellInMain1(final Player ai, final SpellAbility sa) {
@@ -1132,7 +1133,7 @@ public class ComputerUtil {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean (returns true if the AI should stop using the ability).
      */
     public static boolean preventRunAwayActivations(final SpellAbility sa) {
@@ -1301,7 +1302,7 @@ public class ComputerUtil {
      * @param saviourAf
      *            a AbilityFactory object
      * @param topStack
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a {@link java.util.ArrayList} object.
      * @since 1.0.15
      */

forge-gui/src/main/java/forge/ai/ComputerUtilCard.java

@@ -1,4 +1,4 @@
-package forge.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,7 +21,6 @@ import forge.card.CardType;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.card.cardfactory.CardFactoryUtil;
-import forge.card.spellability.SpellAbility;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -31,6 +30,7 @@ import forge.game.card.CardPredicates;
 import forge.game.card.CardUtil;
 import forge.game.combat.Combat;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.item.PaperCard;
 import forge.util.Aggregates;
 

forge-gui/src/main/java/forge/ai/ComputerUtilCombat.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.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,27 +24,27 @@ import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.card.TriggerReplacementBase;
-import forge.card.ability.AbilityFactory;
-import forge.card.ability.AbilityUtils;
-import forge.card.ability.ApiType;
 import forge.card.cardfactory.CardFactoryUtil;
-import forge.card.replacement.ReplacementEffect;
-import forge.card.spellability.AbilityActivated;
-import forge.card.spellability.SpellAbility;
-import forge.card.staticability.StaticAbility;
-import forge.card.trigger.Trigger;
-import forge.card.trigger.TriggerHandler;
-import forge.card.trigger.TriggerType;
 import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.GlobalRuleChange;
+import forge.game.TriggerReplacementBase;
+import forge.game.ability.AbilityFactory;
+import forge.game.ability.AbilityUtils;
+import forge.game.ability.ApiType;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.player.Player;
+import forge.game.replacement.ReplacementEffect;
+import forge.game.spellability.AbilityActivated;
+import forge.game.spellability.SpellAbility;
+import forge.game.staticability.StaticAbility;
+import forge.game.trigger.Trigger;
+import forge.game.trigger.TriggerHandler;
+import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 
 
@@ -597,7 +597,7 @@ public class ComputerUtilCombat {
      * @param defender
      *            a {@link forge.game.card.Card} object.
      * @param trigger
-     *            a {@link forge.card.trigger.Trigger} object.
+     *            a {@link forge.game.trigger.Trigger} object.
      * @param combat
      *            a {@link forge.game.combat.Combat} object.
      * @return a boolean.

forge-gui/src/main/java/forge/ai/ComputerUtilCost.java

@@ -1,26 +1,26 @@
-package forge.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
-import forge.card.ability.AbilityUtils;
+import forge.game.ability.AbilityUtils;
-import forge.card.cost.Cost;
-import forge.card.cost.CostDamage;
-import forge.card.cost.CostDiscard;
-import forge.card.cost.CostPart;
-import forge.card.cost.CostPayLife;
-import forge.card.cost.CostPayment;
-import forge.card.cost.CostPutCounter;
-import forge.card.cost.CostRemoveCounter;
-import forge.card.cost.CostSacrifice;
-import forge.card.spellability.Spell;
-import forge.card.spellability.SpellAbility;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;
+import forge.game.cost.Cost;
+import forge.game.cost.CostDamage;
+import forge.game.cost.CostDiscard;
+import forge.game.cost.CostPart;
+import forge.game.cost.CostPayLife;
+import forge.game.cost.CostPayment;
+import forge.game.cost.CostPutCounter;
+import forge.game.cost.CostRemoveCounter;
+import forge.game.cost.CostSacrifice;
 import forge.game.player.Player;
+import forge.game.spellability.Spell;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.TextUtil;
 
@@ -315,7 +315,7 @@ public class ComputerUtilCost {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param player
      *            a {@link forge.game.player.Player} object.
      * @return a boolean.

forge-gui/src/main/java/forge/ai/ComputerUtilMana.java

@@ -1,4 +1,4 @@
-package forge.game.ai;
+package forge.ai;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -18,25 +18,25 @@ import com.google.common.collect.Multimap;
 
 import forge.FThreads;
 import forge.card.MagicColor;
-import forge.card.ability.AbilityUtils;
-import forge.card.ability.ApiType;
-import forge.card.cost.Cost;
-import forge.card.cost.CostPayment;
 import forge.card.mana.ManaAtom;
 import forge.card.mana.ManaCost;
-import forge.card.mana.ManaCostBeingPaid;
 import forge.card.mana.ManaCostShard;
-import forge.card.mana.ManaPool;
-import forge.card.replacement.ReplacementEffect;
-import forge.card.spellability.AbilityManaPart;
-import forge.card.spellability.AbilitySub;
-import forge.card.spellability.SpellAbility;
 import forge.game.Game;
 import forge.game.GameActionUtil;
+import forge.game.ability.AbilityUtils;
+import forge.game.ability.ApiType;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardUtil;
+import forge.game.cost.Cost;
+import forge.game.cost.CostPayment;
+import forge.game.mana.ManaCostBeingPaid;
+import forge.game.mana.ManaPool;
 import forge.game.player.Player;
+import forge.game.replacement.ReplacementEffect;
+import forge.game.spellability.AbilityManaPart;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.CollectionSuppliers;
 import forge.util.maps.EnumMapOfLists;
@@ -70,7 +70,7 @@ public class ComputerUtilMana {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param ai
      *            a {@link forge.game.player.Player} object.
      * @param test
@@ -339,9 +339,9 @@ public class ComputerUtilMana {
      * @param abMana
      *            a {@link forge.card.spellability.AbilityMana} object.
      * @param saRoot
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param cost
-     *            a {@link forge.card.mana.ManaCostBeingPaid} object.
+     *            a {@link forge.game.mana.ManaCostBeingPaid} object.
      * @return String
      */
     private static void getComboManaChoice(final Player ai, final SpellAbility manaAb, final SpellAbility saRoot, final ManaCostBeingPaid cost) {
@@ -698,7 +698,7 @@ public class ComputerUtilMana {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param player
      *            a {@link forge.game.player.Player} object.
      * @return a int.

forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java

@@ -1,8 +1,8 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 /** 
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java

@@ -15,14 +15,14 @@
  * 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.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
-import forge.card.ability.AbilityUtils;
+import forge.game.ability.AbilityUtils;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 /**
  * <p>

forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class AlwaysPlayAi extends SpellAbilityAi {
     /* (non-Javadoc)

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

@@ -1,19 +1,19 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
 import com.google.common.collect.Iterables;
 
-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.ability.AbilityUtils;
+import forge.game.ability.SpellAbilityAi;
 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;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 /**
@@ -141,11 +141,11 @@ public class AnimateAi extends SpellAbilityAi {
      * animateTriggerAI.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */
@@ -172,9 +172,9 @@ public class AnimateAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean.
      */
     private boolean animateTgtAI(final SpellAbility sa) {

forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java

@@ -1,8 +1,8 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class AnimateAllAi extends SpellAbilityAi {
 

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,30 +11,30 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.ApiType;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
+import forge.ai.ComputerUtilMana;
 import forge.card.cardfactory.CardFactoryUtil;
-import forge.card.cost.Cost;
-import forge.card.spellability.SpellAbility;
-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.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.ApiType;
-import forge.game.ai.ComputerUtilCost;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
+import forge.game.staticability.StaticAbility;
+import forge.game.trigger.Trigger;
+import forge.game.trigger.TriggerType;
 import forge.util.MyRandom;
 
 public class AttachAi extends SpellAbilityAi {

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

@@ -1,13 +1,13 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.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.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
 import java.util.List;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class BecomesBlockedAi extends SpellAbilityAi {

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

@@ -15,15 +15,15 @@
  * 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.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Collection;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtilCard;
 import forge.game.card.Card;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 /**
  * <p>
@@ -39,9 +39,9 @@ public final class BondAi extends SpellAbilityAi {
      * bondCanPlayAI.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */

forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java

@@ -1,11 +1,11 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
 import java.util.List;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class CanPlayAsDrawbackAi extends SpellAbilityAi {
 
@@ -22,11 +22,11 @@ public class CanPlayAsDrawbackAi extends SpellAbilityAi {
      * copySpellTriggerAI.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */

forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class CannotPlayAi extends SpellAbilityAi {
     /* (non-Javadoc)

forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java

@@ -1,8 +1,8 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class ChangeTargetsAi extends SpellAbilityAi {
 

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,37 +11,37 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import forge.ai.AiBlockController;
+import forge.ai.ComputerUtil;
+import forge.ai.ComputerUtilCard;
+import forge.ai.ComputerUtilCombat;
+import forge.ai.ComputerUtilCost;
+import forge.ai.ComputerUtilMana;
 import forge.card.CardCharacteristicName;
 import forge.card.MagicColor;
-import forge.card.ability.AbilityUtils;
-import forge.card.ability.ApiType;
-import forge.card.ability.SpellAbilityAi;
-import forge.card.ability.effects.AttachEffect;
-import forge.card.cost.Cost;
-import forge.card.cost.CostDiscard;
-import forge.card.cost.CostPart;
-import forge.card.spellability.AbilitySub;
-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.ability.AbilityUtils;
-import forge.game.ai.AiBlockController;
+import forge.game.ability.ApiType;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtilCombat;
+import forge.game.ability.effects.AttachEffect;
-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.cost.Cost;
+import forge.game.cost.CostDiscard;
+import forge.game.cost.CostPart;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
+import forge.game.trigger.TriggerType;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
@@ -53,9 +53,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * changeZoneCanPlayAI.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */
@@ -87,9 +87,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * changeZonePlayDrawbackAI.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */
@@ -113,11 +113,11 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * changeZoneTriggerAINoCost.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */
@@ -153,9 +153,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean.
      */
     private static boolean hiddenOriginCanPlayAI(final Player ai, final SpellAbility sa) {
@@ -329,9 +329,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean.
      */
     private static boolean hiddenOriginPlayDrawbackAI(final Player aiPlayer, final SpellAbility sa) {
@@ -359,9 +359,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.
@@ -545,9 +545,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean.
      */
     private static boolean knownOriginCanPlayAI(final Player ai, final SpellAbility sa) {
@@ -669,9 +669,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean.
      */
     private static boolean knownOriginPlayDrawbackAI(final Player aiPlayer, final SpellAbility sa) {
@@ -688,9 +688,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.
@@ -948,9 +948,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.
@@ -1057,9 +1057,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.
@@ -1094,9 +1094,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param player
      *            a {@link forge.game.player.Player} object.
      */

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

@@ -1,19 +1,19 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
@@ -159,9 +159,9 @@ public class ChangeZoneAllAi extends SpellAbilityAi {
      * changeZoneAllPlayDrawbackAI.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */

forge-gui/src/main/java/forge/ai/ability/CharmAi.java

@@ -1,14 +1,14 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.ability.effects.CharmEffect;
+import forge.game.ability.effects.CharmEffect;
-import forge.card.spellability.AbilitySub;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
 

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

@@ -1,22 +1,23 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import com.google.common.base.Predicate;
-import forge.card.ability.SpellAbilityAi;
+
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilCard;
-import forge.card.spellability.TargetRestrictions;
+import forge.ai.ComputerUtilCombat;
 import forge.game.Game;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-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;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class ChooseCardAi extends SpellAbilityAi {

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

@@ -1,13 +1,13 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.TargetRestrictions;
+import forge.game.ability.SpellAbilityAi;
-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;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class ChooseCardNameAi extends SpellAbilityAi {
 

forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java

@@ -1,8 +1,8 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;
 
 public class ChooseColorAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java

@@ -1,11 +1,11 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtil;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
 public class ChoosePlayerAi extends SpellAbilityAi {

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

@@ -1,24 +1,24 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCombat;
-import forge.card.ability.ApiType;
+import forge.ai.ComputerUtilCost;
-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.ComputerUtilCombat;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCost;
+import forge.game.ability.ApiType;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.Combat;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class ChooseSourceAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.AbilityUtils;
+import forge.game.ability.AbilityUtils;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class ChooseTypeAi extends SpellAbilityAi {
     @Override

forge-gui/src/main/java/forge/ai/ability/ClashAi.java

@@ -1,10 +1,10 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class ClashAi extends SpellAbilityAi {
 

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
-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.ability.AbilityUtils;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class CloneAi extends SpellAbilityAi {
 
@@ -129,9 +129,9 @@ public class CloneAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @return a boolean.
      */
     private boolean cloneTgtAI(final SpellAbility sa) {

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

@@ -1,18 +1,18 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/ai/ability/ControlGainAi.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.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Arrays;
 import java.util.List;
@@ -23,17 +23,17 @@ import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-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.ability.AbilityUtils;
+import forge.game.ability.SpellAbilityAi;
 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;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Collection;
 import java.util.List;
@@ -7,16 +7,16 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -1,16 +1,16 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCost;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilMana;
 import forge.card.cardfactory.CardFactoryUtil;
-import forge.card.cost.Cost;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtilCost;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilMana;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.util.MyRandom;
 
 public class CounterAi extends SpellAbilityAi {

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

@@ -15,13 +15,13 @@
  * 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.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.game.ai.ComputerUtilCard;
+import forge.ai.ComputerUtilCard;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.MyRandom;

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

@@ -1,16 +1,16 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
 public class CountersProliferateAi extends SpellAbilityAi {

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,20 +6,20 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.TargetRestrictions;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.MyRandom;

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

@@ -1,24 +1,24 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCost;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilMana;
-import forge.card.cost.Cost;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.AbilitySub;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -15,18 +15,18 @@
  * 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.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.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.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -1,15 +1,15 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class CountersRemoveAi extends SpellAbilityAi {
 

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
 import com.google.common.collect.Iterables;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.SpellAbility;
 import forge.game.Game;
-import forge.game.ai.ComputerUtilCombat;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
 public abstract class DamageAiBase extends SpellAbilityAi {

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,18 +6,18 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCombat;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.TargetRestrictions;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
@@ -156,9 +156,9 @@ public class  DamageAllAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param player
      *            a {@link forge.game.player.Player} object.
      * @param dmg

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
@@ -6,26 +6,26 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.AbilitySub;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilMana;
-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.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetChoices;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
@@ -201,7 +201,7 @@ public class DamageDealAi extends DamageAiBase {
      * </p>
      * 
      * @param saMe
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param dmg
      *            a int.
      * @return a boolean.
@@ -226,9 +226,9 @@ public class DamageDealAi extends DamageAiBase {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param tgt
-     *            a {@link forge.card.spellability.TargetRestrictions} object.
+     *            a {@link forge.game.spellability.TargetRestrictions} object.
      * @param dmg
      *            a int.
      * @param mandatory
@@ -367,7 +367,7 @@ public class DamageDealAi extends DamageAiBase {
      * @param ai 
      * 
      * @param saMe
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param dmg
      *            a int.
      * @return a boolean.
@@ -422,9 +422,9 @@ public class DamageDealAi extends DamageAiBase {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param tgt
-     *            a {@link forge.card.spellability.TargetRestrictions} object.
+     *            a {@link forge.game.spellability.TargetRestrictions} object.
      * @param dmg
      *            a int.
      * @param mandatory

forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java

@@ -1,10 +1,10 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.AbilityUtils;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class DamageEachAi extends DamageAiBase {
 

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

@@ -1,26 +1,26 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.GameObject;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class DamagePreventAi extends SpellAbilityAi {
@@ -172,9 +172,9 @@ public class DamagePreventAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.

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

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

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,21 +8,21 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.SpellAbilityRestriction;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCost;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.Combat;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellAbilityRestriction;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class DebuffAi extends SpellAbilityAi {
@@ -117,9 +117,9 @@ public class DebuffAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param kws
      *            a {@link java.util.ArrayList} object.
      * @param mandatory
@@ -180,9 +180,9 @@ public class DebuffAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param kws
      *            a {@link java.util.ArrayList} object.
      * @return a {@link forge.CardList} object.
@@ -211,9 +211,9 @@ public class DebuffAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.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;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java

@@ -1,10 +1,10 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.AbilityFactory;
+import forge.game.ability.AbilityFactory;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.AbilitySub;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
 
 public class DelayedTriggerAi extends SpellAbilityAi {
 

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,20 +6,20 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.CostPart;
+import forge.game.ability.AbilityUtils;
-import forge.card.cost.CostSacrifice;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-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.cost.Cost;
+import forge.game.cost.CostPart;
+import forge.game.cost.CostSacrifice;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

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

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

@@ -1,15 +1,15 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Random;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.AbilitySub;
+import forge.game.ability.SpellAbilityAi;
-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.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -1,20 +1,20 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.TargetRestrictions;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtil;
-import forge.game.ai.ComputerUtilCost;
-import forge.game.ai.ComputerUtilMana;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -1,14 +1,14 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
-import forge.card.ability.AbilityUtils;
+import forge.game.ability.AbilityUtils;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.card.Card;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.util.MyRandom;
 
 public class DrainManaAi extends SpellAbilityAi {

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

@@ -16,25 +16,25 @@
  * 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.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilMana;
-import forge.card.cost.CostDiscard;
-import forge.card.cost.CostPart;
-import forge.card.cost.PaymentDecision;
-import forge.card.spellability.AbilitySub;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCost;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtilMana;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
+import forge.game.cost.CostDiscard;
+import forge.game.cost.CostPart;
+import forge.game.cost.PaymentDecision;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class DrawAi extends SpellAbilityAi {

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
@@ -6,20 +6,20 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
-import forge.card.ability.ApiType;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.SpellAbilityStackInstance;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.ApiType;
-import forge.game.ai.ComputerUtilCombat;
+import forge.game.ability.SpellAbilityAi;
 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;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellAbilityStackInstance;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -15,21 +15,21 @@
  * 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.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Collection;
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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;
+import forge.game.spellability.SpellAbility;
 
 /**
  * <p>
@@ -45,9 +45,9 @@ public final class EncodeAi extends SpellAbilityAi {
      * bondCanPlayAI.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */

forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 /** 
  * TODO: Write javadoc for this type.

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilCombat;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtilCombat;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;
 
 public class FightAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java

@@ -1,8 +1,8 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class FlipACoinAi extends SpellAbilityAi {
 

forge-gui/src/main/java/forge/ai/ability/FogAi.java

@@ -1,12 +1,12 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.SpellAbility;
 import forge.game.Game;
-import forge.game.ai.ComputerUtilCombat;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class FogAi extends SpellAbilityAi {
 

forge-gui/src/main/java/forge/ai/ability/GameLossAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class GameLossAi extends SpellAbilityAi {
     @Override

forge-gui/src/main/java/forge/ai/ability/GameWinAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class GameWinAi extends SpellAbilityAi {
     /* (non-Javadoc)

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

@@ -1,13 +1,13 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Collection;
 
 import com.google.common.collect.Iterables;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.card.Card;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 /** 
  * TODO: Write javadoc for this type.

forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java

@@ -1,11 +1,11 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Random;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.util.MyRandom;
 
 public class LifeExchangeAi extends SpellAbilityAi {

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

@@ -1,19 +1,19 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCombat;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.AbilitySub;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCombat;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtilCost;
-import forge.game.ai.ComputerUtilMana;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 /**
  * TODO: Write javadoc for this type.
@@ -130,11 +130,11 @@ public class LifeGainAi extends SpellAbilityAi {
      * gainLifeDoTriggerAINoCost.
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      *
      * @return a boolean.
      */

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

@@ -1,17 +1,18 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
-import forge.card.ability.AbilityUtils;
+
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.TargetRestrictions;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtilCost;
-import forge.game.ai.ComputerUtilMana;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class LifeLoseAi extends SpellAbilityAi {
 

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

@@ -1,16 +1,16 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Random;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilMana;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.util.MyRandom;
 
 public class LifeSetAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java

@@ -1,11 +1,11 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtil;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class ManaEffectAi extends SpellAbilityAi {
 
@@ -19,11 +19,11 @@ public class ManaEffectAi extends SpellAbilityAi {
 
     /**
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * 
      * @return a boolean.
      */

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

@@ -1,19 +1,19 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilMana;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.TargetRestrictions;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtil;
-import forge.game.ai.ComputerUtilCost;
-import forge.game.ai.ComputerUtilMana;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class MillAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class MustAttackAi extends SpellAbilityAi {
 

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

@@ -1,21 +1,21 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.TargetRestrictions;
+import forge.game.ability.SpellAbilityAi;
-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;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class MustBlockAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java

@@ -1,10 +1,10 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.AbilitySub;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
 
 /** 
  * TODO: Write javadoc for this type.

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

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

forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java

@@ -1,10 +1,10 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtil;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 /** 
  * AbilityFactory for Creature Spells.

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

@@ -1,16 +1,16 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 import java.util.Random;
 
-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.ability.AbilityUtils;
+import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
@@ -89,11 +89,11 @@ public class PhasesAi extends SpellAbilityAi {
      * </p>
      * 
      * @param tgt
-     *            a {@link forge.card.spellability.TargetRestrictions} object.
+     *            a {@link forge.game.spellability.TargetRestrictions} object.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.
@@ -126,9 +126,9 @@ public class PhasesAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @return a boolean.

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,18 +7,18 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.Spell;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.Spell;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 
@@ -81,11 +81,11 @@ public class PlayAi extends SpellAbilityAi {
      * doTriggerAINoCost
      * </p>
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param mandatory
      *            a boolean.
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      *
      * @return a boolean.
      */

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.TargetRestrictions;
-import forge.game.ai.ComputerUtil;
-import forge.game.ai.ComputerUtilCost;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class PoisonAi extends SpellAbilityAi {
 

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Collections;
 import java.util.List;
@@ -6,14 +6,14 @@ import java.util.Map;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtilCard;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.AbilityUtils;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;
 

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

@@ -1,27 +1,27 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
+import forge.ai.ComputerUtil;
+import forge.ai.ComputerUtilCard;
+import forge.ai.ComputerUtilCombat;
+import forge.ai.ComputerUtilCost;
 import forge.card.MagicColor;
-import forge.card.ability.AbilityUtils;
-import forge.card.ability.SpellAbilityAi;
-import forge.card.ability.effects.ProtectEffect;
-import forge.card.cost.Cost;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-import forge.game.ai.ComputerUtilCombat;
+import forge.game.ability.effects.ProtectEffect;
-import forge.game.ai.ComputerUtilCost;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.Combat;
+import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class ProtectAi extends SpellAbilityAi {
@@ -62,7 +62,7 @@ public class ProtectAi extends SpellAbilityAi {
      * </p>
      * 
      * @param af
-     *            a {@link forge.card.ability.AbilityFactory} object.
+     *            a {@link forge.game.ability.AbilityFactory} object.
      * @return a {@link forge.CardList} object.
      */
     private static List<Card> getProtectCreatures(final Player ai, final SpellAbility sa) {

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

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

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

@@ -1,29 +1,29 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.CostPart;
+import forge.ai.ComputerUtilMana;
-import forge.card.cost.CostTapType;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.SpellAbilityRestriction;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
+import forge.game.cost.CostPart;
+import forge.game.cost.CostTapType;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellAbilityRestriction;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class PumpAi extends PumpAiBase {

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,12 +7,11 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilCard;
+import forge.ai.ComputerUtilCombat;
 import forge.game.Game;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.SpellAbilityAi;
-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;
@@ -23,6 +22,7 @@ import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.phase.Untap;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
 public abstract class PumpAiBase extends SpellAbilityAi {
@@ -502,7 +502,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
      * </p>
      * 
      * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
+     *            a {@link forge.game.spellability.SpellAbility} object.
      * @param defense
      *            a int.
      * @param attack

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

@@ -1,4 +1,4 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,19 +6,19 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilCard;
-import forge.card.spellability.TargetRestrictions;
+import forge.ai.ComputerUtilCombat;
 import forge.game.Game;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-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;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public class PumpAllAi extends PumpAiBase {

forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java

@@ -1,10 +1,10 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class RearrangeTopOfLibraryAi extends SpellAbilityAi {
     /* (non-Javadoc)

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

@@ -15,28 +15,28 @@
  * 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.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import forge.card.ability.AbilityUtils;
+import forge.ai.ComputerUtil;
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCard;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilCost;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.Game;
 import forge.game.GameObject;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.AbilityUtils;
-import forge.game.ai.ComputerUtilCard;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 /**

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

@@ -1,21 +1,21 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.List;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtil;
-import forge.card.cost.Cost;
+import forge.ai.ComputerUtilCombat;
-import forge.card.spellability.SpellAbility;
+import forge.ai.ComputerUtilCost;
 import forge.game.Game;
 import forge.game.GameObject;
-import forge.game.ai.ComputerUtil;
+import forge.game.ability.SpellAbilityAi;
-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.cost.Cost;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
 public class RegenerateAllAi extends SpellAbilityAi {

forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java

@@ -1,9 +1,9 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class RemoveFromCombatAi extends SpellAbilityAi {
 

forge-gui/src/main/java/forge/ai/ability/RepeatAi.java

@@ -1,13 +1,13 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.AbilityFactory;
+import forge.game.ability.AbilityFactory;
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.AbilitySub;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.spellability.AbilitySub;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 
 public class RepeatAi extends SpellAbilityAi {
 

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

@@ -1,17 +1,17 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.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.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
 /** 

forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java

@@ -1,8 +1,8 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 
 public class RestartGameAi extends SpellAbilityAi {
 

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

@@ -1,13 +1,13 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Random;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.game.ai.ComputerUtilCost;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;
 
 public class RevealAi extends RevealAiBase {

forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java

@@ -1,10 +1,10 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.card.spellability.TargetRestrictions;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.spellability.TargetRestrictions;
 import forge.game.zone.ZoneType;
 
 public abstract class RevealAiBase extends SpellAbilityAi {

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

@@ -1,13 +1,13 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 import java.util.Random;
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.ComputerUtilCost;
-import forge.card.cost.Cost;
+import forge.game.ability.SpellAbilityAi;
-import forge.card.spellability.SpellAbility;
-import forge.game.ai.ComputerUtilCost;
 import forge.game.card.Card;
+import forge.game.cost.Cost;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;
 
 public class RevealHandAi extends RevealAiBase {

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

@@ -1,14 +1,14 @@
-package forge.card.ability.ai;
+package forge.ai.ability;
 
 
-import forge.card.ability.SpellAbilityAi;
+import forge.ai.AiController;
-import forge.card.spellability.SpellAbility;
+import forge.game.ability.SpellAbilityAi;
-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;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.MyRandom;