diff --git a/.gitattributes b/.gitattributes
index e7d7d7d1980..6969578a7ab 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,7 +12,6 @@ forge-ai/.settings/org.eclipse.core.resources.prefs -text
 forge-ai/.settings/org.eclipse.jdt.core.prefs -text
 forge-ai/.settings/org.eclipse.m2e.core.prefs -text
 forge-ai/pom.xml -text
-forge-ai/src/main/java/forge/game/ai/AiProps.java -text
 forge-core/.classpath -text
 forge-core/.project -text
 forge-core/.settings/org.eclipse.core.resources.prefs -text
@@ -98,6 +97,12 @@ forge-core/src/main/java/forge/util/PredicateString.java -text
 forge-core/src/main/java/forge/util/ReflectionUtil.java -text
 forge-core/src/main/java/forge/util/TextUtil.java -text
 forge-core/src/main/java/forge/util/ThreadUtil.java -text
+forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java -text
+forge-core/src/main/java/forge/util/maps/EnumMapToAmount.java -text
+forge-core/src/main/java/forge/util/maps/HashMapOfLists.java -text
+forge-core/src/main/java/forge/util/maps/MapOfLists.java -text
+forge-core/src/main/java/forge/util/maps/MapToAmount.java -text
+forge-core/src/main/java/forge/util/maps/package-info.java -text
 forge-core/src/main/java/forge/util/package-info.java -text
 forge-core/src/main/java/forge/util/storage/IStorage.java -text
 forge-core/src/main/java/forge/util/storage/StorageBase.java -text
@@ -118,9 +123,496 @@ forge-game/src/main/java/forge/Command.java svneol=native#text/plain
 forge-game/src/main/java/forge/Constant.java svneol=native#text/plain
 forge-game/src/main/java/forge/ImageCacheBridge.java -text
 forge-game/src/main/java/forge/PreferencesBridge.java -text
+forge-game/src/main/java/forge/ai/AiAttackController.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/AiBlockController.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/AiController.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/AiCostDecision.java -text
+forge-game/src/main/java/forge/ai/AiProfileUtil.java -text
+forge-game/src/main/java/forge/ai/AiProps.java -text
+forge-game/src/main/java/forge/ai/ComputerUtil.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/ComputerUtilCard.java -text
+forge-game/src/main/java/forge/ai/ComputerUtilCombat.java -text
+forge-game/src/main/java/forge/ai/ComputerUtilCost.java -text
+forge-game/src/main/java/forge/ai/ComputerUtilMana.java -text
+forge-game/src/main/java/forge/ai/SpellAbilityAi.java -text
+forge-game/src/main/java/forge/ai/ability/AddPhaseAi.java -text
+forge-game/src/main/java/forge/ai/ability/AddTurnAi.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/ability/AlwaysPlayAi.java -text
+forge-game/src/main/java/forge/ai/ability/AnimateAi.java -text
+forge-game/src/main/java/forge/ai/ability/AnimateAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/AttachAi.java -text
+forge-game/src/main/java/forge/ai/ability/BalanceAi.java -text
+forge-game/src/main/java/forge/ai/ability/BecomesBlockedAi.java -text
+forge-game/src/main/java/forge/ai/ability/BondAi.java -text
+forge-game/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java -text
+forge-game/src/main/java/forge/ai/ability/CannotPlayAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChangeTargetsAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChangeZoneAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChangeZoneAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/CharmAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChooseCardAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChooseCardNameAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChooseColorAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChoosePlayerAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChooseSourceAi.java -text
+forge-game/src/main/java/forge/ai/ability/ChooseTypeAi.java -text
+forge-game/src/main/java/forge/ai/ability/ClashAi.java -text
+forge-game/src/main/java/forge/ai/ability/CloneAi.java -text
+forge-game/src/main/java/forge/ai/ability/ControlExchangeAi.java -text
+forge-game/src/main/java/forge/ai/ability/ControlGainAi.java -text
+forge-game/src/main/java/forge/ai/ability/CopyPermanentAi.java -text
+forge-game/src/main/java/forge/ai/ability/CounterAi.java -text
+forge-game/src/main/java/forge/ai/ability/CountersAi.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/ability/CountersMoveAi.java -text
+forge-game/src/main/java/forge/ai/ability/CountersProliferateAi.java -text
+forge-game/src/main/java/forge/ai/ability/CountersPutAi.java -text
+forge-game/src/main/java/forge/ai/ability/CountersPutAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java -text
+forge-game/src/main/java/forge/ai/ability/CountersRemoveAi.java -text
+forge-game/src/main/java/forge/ai/ability/DamageAiBase.java -text
+forge-game/src/main/java/forge/ai/ability/DamageAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/DamageDealAi.java -text
+forge-game/src/main/java/forge/ai/ability/DamageEachAi.java -text
+forge-game/src/main/java/forge/ai/ability/DamagePreventAi.java -text
+forge-game/src/main/java/forge/ai/ability/DamagePreventAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/DebuffAi.java -text
+forge-game/src/main/java/forge/ai/ability/DebuffAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/DelayedTriggerAi.java -text
+forge-game/src/main/java/forge/ai/ability/DestroyAi.java -text
+forge-game/src/main/java/forge/ai/ability/DestroyAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/DigAi.java -text
+forge-game/src/main/java/forge/ai/ability/DigUntilAi.java -text
+forge-game/src/main/java/forge/ai/ability/DiscardAi.java -text
+forge-game/src/main/java/forge/ai/ability/DrainManaAi.java -text
+forge-game/src/main/java/forge/ai/ability/DrawAi.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/ability/EffectAi.java -text
+forge-game/src/main/java/forge/ai/ability/EncodeAi.java -text
+forge-game/src/main/java/forge/ai/ability/EndTurnAi.java -text
+forge-game/src/main/java/forge/ai/ability/FightAi.java -text
+forge-game/src/main/java/forge/ai/ability/FlipACoinAi.java -text
+forge-game/src/main/java/forge/ai/ability/FogAi.java -text
+forge-game/src/main/java/forge/ai/ability/GameLossAi.java -text
+forge-game/src/main/java/forge/ai/ability/GameWinAi.java -text
+forge-game/src/main/java/forge/ai/ability/HauntAi.java -text
+forge-game/src/main/java/forge/ai/ability/LegendaryRuleAi.java -text
+forge-game/src/main/java/forge/ai/ability/LifeExchangeAi.java -text
+forge-game/src/main/java/forge/ai/ability/LifeGainAi.java -text
+forge-game/src/main/java/forge/ai/ability/LifeLoseAi.java -text
+forge-game/src/main/java/forge/ai/ability/LifeSetAi.java -text
+forge-game/src/main/java/forge/ai/ability/ManaEffectAi.java -text
+forge-game/src/main/java/forge/ai/ability/MillAi.java -text
+forge-game/src/main/java/forge/ai/ability/MustAttackAi.java -text
+forge-game/src/main/java/forge/ai/ability/MustBlockAi.java -text
+forge-game/src/main/java/forge/ai/ability/PeekAndRevealAi.java -text
+forge-game/src/main/java/forge/ai/ability/PermanentCreatureAi.java -text
+forge-game/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java -text
+forge-game/src/main/java/forge/ai/ability/PhasesAi.java -text
+forge-game/src/main/java/forge/ai/ability/PlayAi.java -text
+forge-game/src/main/java/forge/ai/ability/PoisonAi.java -text
+forge-game/src/main/java/forge/ai/ability/PowerExchangeAi.java -text
+forge-game/src/main/java/forge/ai/ability/ProtectAi.java -text
+forge-game/src/main/java/forge/ai/ability/ProtectAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/PumpAi.java -text
+forge-game/src/main/java/forge/ai/ability/PumpAiBase.java -text
+forge-game/src/main/java/forge/ai/ability/PumpAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java -text
+forge-game/src/main/java/forge/ai/ability/RegenerateAi.java svneol=native#text/plain
+forge-game/src/main/java/forge/ai/ability/RegenerateAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/RemoveFromCombatAi.java -text
+forge-game/src/main/java/forge/ai/ability/RepeatAi.java -text
+forge-game/src/main/java/forge/ai/ability/RepeatEachAi.java -text
+forge-game/src/main/java/forge/ai/ability/RestartGameAi.java -text
+forge-game/src/main/java/forge/ai/ability/RevealAi.java -text
+forge-game/src/main/java/forge/ai/ability/RevealAiBase.java -text
+forge-game/src/main/java/forge/ai/ability/RevealHandAi.java -text
+forge-game/src/main/java/forge/ai/ability/RollPlanarDiceAi.java -text
+forge-game/src/main/java/forge/ai/ability/SacrificeAi.java -text
+forge-game/src/main/java/forge/ai/ability/SacrificeAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/ScryAi.java -text
+forge-game/src/main/java/forge/ai/ability/SetStateAi.java -text
+forge-game/src/main/java/forge/ai/ability/ShuffleAi.java -text
+forge-game/src/main/java/forge/ai/ability/StoreSVarAi.java -text
+forge-game/src/main/java/forge/ai/ability/TapAi.java -text
+forge-game/src/main/java/forge/ai/ability/TapAiBase.java -text
+forge-game/src/main/java/forge/ai/ability/TapAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/TapOrUntapAi.java -text
+forge-game/src/main/java/forge/ai/ability/TapOrUntapAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/TokenAi.java -text
+forge-game/src/main/java/forge/ai/ability/TwoPilesAi.java -text
+forge-game/src/main/java/forge/ai/ability/UnattachAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/UntapAi.java -text
+forge-game/src/main/java/forge/ai/ability/UntapAllAi.java -text
+forge-game/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text
+forge-game/src/main/java/forge/game/Game.java -text
+forge-game/src/main/java/forge/game/GameAction.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/GameActionUtil.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/GameEndReason.java -text
+forge-game/src/main/java/forge/game/GameEntity.java -text
 forge-game/src/main/java/forge/game/GameFormat.java -text
+forge-game/src/main/java/forge/game/GameLog.java -text
+forge-game/src/main/java/forge/game/GameLogEntry.java -text
+forge-game/src/main/java/forge/game/GameLogEntryType.java -text
+forge-game/src/main/java/forge/game/GameLogFormatter.java -text
+forge-game/src/main/java/forge/game/GameObject.java -text
+forge-game/src/main/java/forge/game/GameOutcome.java -text
+forge-game/src/main/java/forge/game/GameStage.java -text
+forge-game/src/main/java/forge/game/GameType.java -text
+forge-game/src/main/java/forge/game/GlobalRuleChange.java -text
+forge-game/src/main/java/forge/game/Match.java -text
+forge-game/src/main/java/forge/game/PlanarDice.java -text
+forge-game/src/main/java/forge/game/StaticEffect.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/StaticEffects.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/TriggerReplacementBase.java -text
+forge-game/src/main/java/forge/game/ability/AbilityApiBased.java -text
+forge-game/src/main/java/forge/game/ability/AbilityFactory.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/ability/AbilityUtils.java -text
+forge-game/src/main/java/forge/game/ability/ApiType.java -text
+forge-game/src/main/java/forge/game/ability/SaTargetRoutines.java -text
+forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java -text
+forge-game/src/main/java/forge/game/ability/SpellApiBased.java -text
+forge-game/src/main/java/forge/game/ability/StaticAbilityApiBased.java -text
+forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/BondEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CleanUpEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DebuffAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DigEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/FightEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/FogEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/GameLossEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/GameWinEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/LifeLoseEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/MillEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RegenerateEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/SetInMotionEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/StoreSVarEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/TapEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/UntapEffect.java -text
+forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java -text
+forge-game/src/main/java/forge/game/ability/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/Card.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardCharacteristics.java -text
+forge-game/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardDamageHistory.java -text
+forge-game/src/main/java/forge/game/card/CardFactory.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardFactoryUtil.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardKeywords.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardLists.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardPowerToughness.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardPredicates.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardShields.java -text
+forge-game/src/main/java/forge/game/card/CardType.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CardUtil.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/card/CounterType.java svneol=native#text/plain
 forge-game/src/main/java/forge/game/card/package-info.java -text
+forge-game/src/main/java/forge/game/combat/AttackingBand.java -text
+forge-game/src/main/java/forge/game/combat/Combat.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/combat/CombatLki.java -text
+forge-game/src/main/java/forge/game/combat/CombatUtil.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/cost/Cost.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/cost/CostAddMana.java -text
+forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java -text
+forge-game/src/main/java/forge/game/cost/CostDamage.java -text
+forge-game/src/main/java/forge/game/cost/CostDecisionMakerBase.java -text
+forge-game/src/main/java/forge/game/cost/CostDiscard.java -text
+forge-game/src/main/java/forge/game/cost/CostDraw.java -text
+forge-game/src/main/java/forge/game/cost/CostExile.java -text
+forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java -text
+forge-game/src/main/java/forge/game/cost/CostFlipCoin.java -text
+forge-game/src/main/java/forge/game/cost/CostGainControl.java -text
+forge-game/src/main/java/forge/game/cost/CostGainLife.java -text
+forge-game/src/main/java/forge/game/cost/CostMill.java -text
+forge-game/src/main/java/forge/game/cost/CostPart.java -text
+forge-game/src/main/java/forge/game/cost/CostPartMana.java -text
+forge-game/src/main/java/forge/game/cost/CostPartWithList.java -text
+forge-game/src/main/java/forge/game/cost/CostPayLife.java -text
+forge-game/src/main/java/forge/game/cost/CostPayment.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java -text
+forge-game/src/main/java/forge/game/cost/CostPutCounter.java -text
+forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java -text
+forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java -text
+forge-game/src/main/java/forge/game/cost/CostReturn.java -text
+forge-game/src/main/java/forge/game/cost/CostReveal.java -text
+forge-game/src/main/java/forge/game/cost/CostSacrifice.java -text
+forge-game/src/main/java/forge/game/cost/CostTap.java -text
+forge-game/src/main/java/forge/game/cost/CostTapType.java -text
+forge-game/src/main/java/forge/game/cost/CostUnattach.java -text
+forge-game/src/main/java/forge/game/cost/CostUntap.java -text
+forge-game/src/main/java/forge/game/cost/CostUntapType.java -text
+forge-game/src/main/java/forge/game/cost/ICostVisitor.java -text
+forge-game/src/main/java/forge/game/cost/PaymentDecision.java -text
+forge-game/src/main/java/forge/game/cost/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/event/EventValueChangeType.java -text
+forge-game/src/main/java/forge/game/event/GameEvent.java -text
+forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java -text
+forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java -text
+forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardChangeZone.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardCounters.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardDamaged.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardDestroyed.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardPhased.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardSacrificed.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java -text
+forge-game/src/main/java/forge/game/event/GameEventCardTapped.java -text
+forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java -text
+forge-game/src/main/java/forge/game/event/GameEventFlipCoin.java -text
+forge-game/src/main/java/forge/game/event/GameEventGameFinished.java -text
+forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java -text
+forge-game/src/main/java/forge/game/event/GameEventGameRestarted.java -text
+forge-game/src/main/java/forge/game/event/GameEventGameStarted.java -text
+forge-game/src/main/java/forge/game/event/GameEventLandPlayed.java -text
+forge-game/src/main/java/forge/game/event/GameEventManaBurn.java -text
+forge-game/src/main/java/forge/game/event/GameEventManaPool.java -text
+forge-game/src/main/java/forge/game/event/GameEventMulligan.java -text
+forge-game/src/main/java/forge/game/event/GameEventPlayerControl.java -text
+forge-game/src/main/java/forge/game/event/GameEventPlayerDamaged.java -text
+forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java -text
+forge-game/src/main/java/forge/game/event/GameEventPlayerPoisoned.java -text
+forge-game/src/main/java/forge/game/event/GameEventPlayerPriority.java -text
+forge-game/src/main/java/forge/game/event/GameEventShuffle.java -text
+forge-game/src/main/java/forge/game/event/GameEventSpellAbilityCast.java -text
+forge-game/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java -text
+forge-game/src/main/java/forge/game/event/GameEventSpellResolved.java -text
+forge-game/src/main/java/forge/game/event/GameEventTokenCreated.java -text
+forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java -text
+forge-game/src/main/java/forge/game/event/GameEventTurnEnded.java -text
+forge-game/src/main/java/forge/game/event/GameEventTurnPhase.java -text
+forge-game/src/main/java/forge/game/event/GameEventZone.java -text
+forge-game/src/main/java/forge/game/event/IGameEventVisitor.java -text
+forge-game/src/main/java/forge/game/event/package-info.java -text
+forge-game/src/main/java/forge/game/mana/Mana.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/mana/ManaPool.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/mana/package-info.java svneol=native#text/plain
 forge-game/src/main/java/forge/game/package-info.java -text
+forge-game/src/main/java/forge/game/phase/EndOfTurn.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/phase/ExtraTurn.java -text
+forge-game/src/main/java/forge/game/phase/Phase.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/phase/PhaseHandler.java -text
+forge-game/src/main/java/forge/game/phase/PhaseType.java -text
+forge-game/src/main/java/forge/game/phase/Untap.java -text
+forge-game/src/main/java/forge/game/phase/Upkeep.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/phase/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/player/GameLossReason.java -text
+forge-game/src/main/java/forge/game/player/LobbyPlayer.java -text
+forge-game/src/main/java/forge/game/player/LobbyPlayerAi.java -text
+forge-game/src/main/java/forge/game/player/LobbyPlayerRemote.java -text
+forge-game/src/main/java/forge/game/player/Player.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/player/PlayerActionConfirmMode.java -text
+forge-game/src/main/java/forge/game/player/PlayerController.java -text
+forge-game/src/main/java/forge/game/player/PlayerControllerAi.java -text
+forge-game/src/main/java/forge/game/player/PlayerOutcome.java -text
+forge-game/src/main/java/forge/game/player/PlayerStatistics.java -text
+forge-game/src/main/java/forge/game/player/RegisteredPlayer.java -text
+forge-game/src/main/java/forge/game/player/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceDestroy.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java -text
+forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java -text
+forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java -text
+forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java -text
+forge-game/src/main/java/forge/game/replacement/ReplacementLayer.java -text
+forge-game/src/main/java/forge/game/replacement/ReplacementResult.java -text
+forge-game/src/main/java/forge/game/replacement/ReplacementType.java -text
+forge-game/src/main/java/forge/game/replacement/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/Ability.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/AbilityActivated.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/AbilityStatic.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/AbilitySub.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/AbilityTriggered.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/ISpellAbility.java -text
+forge-game/src/main/java/forge/game/spellability/OptionalCost.java -text
+forge-game/src/main/java/forge/game/spellability/Spell.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/SpellAbility.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/SpellPermanent.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/TargetChoices.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/spellability/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/staticability/StaticAbility.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java -text
+forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java -text
+forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/staticability/StaticAbilityCostChange.java -text
+forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java -text
+forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java -text
+forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/staticability/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/Trigger.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerAlways.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerAttached.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerClashed.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerCountered.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerCycled.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerHandler.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerPhase.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerScry.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerTaps.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerType.java -text
+forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/TriggerWaiting.java -text
+forge-game/src/main/java/forge/game/trigger/WrappedAbility.java -text
+forge-game/src/main/java/forge/game/trigger/ZCTrigger.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/trigger/package-info.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/zone/MagicStack.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/zone/PlayerZone.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java svneol=native#text/plain
+forge-game/src/main/java/forge/game/zone/Zone.java -text
+forge-game/src/main/java/forge/game/zone/ZoneType.java -text
+forge-game/src/main/java/forge/game/zone/package-info.java svneol=native#text/plain
 forge-game/src/main/java/forge/package-info.java -text
 forge-game/src/main/java/forge/util/Expressions.java -text
 forge-game/src/main/java/forge/util/package-info.java -text
@@ -14719,126 +15211,6 @@ forge-gui/src/main/java/forge/ImageCacheProvider.java -text
 forge-gui/src/main/java/forge/ImageLoader.java -text
 forge-gui/src/main/java/forge/PreferencesProvider.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/AiCostDecision.java -text
-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/SpellAbilityAi.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/ChooseGenericEffectAi.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/HauntAi.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/control/ChatArea.java -text
 forge-gui/src/main/java/forge/control/FControl.java -text
 forge-gui/src/main/java/forge/control/FControlGameEventHandler.java -text
@@ -14853,374 +15225,6 @@ forge-gui/src/main/java/forge/deck/io/OldDeckParser.java -text
 forge-gui/src/main/java/forge/deck/io/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/error/ExceptionHandler.java svneol=native#text/plain
 forge-gui/src/main/java/forge/error/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/Game.java -text
-forge-gui/src/main/java/forge/game/GameAction.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/GameActionUtil.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/GameEndReason.java -text
-forge-gui/src/main/java/forge/game/GameEntity.java -text
-forge-gui/src/main/java/forge/game/GameLog.java -text
-forge-gui/src/main/java/forge/game/GameLogEntry.java -text
-forge-gui/src/main/java/forge/game/GameLogEntryType.java -text
-forge-gui/src/main/java/forge/game/GameLogFormatter.java -text
-forge-gui/src/main/java/forge/game/GameObject.java -text
-forge-gui/src/main/java/forge/game/GameOutcome.java -text
-forge-gui/src/main/java/forge/game/GameStage.java -text
-forge-gui/src/main/java/forge/game/GameType.java -text
-forge-gui/src/main/java/forge/game/GlobalRuleChange.java -text
-forge-gui/src/main/java/forge/game/Match.java -text
-forge-gui/src/main/java/forge/game/PlanarDice.java -text
-forge-gui/src/main/java/forge/game/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/TriggerReplacementBase.java -text
-forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java -text
-forge-gui/src/main/java/forge/game/ability/AbilityFactory.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/ability/AbilityUtils.java -text
-forge-gui/src/main/java/forge/game/ability/ApiType.java -text
-forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java -text
-forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java -text
-forge-gui/src/main/java/forge/game/ability/SpellApiBased.java -text
-forge-gui/src/main/java/forge/game/ability/StaticAbilityApiBased.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/OwnershipGainEffect.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/RunSVarAbilityEffect.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/CardCharacteristics.java -text
-forge-gui/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardDamageHistory.java -text
-forge-gui/src/main/java/forge/game/card/CardFactory.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardKeywords.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardLists.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardPowerToughness.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardPredicates.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardShields.java -text
-forge-gui/src/main/java/forge/game/card/CardType.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CardUtil.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/CounterType.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/card/package-info.java -text
-forge-gui/src/main/java/forge/game/combat/AttackingBand.java -text
-forge-gui/src/main/java/forge/game/combat/Combat.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/combat/CombatLki.java -text
-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/CostChooseCreatureType.java -text
-forge-gui/src/main/java/forge/game/cost/CostDamage.java -text
-forge-gui/src/main/java/forge/game/cost/CostDecisionMakerBase.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/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/ICostVisitor.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
-forge-gui/src/main/java/forge/game/event/GameEventAttackersDeclared.java -text
-forge-gui/src/main/java/forge/game/event/GameEventBlockersDeclared.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardAttachment.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardChangeZone.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardCounters.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardDamaged.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardDestroyed.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardPhased.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardRegenerated.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardSacrificed.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCardTapped.java -text
-forge-gui/src/main/java/forge/game/event/GameEventCombatEnded.java -text
-forge-gui/src/main/java/forge/game/event/GameEventFlipCoin.java -text
-forge-gui/src/main/java/forge/game/event/GameEventGameFinished.java -text
-forge-gui/src/main/java/forge/game/event/GameEventGameOutcome.java -text
-forge-gui/src/main/java/forge/game/event/GameEventGameRestarted.java -text
-forge-gui/src/main/java/forge/game/event/GameEventGameStarted.java -text
-forge-gui/src/main/java/forge/game/event/GameEventLandPlayed.java -text
-forge-gui/src/main/java/forge/game/event/GameEventManaBurn.java -text
-forge-gui/src/main/java/forge/game/event/GameEventManaPool.java -text
-forge-gui/src/main/java/forge/game/event/GameEventMulligan.java -text
-forge-gui/src/main/java/forge/game/event/GameEventPlayerControl.java -text
-forge-gui/src/main/java/forge/game/event/GameEventPlayerDamaged.java -text
-forge-gui/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java -text
-forge-gui/src/main/java/forge/game/event/GameEventPlayerPoisoned.java -text
-forge-gui/src/main/java/forge/game/event/GameEventPlayerPriority.java -text
-forge-gui/src/main/java/forge/game/event/GameEventShuffle.java -text
-forge-gui/src/main/java/forge/game/event/GameEventSpellAbilityCast.java -text
-forge-gui/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java -text
-forge-gui/src/main/java/forge/game/event/GameEventSpellResolved.java -text
-forge-gui/src/main/java/forge/game/event/GameEventTokenCreated.java -text
-forge-gui/src/main/java/forge/game/event/GameEventTurnBegan.java -text
-forge-gui/src/main/java/forge/game/event/GameEventTurnEnded.java -text
-forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java -text
-forge-gui/src/main/java/forge/game/event/GameEventZone.java -text
-forge-gui/src/main/java/forge/game/event/IGameEventVisitor.java -text
-forge-gui/src/main/java/forge/game/event/package-info.java -text
-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
-forge-gui/src/main/java/forge/game/phase/Phase.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/phase/PhaseHandler.java -text
-forge-gui/src/main/java/forge/game/phase/PhaseType.java -text
-forge-gui/src/main/java/forge/game/phase/Untap.java -text
-forge-gui/src/main/java/forge/game/phase/Upkeep.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/phase/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/player/GameLossReason.java -text
-forge-gui/src/main/java/forge/game/player/LobbyPlayer.java -text
-forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java -text
-forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java -text
-forge-gui/src/main/java/forge/game/player/Player.java svneol=native#text/plain
-forge-gui/src/main/java/forge/game/player/PlayerActionConfirmMode.java -text
-forge-gui/src/main/java/forge/game/player/PlayerController.java -text
-forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java -text
-forge-gui/src/main/java/forge/game/player/PlayerOutcome.java -text
-forge-gui/src/main/java/forge/game/player/PlayerStatistics.java -text
-forge-gui/src/main/java/forge/game/player/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/ReplaceAddCounter.java -text
-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/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/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/game/zone/Zone.java -text
-forge-gui/src/main/java/forge/game/zone/ZoneType.java -text
-forge-gui/src/main/java/forge/game/zone/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/gauntlet/GauntletData.java -text
 forge-gui/src/main/java/forge/gauntlet/GauntletIO.java -text
 forge-gui/src/main/java/forge/gui/CardContainer.java svneol=native#text/plain
@@ -15682,12 +15686,6 @@ forge-gui/src/main/java/forge/util/MultiplexOutputStream.java svneol=native#text
 forge-gui/src/main/java/forge/util/NameGenerator.java -text
 forge-gui/src/main/java/forge/util/OperatingSystem.java -text
 forge-gui/src/main/java/forge/util/XmlUtil.java -text
-forge-gui/src/main/java/forge/util/maps/EnumMapOfLists.java -text
-forge-gui/src/main/java/forge/util/maps/EnumMapToAmount.java -text
-forge-gui/src/main/java/forge/util/maps/HashMapOfLists.java -text
-forge-gui/src/main/java/forge/util/maps/MapOfLists.java -text
-forge-gui/src/main/java/forge/util/maps/MapToAmount.java -text
-forge-gui/src/main/java/forge/util/maps/package-info.java -text
 forge-gui/src/main/java/forge/util/package-info.java -text
 forge-gui/src/main/java/forge/view/ButtonUtil.java svneol=native#text/plain
 forge-gui/src/main/java/forge/view/CardReaderExperiments.java -text
diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml
index 088df599180..3f5cc7a4880 100644
--- a/forge-ai/pom.xml
+++ b/forge-ai/pom.xml
@@ -18,11 +18,6 @@
             <artifactId>forge-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>forge</groupId>
-            <artifactId>forge-game</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
     </dependencies>
 </project>
diff --git a/forge-gui/src/main/java/forge/util/maps/EnumMapOfLists.java b/forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java
similarity index 100%
rename from forge-gui/src/main/java/forge/util/maps/EnumMapOfLists.java
rename to forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java
diff --git a/forge-gui/src/main/java/forge/util/maps/EnumMapToAmount.java b/forge-core/src/main/java/forge/util/maps/EnumMapToAmount.java
similarity index 100%
rename from forge-gui/src/main/java/forge/util/maps/EnumMapToAmount.java
rename to forge-core/src/main/java/forge/util/maps/EnumMapToAmount.java
diff --git a/forge-gui/src/main/java/forge/util/maps/HashMapOfLists.java b/forge-core/src/main/java/forge/util/maps/HashMapOfLists.java
similarity index 100%
rename from forge-gui/src/main/java/forge/util/maps/HashMapOfLists.java
rename to forge-core/src/main/java/forge/util/maps/HashMapOfLists.java
diff --git a/forge-gui/src/main/java/forge/util/maps/MapOfLists.java b/forge-core/src/main/java/forge/util/maps/MapOfLists.java
similarity index 100%
rename from forge-gui/src/main/java/forge/util/maps/MapOfLists.java
rename to forge-core/src/main/java/forge/util/maps/MapOfLists.java
diff --git a/forge-gui/src/main/java/forge/util/maps/MapToAmount.java b/forge-core/src/main/java/forge/util/maps/MapToAmount.java
similarity index 100%
rename from forge-gui/src/main/java/forge/util/maps/MapToAmount.java
rename to forge-core/src/main/java/forge/util/maps/MapToAmount.java
diff --git a/forge-gui/src/main/java/forge/util/maps/package-info.java b/forge-core/src/main/java/forge/util/maps/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/util/maps/package-info.java
rename to forge-core/src/main/java/forge/util/maps/package-info.java
diff --git a/forge-game/pom.xml b/forge-game/pom.xml
index 370cd0d8adc..8018fc82b99 100644
--- a/forge-game/pom.xml
+++ b/forge-game/pom.xml
@@ -18,5 +18,10 @@
             <artifactId>forge-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode</groupId>
+            <artifactId>minlog</artifactId>
+            <version>1.2</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/forge-gui/src/main/java/forge/ai/AiAttackController.java b/forge-game/src/main/java/forge/ai/AiAttackController.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/AiAttackController.java
rename to forge-game/src/main/java/forge/ai/AiAttackController.java
diff --git a/forge-gui/src/main/java/forge/ai/AiBlockController.java b/forge-game/src/main/java/forge/ai/AiBlockController.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/AiBlockController.java
rename to forge-game/src/main/java/forge/ai/AiBlockController.java
diff --git a/forge-gui/src/main/java/forge/ai/AiController.java b/forge-game/src/main/java/forge/ai/AiController.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/AiController.java
rename to forge-game/src/main/java/forge/ai/AiController.java
diff --git a/forge-gui/src/main/java/forge/ai/AiCostDecision.java b/forge-game/src/main/java/forge/ai/AiCostDecision.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/AiCostDecision.java
rename to forge-game/src/main/java/forge/ai/AiCostDecision.java
diff --git a/forge-gui/src/main/java/forge/ai/AiProfileUtil.java b/forge-game/src/main/java/forge/ai/AiProfileUtil.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/AiProfileUtil.java
rename to forge-game/src/main/java/forge/ai/AiProfileUtil.java
diff --git a/forge-ai/src/main/java/forge/game/ai/AiProps.java b/forge-game/src/main/java/forge/ai/AiProps.java
similarity index 95%
rename from forge-ai/src/main/java/forge/game/ai/AiProps.java
rename to forge-game/src/main/java/forge/ai/AiProps.java
index b9c0909acf2..f32700aeefb 100644
--- a/forge-ai/src/main/java/forge/game/ai/AiProps.java
+++ b/forge-game/src/main/java/forge/ai/AiProps.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;
 
 /** 
  * AI personality profile settings identifiers, and their default values.
diff --git a/forge-gui/src/main/java/forge/ai/ComputerUtil.java b/forge-game/src/main/java/forge/ai/ComputerUtil.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ComputerUtil.java
rename to forge-game/src/main/java/forge/ai/ComputerUtil.java
diff --git a/forge-gui/src/main/java/forge/ai/ComputerUtilCard.java b/forge-game/src/main/java/forge/ai/ComputerUtilCard.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ComputerUtilCard.java
rename to forge-game/src/main/java/forge/ai/ComputerUtilCard.java
diff --git a/forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-game/src/main/java/forge/ai/ComputerUtilCombat.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java
rename to forge-game/src/main/java/forge/ai/ComputerUtilCombat.java
diff --git a/forge-gui/src/main/java/forge/ai/ComputerUtilCost.java b/forge-game/src/main/java/forge/ai/ComputerUtilCost.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ComputerUtilCost.java
rename to forge-game/src/main/java/forge/ai/ComputerUtilCost.java
diff --git a/forge-gui/src/main/java/forge/ai/ComputerUtilMana.java b/forge-game/src/main/java/forge/ai/ComputerUtilMana.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ComputerUtilMana.java
rename to forge-game/src/main/java/forge/ai/ComputerUtilMana.java
diff --git a/forge-gui/src/main/java/forge/ai/SpellAbilityAi.java b/forge-game/src/main/java/forge/ai/SpellAbilityAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/SpellAbilityAi.java
rename to forge-game/src/main/java/forge/ai/SpellAbilityAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java b/forge-game/src/main/java/forge/ai/ability/AddPhaseAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java
rename to forge-game/src/main/java/forge/ai/ability/AddPhaseAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java b/forge-game/src/main/java/forge/ai/ability/AddTurnAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java
rename to forge-game/src/main/java/forge/ai/ability/AddTurnAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java b/forge-game/src/main/java/forge/ai/ability/AlwaysPlayAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java
rename to forge-game/src/main/java/forge/ai/ability/AlwaysPlayAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/AnimateAi.java b/forge-game/src/main/java/forge/ai/ability/AnimateAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/AnimateAi.java
rename to forge-game/src/main/java/forge/ai/ability/AnimateAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java b/forge-game/src/main/java/forge/ai/ability/AnimateAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/AnimateAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/AttachAi.java b/forge-game/src/main/java/forge/ai/ability/AttachAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/AttachAi.java
rename to forge-game/src/main/java/forge/ai/ability/AttachAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/BalanceAi.java b/forge-game/src/main/java/forge/ai/ability/BalanceAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/BalanceAi.java
rename to forge-game/src/main/java/forge/ai/ability/BalanceAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java b/forge-game/src/main/java/forge/ai/ability/BecomesBlockedAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java
rename to forge-game/src/main/java/forge/ai/ability/BecomesBlockedAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/BondAi.java b/forge-game/src/main/java/forge/ai/ability/BondAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/BondAi.java
rename to forge-game/src/main/java/forge/ai/ability/BondAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java b/forge-game/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java
rename to forge-game/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java b/forge-game/src/main/java/forge/ai/ability/CannotPlayAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java
rename to forge-game/src/main/java/forge/ai/ability/CannotPlayAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java b/forge-game/src/main/java/forge/ai/ability/ChangeTargetsAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChangeTargetsAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-game/src/main/java/forge/ai/ability/ChangeZoneAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChangeZoneAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java b/forge-game/src/main/java/forge/ai/ability/ChangeZoneAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChangeZoneAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CharmAi.java b/forge-game/src/main/java/forge/ai/ability/CharmAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CharmAi.java
rename to forge-game/src/main/java/forge/ai/ability/CharmAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseCardAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChooseCardAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseCardNameAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChooseCardNameAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseColorAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChooseColorAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java b/forge-game/src/main/java/forge/ai/ability/ChoosePlayerAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChoosePlayerAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseSourceAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChooseSourceAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseTypeAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java
rename to forge-game/src/main/java/forge/ai/ability/ChooseTypeAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ClashAi.java b/forge-game/src/main/java/forge/ai/ability/ClashAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ClashAi.java
rename to forge-game/src/main/java/forge/ai/ability/ClashAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CloneAi.java b/forge-game/src/main/java/forge/ai/ability/CloneAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CloneAi.java
rename to forge-game/src/main/java/forge/ai/ability/CloneAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/ControlExchangeAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java
rename to forge-game/src/main/java/forge/ai/ability/ControlExchangeAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java b/forge-game/src/main/java/forge/ai/ability/ControlGainAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java
rename to forge-game/src/main/java/forge/ai/ability/ControlGainAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java b/forge-game/src/main/java/forge/ai/ability/CopyPermanentAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java
rename to forge-game/src/main/java/forge/ai/ability/CopyPermanentAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CounterAi.java b/forge-game/src/main/java/forge/ai/ability/CounterAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CounterAi.java
rename to forge-game/src/main/java/forge/ai/ability/CounterAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CountersAi.java b/forge-game/src/main/java/forge/ai/ability/CountersAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CountersAi.java
rename to forge-game/src/main/java/forge/ai/ability/CountersAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java b/forge-game/src/main/java/forge/ai/ability/CountersMoveAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java
rename to forge-game/src/main/java/forge/ai/ability/CountersMoveAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java b/forge-game/src/main/java/forge/ai/ability/CountersProliferateAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java
rename to forge-game/src/main/java/forge/ai/ability/CountersProliferateAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-game/src/main/java/forge/ai/ability/CountersPutAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java
rename to forge-game/src/main/java/forge/ai/ability/CountersPutAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java b/forge-game/src/main/java/forge/ai/ability/CountersPutAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/CountersPutAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java b/forge-game/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java
rename to forge-game/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java b/forge-game/src/main/java/forge/ai/ability/CountersRemoveAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java
rename to forge-game/src/main/java/forge/ai/ability/CountersRemoveAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java b/forge-game/src/main/java/forge/ai/ability/DamageAiBase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java
rename to forge-game/src/main/java/forge/ai/ability/DamageAiBase.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java b/forge-game/src/main/java/forge/ai/ability/DamageAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/DamageAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-game/src/main/java/forge/ai/ability/DamageDealAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java
rename to forge-game/src/main/java/forge/ai/ability/DamageDealAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java b/forge-game/src/main/java/forge/ai/ability/DamageEachAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DamageEachAi.java
rename to forge-game/src/main/java/forge/ai/ability/DamageEachAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java b/forge-game/src/main/java/forge/ai/ability/DamagePreventAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java
rename to forge-game/src/main/java/forge/ai/ability/DamagePreventAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java b/forge-game/src/main/java/forge/ai/ability/DamagePreventAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/DamagePreventAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DebuffAi.java b/forge-game/src/main/java/forge/ai/ability/DebuffAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DebuffAi.java
rename to forge-game/src/main/java/forge/ai/ability/DebuffAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java b/forge-game/src/main/java/forge/ai/ability/DebuffAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/DebuffAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java b/forge-game/src/main/java/forge/ai/ability/DelayedTriggerAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java
rename to forge-game/src/main/java/forge/ai/ability/DelayedTriggerAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DestroyAi.java b/forge-game/src/main/java/forge/ai/ability/DestroyAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DestroyAi.java
rename to forge-game/src/main/java/forge/ai/ability/DestroyAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java b/forge-game/src/main/java/forge/ai/ability/DestroyAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/DestroyAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DigAi.java b/forge-game/src/main/java/forge/ai/ability/DigAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DigAi.java
rename to forge-game/src/main/java/forge/ai/ability/DigAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java b/forge-game/src/main/java/forge/ai/ability/DigUntilAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java
rename to forge-game/src/main/java/forge/ai/ability/DigUntilAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DiscardAi.java b/forge-game/src/main/java/forge/ai/ability/DiscardAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DiscardAi.java
rename to forge-game/src/main/java/forge/ai/ability/DiscardAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java b/forge-game/src/main/java/forge/ai/ability/DrainManaAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java
rename to forge-game/src/main/java/forge/ai/ability/DrainManaAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/DrawAi.java b/forge-game/src/main/java/forge/ai/ability/DrawAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/DrawAi.java
rename to forge-game/src/main/java/forge/ai/ability/DrawAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/EffectAi.java b/forge-game/src/main/java/forge/ai/ability/EffectAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/EffectAi.java
rename to forge-game/src/main/java/forge/ai/ability/EffectAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/EncodeAi.java b/forge-game/src/main/java/forge/ai/ability/EncodeAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/EncodeAi.java
rename to forge-game/src/main/java/forge/ai/ability/EncodeAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java b/forge-game/src/main/java/forge/ai/ability/EndTurnAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java
rename to forge-game/src/main/java/forge/ai/ability/EndTurnAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/FightAi.java b/forge-game/src/main/java/forge/ai/ability/FightAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/FightAi.java
rename to forge-game/src/main/java/forge/ai/ability/FightAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java b/forge-game/src/main/java/forge/ai/ability/FlipACoinAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java
rename to forge-game/src/main/java/forge/ai/ability/FlipACoinAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/FogAi.java b/forge-game/src/main/java/forge/ai/ability/FogAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/FogAi.java
rename to forge-game/src/main/java/forge/ai/ability/FogAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/GameLossAi.java b/forge-game/src/main/java/forge/ai/ability/GameLossAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/GameLossAi.java
rename to forge-game/src/main/java/forge/ai/ability/GameLossAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/GameWinAi.java b/forge-game/src/main/java/forge/ai/ability/GameWinAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/GameWinAi.java
rename to forge-game/src/main/java/forge/ai/ability/GameWinAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/HauntAi.java b/forge-game/src/main/java/forge/ai/ability/HauntAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/HauntAi.java
rename to forge-game/src/main/java/forge/ai/ability/HauntAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java b/forge-game/src/main/java/forge/ai/ability/LegendaryRuleAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java
rename to forge-game/src/main/java/forge/ai/ability/LegendaryRuleAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/LifeExchangeAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java
rename to forge-game/src/main/java/forge/ai/ability/LifeExchangeAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java b/forge-game/src/main/java/forge/ai/ability/LifeGainAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java
rename to forge-game/src/main/java/forge/ai/ability/LifeGainAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java b/forge-game/src/main/java/forge/ai/ability/LifeLoseAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java
rename to forge-game/src/main/java/forge/ai/ability/LifeLoseAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java b/forge-game/src/main/java/forge/ai/ability/LifeSetAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java
rename to forge-game/src/main/java/forge/ai/ability/LifeSetAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java b/forge-game/src/main/java/forge/ai/ability/ManaEffectAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java
rename to forge-game/src/main/java/forge/ai/ability/ManaEffectAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/MillAi.java b/forge-game/src/main/java/forge/ai/ability/MillAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/MillAi.java
rename to forge-game/src/main/java/forge/ai/ability/MillAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java b/forge-game/src/main/java/forge/ai/ability/MustAttackAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java
rename to forge-game/src/main/java/forge/ai/ability/MustAttackAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java b/forge-game/src/main/java/forge/ai/ability/MustBlockAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java
rename to forge-game/src/main/java/forge/ai/ability/MustBlockAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java b/forge-game/src/main/java/forge/ai/ability/PeekAndRevealAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java
rename to forge-game/src/main/java/forge/ai/ability/PeekAndRevealAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java b/forge-game/src/main/java/forge/ai/ability/PermanentCreatureAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java
rename to forge-game/src/main/java/forge/ai/ability/PermanentCreatureAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java b/forge-game/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java
rename to forge-game/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PhasesAi.java b/forge-game/src/main/java/forge/ai/ability/PhasesAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PhasesAi.java
rename to forge-game/src/main/java/forge/ai/ability/PhasesAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PlayAi.java b/forge-game/src/main/java/forge/ai/ability/PlayAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PlayAi.java
rename to forge-game/src/main/java/forge/ai/ability/PlayAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PoisonAi.java b/forge-game/src/main/java/forge/ai/ability/PoisonAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PoisonAi.java
rename to forge-game/src/main/java/forge/ai/ability/PoisonAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/PowerExchangeAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java
rename to forge-game/src/main/java/forge/ai/ability/PowerExchangeAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ProtectAi.java b/forge-game/src/main/java/forge/ai/ability/ProtectAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ProtectAi.java
rename to forge-game/src/main/java/forge/ai/ability/ProtectAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java b/forge-game/src/main/java/forge/ai/ability/ProtectAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/ProtectAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PumpAi.java b/forge-game/src/main/java/forge/ai/ability/PumpAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PumpAi.java
rename to forge-game/src/main/java/forge/ai/ability/PumpAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java b/forge-game/src/main/java/forge/ai/ability/PumpAiBase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java
rename to forge-game/src/main/java/forge/ai/ability/PumpAiBase.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/PumpAllAi.java b/forge-game/src/main/java/forge/ai/ability/PumpAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/PumpAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/PumpAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java b/forge-game/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
rename to forge-game/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java b/forge-game/src/main/java/forge/ai/ability/RegenerateAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java
rename to forge-game/src/main/java/forge/ai/ability/RegenerateAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java b/forge-game/src/main/java/forge/ai/ability/RegenerateAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/RegenerateAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java b/forge-game/src/main/java/forge/ai/ability/RemoveFromCombatAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java
rename to forge-game/src/main/java/forge/ai/ability/RemoveFromCombatAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RepeatAi.java b/forge-game/src/main/java/forge/ai/ability/RepeatAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RepeatAi.java
rename to forge-game/src/main/java/forge/ai/ability/RepeatAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java b/forge-game/src/main/java/forge/ai/ability/RepeatEachAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java
rename to forge-game/src/main/java/forge/ai/ability/RepeatEachAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java b/forge-game/src/main/java/forge/ai/ability/RestartGameAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java
rename to forge-game/src/main/java/forge/ai/ability/RestartGameAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RevealAi.java b/forge-game/src/main/java/forge/ai/ability/RevealAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RevealAi.java
rename to forge-game/src/main/java/forge/ai/ability/RevealAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java b/forge-game/src/main/java/forge/ai/ability/RevealAiBase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java
rename to forge-game/src/main/java/forge/ai/ability/RevealAiBase.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java b/forge-game/src/main/java/forge/ai/ability/RevealHandAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java
rename to forge-game/src/main/java/forge/ai/ability/RevealHandAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java b/forge-game/src/main/java/forge/ai/ability/RollPlanarDiceAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java
rename to forge-game/src/main/java/forge/ai/ability/RollPlanarDiceAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java b/forge-game/src/main/java/forge/ai/ability/SacrificeAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java
rename to forge-game/src/main/java/forge/ai/ability/SacrificeAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java b/forge-game/src/main/java/forge/ai/ability/SacrificeAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/SacrificeAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ScryAi.java b/forge-game/src/main/java/forge/ai/ability/ScryAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ScryAi.java
rename to forge-game/src/main/java/forge/ai/ability/ScryAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/SetStateAi.java b/forge-game/src/main/java/forge/ai/ability/SetStateAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/SetStateAi.java
rename to forge-game/src/main/java/forge/ai/ability/SetStateAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java b/forge-game/src/main/java/forge/ai/ability/ShuffleAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java
rename to forge-game/src/main/java/forge/ai/ability/ShuffleAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java b/forge-game/src/main/java/forge/ai/ability/StoreSVarAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java
rename to forge-game/src/main/java/forge/ai/ability/StoreSVarAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/TapAi.java b/forge-game/src/main/java/forge/ai/ability/TapAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/TapAi.java
rename to forge-game/src/main/java/forge/ai/ability/TapAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/TapAiBase.java b/forge-game/src/main/java/forge/ai/ability/TapAiBase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/TapAiBase.java
rename to forge-game/src/main/java/forge/ai/ability/TapAiBase.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/TapAllAi.java b/forge-game/src/main/java/forge/ai/ability/TapAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/TapAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/TapAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/TapOrUntapAi.java b/forge-game/src/main/java/forge/ai/ability/TapOrUntapAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/TapOrUntapAi.java
rename to forge-game/src/main/java/forge/ai/ability/TapOrUntapAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java b/forge-game/src/main/java/forge/ai/ability/TapOrUntapAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/TapOrUntapAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/TokenAi.java b/forge-game/src/main/java/forge/ai/ability/TokenAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/TokenAi.java
rename to forge-game/src/main/java/forge/ai/ability/TokenAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/TwoPilesAi.java b/forge-game/src/main/java/forge/ai/ability/TwoPilesAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/TwoPilesAi.java
rename to forge-game/src/main/java/forge/ai/ability/TwoPilesAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java b/forge-game/src/main/java/forge/ai/ability/UnattachAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/UnattachAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/UntapAi.java b/forge-game/src/main/java/forge/ai/ability/UntapAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/UntapAi.java
rename to forge-game/src/main/java/forge/ai/ability/UntapAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java b/forge-game/src/main/java/forge/ai/ability/UntapAllAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java
rename to forge-game/src/main/java/forge/ai/ability/UntapAllAi.java
diff --git a/forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/ZoneExchangeAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java
rename to forge-game/src/main/java/forge/ai/ability/ZoneExchangeAi.java
diff --git a/forge-gui/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/Game.java
rename to forge-game/src/main/java/forge/game/Game.java
diff --git a/forge-gui/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameAction.java
rename to forge-game/src/main/java/forge/game/GameAction.java
diff --git a/forge-gui/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameActionUtil.java
rename to forge-game/src/main/java/forge/game/GameActionUtil.java
diff --git a/forge-gui/src/main/java/forge/game/GameEndReason.java b/forge-game/src/main/java/forge/game/GameEndReason.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameEndReason.java
rename to forge-game/src/main/java/forge/game/GameEndReason.java
diff --git a/forge-gui/src/main/java/forge/game/GameEntity.java b/forge-game/src/main/java/forge/game/GameEntity.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameEntity.java
rename to forge-game/src/main/java/forge/game/GameEntity.java
diff --git a/forge-gui/src/main/java/forge/game/GameLog.java b/forge-game/src/main/java/forge/game/GameLog.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameLog.java
rename to forge-game/src/main/java/forge/game/GameLog.java
diff --git a/forge-gui/src/main/java/forge/game/GameLogEntry.java b/forge-game/src/main/java/forge/game/GameLogEntry.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameLogEntry.java
rename to forge-game/src/main/java/forge/game/GameLogEntry.java
diff --git a/forge-gui/src/main/java/forge/game/GameLogEntryType.java b/forge-game/src/main/java/forge/game/GameLogEntryType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameLogEntryType.java
rename to forge-game/src/main/java/forge/game/GameLogEntryType.java
diff --git a/forge-gui/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameLogFormatter.java
rename to forge-game/src/main/java/forge/game/GameLogFormatter.java
diff --git a/forge-gui/src/main/java/forge/game/GameObject.java b/forge-game/src/main/java/forge/game/GameObject.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameObject.java
rename to forge-game/src/main/java/forge/game/GameObject.java
diff --git a/forge-gui/src/main/java/forge/game/GameOutcome.java b/forge-game/src/main/java/forge/game/GameOutcome.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameOutcome.java
rename to forge-game/src/main/java/forge/game/GameOutcome.java
diff --git a/forge-gui/src/main/java/forge/game/GameStage.java b/forge-game/src/main/java/forge/game/GameStage.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameStage.java
rename to forge-game/src/main/java/forge/game/GameStage.java
diff --git a/forge-gui/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GameType.java
rename to forge-game/src/main/java/forge/game/GameType.java
diff --git a/forge-gui/src/main/java/forge/game/GlobalRuleChange.java b/forge-game/src/main/java/forge/game/GlobalRuleChange.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/GlobalRuleChange.java
rename to forge-game/src/main/java/forge/game/GlobalRuleChange.java
diff --git a/forge-gui/src/main/java/forge/game/Match.java b/forge-game/src/main/java/forge/game/Match.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/Match.java
rename to forge-game/src/main/java/forge/game/Match.java
diff --git a/forge-gui/src/main/java/forge/game/PlanarDice.java b/forge-game/src/main/java/forge/game/PlanarDice.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/PlanarDice.java
rename to forge-game/src/main/java/forge/game/PlanarDice.java
diff --git a/forge-gui/src/main/java/forge/game/StaticEffect.java b/forge-game/src/main/java/forge/game/StaticEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/StaticEffect.java
rename to forge-game/src/main/java/forge/game/StaticEffect.java
diff --git a/forge-gui/src/main/java/forge/game/StaticEffects.java b/forge-game/src/main/java/forge/game/StaticEffects.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/StaticEffects.java
rename to forge-game/src/main/java/forge/game/StaticEffects.java
diff --git a/forge-gui/src/main/java/forge/game/TriggerReplacementBase.java b/forge-game/src/main/java/forge/game/TriggerReplacementBase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/TriggerReplacementBase.java
rename to forge-game/src/main/java/forge/game/TriggerReplacementBase.java
diff --git a/forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java b/forge-game/src/main/java/forge/game/ability/AbilityApiBased.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/AbilityApiBased.java
rename to forge-game/src/main/java/forge/game/ability/AbilityApiBased.java
diff --git a/forge-gui/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/AbilityFactory.java
rename to forge-game/src/main/java/forge/game/ability/AbilityFactory.java
diff --git a/forge-gui/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/AbilityUtils.java
rename to forge-game/src/main/java/forge/game/ability/AbilityUtils.java
diff --git a/forge-gui/src/main/java/forge/game/ability/ApiType.java b/forge-game/src/main/java/forge/game/ability/ApiType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/ApiType.java
rename to forge-game/src/main/java/forge/game/ability/ApiType.java
diff --git a/forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java b/forge-game/src/main/java/forge/game/ability/SaTargetRoutines.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java
rename to forge-game/src/main/java/forge/game/ability/SaTargetRoutines.java
diff --git a/forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java
rename to forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/SpellApiBased.java b/forge-game/src/main/java/forge/game/ability/SpellApiBased.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/SpellApiBased.java
rename to forge-game/src/main/java/forge/game/ability/SpellApiBased.java
diff --git a/forge-gui/src/main/java/forge/game/ability/StaticAbilityApiBased.java b/forge-game/src/main/java/forge/game/ability/StaticAbilityApiBased.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/StaticAbilityApiBased.java
rename to forge-game/src/main/java/forge/game/ability/StaticAbilityApiBased.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/AddPhaseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/AddTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/AddTurnEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/AnimateAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/AnimateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/AnimateEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/AnimateEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
rename to forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/AttachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/AttachEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/BalanceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/BalanceEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/BondEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BondEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/BondEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/BondEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CharmEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChooseColorEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChooseColorEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ClashEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ClashEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CleanUpEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CleanUpEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CleanUpEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CleanUpEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CloneEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ControlGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ControlGainEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CounterEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CountersMoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CountersMoveEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DamageAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DamageAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DamageDealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DamageDealEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DamageEachEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DamagePreventEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DamagePreventEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DebuffAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DebuffAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DebuffAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DebuffAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DebuffEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DebuffEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DestroyAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DestroyAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DestroyEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DestroyEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DigEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DigUntilEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DigUntilEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DiscardEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DrainManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DrainManaEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/DrawEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/DrawEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ETBReplacementEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/EffectEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/EncodeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/EncodeEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/EndTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/EndTurnEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/FightEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/FightEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/FlipCoinEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/FogEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/FogEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/FogEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/GameLossEffect.java b/forge-game/src/main/java/forge/game/ability/effects/GameLossEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/GameLossEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/GameLossEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/GameWinEffect.java b/forge-game/src/main/java/forge/game/ability/effects/GameWinEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/GameWinEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/GameWinEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/LifeGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/LifeGainEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/LifeLoseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeLoseEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/LifeLoseEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/LifeLoseEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/LifeSetEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/LifeSetEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ManaEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/MillEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/MillEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/MillEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/MustAttackEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/MustAttackEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/MustBlockEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/MustBlockEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PermanentNoncreatureEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PhasesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PhasesEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PlayEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PoisonEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PoisonEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ProtectAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ProtectAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ProtectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ProtectEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PumpAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/PumpEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RegenerateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerateEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RegenerateEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RegenerateEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RepeatEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RestartGameEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RevealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RevealEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RevealHandEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RevealHandEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RollPlanarDiceEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/SacrificeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/SacrificeEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ScryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ScryEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/SetInMotionEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SetInMotionEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/SetInMotionEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/SetInMotionEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/SetStateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/SetStateEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ShuffleEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ShuffleEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/SkipTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/SkipTurnEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java b/forge-game/src/main/java/forge/game/ability/effects/StoreSVarEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/StoreSVarEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/StoreSVarEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/TapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/TapAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/TapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/TapEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/TapEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/TokenEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/TwoPilesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/TwoPilesEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/UnattachAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/UnattachAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/UntapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/UntapAllEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UntapEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/UntapEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java
rename to forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java
diff --git a/forge-gui/src/main/java/forge/game/ability/package-info.java b/forge-game/src/main/java/forge/game/ability/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/ability/package-info.java
rename to forge-game/src/main/java/forge/game/ability/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/Card.java
rename to forge-game/src/main/java/forge/game/card/Card.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardCharacteristics.java b/forge-game/src/main/java/forge/game/card/CardCharacteristics.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardCharacteristics.java
rename to forge-game/src/main/java/forge/game/card/CardCharacteristics.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardColor.java b/forge-game/src/main/java/forge/game/card/CardColor.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardColor.java
rename to forge-game/src/main/java/forge/game/card/CardColor.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardDamageHistory.java b/forge-game/src/main/java/forge/game/card/CardDamageHistory.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardDamageHistory.java
rename to forge-game/src/main/java/forge/game/card/CardDamageHistory.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardFactory.java
rename to forge-game/src/main/java/forge/game/card/CardFactory.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java
rename to forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardKeywords.java b/forge-game/src/main/java/forge/game/card/CardKeywords.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardKeywords.java
rename to forge-game/src/main/java/forge/game/card/CardKeywords.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardLists.java b/forge-game/src/main/java/forge/game/card/CardLists.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardLists.java
rename to forge-game/src/main/java/forge/game/card/CardLists.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardPowerToughness.java b/forge-game/src/main/java/forge/game/card/CardPowerToughness.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardPowerToughness.java
rename to forge-game/src/main/java/forge/game/card/CardPowerToughness.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardPredicates.java b/forge-game/src/main/java/forge/game/card/CardPredicates.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardPredicates.java
rename to forge-game/src/main/java/forge/game/card/CardPredicates.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardShields.java b/forge-game/src/main/java/forge/game/card/CardShields.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardShields.java
rename to forge-game/src/main/java/forge/game/card/CardShields.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardType.java b/forge-game/src/main/java/forge/game/card/CardType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardType.java
rename to forge-game/src/main/java/forge/game/card/CardType.java
diff --git a/forge-gui/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CardUtil.java
rename to forge-game/src/main/java/forge/game/card/CardUtil.java
diff --git a/forge-gui/src/main/java/forge/game/card/CounterType.java b/forge-game/src/main/java/forge/game/card/CounterType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/card/CounterType.java
rename to forge-game/src/main/java/forge/game/card/CounterType.java
diff --git a/forge-gui/src/main/java/forge/game/combat/AttackingBand.java b/forge-game/src/main/java/forge/game/combat/AttackingBand.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/combat/AttackingBand.java
rename to forge-game/src/main/java/forge/game/combat/AttackingBand.java
diff --git a/forge-gui/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/combat/Combat.java
rename to forge-game/src/main/java/forge/game/combat/Combat.java
diff --git a/forge-gui/src/main/java/forge/game/combat/CombatLki.java b/forge-game/src/main/java/forge/game/combat/CombatLki.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/combat/CombatLki.java
rename to forge-game/src/main/java/forge/game/combat/CombatLki.java
diff --git a/forge-gui/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/combat/CombatUtil.java
rename to forge-game/src/main/java/forge/game/combat/CombatUtil.java
diff --git a/forge-gui/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/Cost.java
rename to forge-game/src/main/java/forge/game/cost/Cost.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostAddMana.java b/forge-game/src/main/java/forge/game/cost/CostAddMana.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostAddMana.java
rename to forge-game/src/main/java/forge/game/cost/CostAddMana.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostChooseCreatureType.java b/forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostChooseCreatureType.java
rename to forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostDamage.java b/forge-game/src/main/java/forge/game/cost/CostDamage.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostDamage.java
rename to forge-game/src/main/java/forge/game/cost/CostDamage.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostDecisionMakerBase.java b/forge-game/src/main/java/forge/game/cost/CostDecisionMakerBase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostDecisionMakerBase.java
rename to forge-game/src/main/java/forge/game/cost/CostDecisionMakerBase.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostDiscard.java b/forge-game/src/main/java/forge/game/cost/CostDiscard.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostDiscard.java
rename to forge-game/src/main/java/forge/game/cost/CostDiscard.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostDraw.java b/forge-game/src/main/java/forge/game/cost/CostDraw.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostDraw.java
rename to forge-game/src/main/java/forge/game/cost/CostDraw.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostExile.java b/forge-game/src/main/java/forge/game/cost/CostExile.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostExile.java
rename to forge-game/src/main/java/forge/game/cost/CostExile.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostExiledMoveToGrave.java b/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostExiledMoveToGrave.java
rename to forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java b/forge-game/src/main/java/forge/game/cost/CostFlipCoin.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java
rename to forge-game/src/main/java/forge/game/cost/CostFlipCoin.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostGainControl.java b/forge-game/src/main/java/forge/game/cost/CostGainControl.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostGainControl.java
rename to forge-game/src/main/java/forge/game/cost/CostGainControl.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostGainLife.java b/forge-game/src/main/java/forge/game/cost/CostGainLife.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostGainLife.java
rename to forge-game/src/main/java/forge/game/cost/CostGainLife.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostMill.java b/forge-game/src/main/java/forge/game/cost/CostMill.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostMill.java
rename to forge-game/src/main/java/forge/game/cost/CostMill.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostPart.java b/forge-game/src/main/java/forge/game/cost/CostPart.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostPart.java
rename to forge-game/src/main/java/forge/game/cost/CostPart.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostPartMana.java b/forge-game/src/main/java/forge/game/cost/CostPartMana.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostPartMana.java
rename to forge-game/src/main/java/forge/game/cost/CostPartMana.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostPartWithList.java b/forge-game/src/main/java/forge/game/cost/CostPartWithList.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostPartWithList.java
rename to forge-game/src/main/java/forge/game/cost/CostPartWithList.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostPayLife.java b/forge-game/src/main/java/forge/game/cost/CostPayLife.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostPayLife.java
rename to forge-game/src/main/java/forge/game/cost/CostPayLife.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostPayment.java b/forge-game/src/main/java/forge/game/cost/CostPayment.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostPayment.java
rename to forge-game/src/main/java/forge/game/cost/CostPayment.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java b/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java
rename to forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostPutCounter.java b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostPutCounter.java
rename to forge-game/src/main/java/forge/game/cost/CostPutCounter.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java
rename to forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java
rename to forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostReturn.java b/forge-game/src/main/java/forge/game/cost/CostReturn.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostReturn.java
rename to forge-game/src/main/java/forge/game/cost/CostReturn.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostReveal.java b/forge-game/src/main/java/forge/game/cost/CostReveal.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostReveal.java
rename to forge-game/src/main/java/forge/game/cost/CostReveal.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostSacrifice.java b/forge-game/src/main/java/forge/game/cost/CostSacrifice.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostSacrifice.java
rename to forge-game/src/main/java/forge/game/cost/CostSacrifice.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostTap.java b/forge-game/src/main/java/forge/game/cost/CostTap.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostTap.java
rename to forge-game/src/main/java/forge/game/cost/CostTap.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostTapType.java
rename to forge-game/src/main/java/forge/game/cost/CostTapType.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostUnattach.java b/forge-game/src/main/java/forge/game/cost/CostUnattach.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostUnattach.java
rename to forge-game/src/main/java/forge/game/cost/CostUnattach.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostUntap.java b/forge-game/src/main/java/forge/game/cost/CostUntap.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostUntap.java
rename to forge-game/src/main/java/forge/game/cost/CostUntap.java
diff --git a/forge-gui/src/main/java/forge/game/cost/CostUntapType.java b/forge-game/src/main/java/forge/game/cost/CostUntapType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/CostUntapType.java
rename to forge-game/src/main/java/forge/game/cost/CostUntapType.java
diff --git a/forge-gui/src/main/java/forge/game/cost/ICostVisitor.java b/forge-game/src/main/java/forge/game/cost/ICostVisitor.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/ICostVisitor.java
rename to forge-game/src/main/java/forge/game/cost/ICostVisitor.java
diff --git a/forge-gui/src/main/java/forge/game/cost/PaymentDecision.java b/forge-game/src/main/java/forge/game/cost/PaymentDecision.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/PaymentDecision.java
rename to forge-game/src/main/java/forge/game/cost/PaymentDecision.java
diff --git a/forge-gui/src/main/java/forge/game/cost/package-info.java b/forge-game/src/main/java/forge/game/cost/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/cost/package-info.java
rename to forge-game/src/main/java/forge/game/cost/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/event/EventValueChangeType.java b/forge-game/src/main/java/forge/game/event/EventValueChangeType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/EventValueChangeType.java
rename to forge-game/src/main/java/forge/game/event/EventValueChangeType.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEvent.java b/forge-game/src/main/java/forge/game/event/GameEvent.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEvent.java
rename to forge-game/src/main/java/forge/game/event/GameEvent.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventAnteCardsSelected.java b/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventAnteCardsSelected.java
rename to forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventAttackersDeclared.java b/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventAttackersDeclared.java
rename to forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventBlockersDeclared.java b/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventBlockersDeclared.java
rename to forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardAttachment.java b/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardAttachment.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardChangeZone.java b/forge-game/src/main/java/forge/game/event/GameEventCardChangeZone.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardChangeZone.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardChangeZone.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardCounters.java b/forge-game/src/main/java/forge/game/event/GameEventCardCounters.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardCounters.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardCounters.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardDamaged.java b/forge-game/src/main/java/forge/game/event/GameEventCardDamaged.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardDamaged.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardDamaged.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardDestroyed.java b/forge-game/src/main/java/forge/game/event/GameEventCardDestroyed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardDestroyed.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardDestroyed.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardPhased.java b/forge-game/src/main/java/forge/game/event/GameEventCardPhased.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardPhased.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardPhased.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardRegenerated.java b/forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardRegenerated.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardSacrificed.java b/forge-game/src/main/java/forge/game/event/GameEventCardSacrificed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardSacrificed.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardSacrificed.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardTapped.java b/forge-game/src/main/java/forge/game/event/GameEventCardTapped.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCardTapped.java
rename to forge-game/src/main/java/forge/game/event/GameEventCardTapped.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCombatEnded.java b/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventCombatEnded.java
rename to forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventFlipCoin.java b/forge-game/src/main/java/forge/game/event/GameEventFlipCoin.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventFlipCoin.java
rename to forge-game/src/main/java/forge/game/event/GameEventFlipCoin.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventGameFinished.java b/forge-game/src/main/java/forge/game/event/GameEventGameFinished.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventGameFinished.java
rename to forge-game/src/main/java/forge/game/event/GameEventGameFinished.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventGameOutcome.java b/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventGameOutcome.java
rename to forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventGameRestarted.java b/forge-game/src/main/java/forge/game/event/GameEventGameRestarted.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventGameRestarted.java
rename to forge-game/src/main/java/forge/game/event/GameEventGameRestarted.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventGameStarted.java b/forge-game/src/main/java/forge/game/event/GameEventGameStarted.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventGameStarted.java
rename to forge-game/src/main/java/forge/game/event/GameEventGameStarted.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventLandPlayed.java b/forge-game/src/main/java/forge/game/event/GameEventLandPlayed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventLandPlayed.java
rename to forge-game/src/main/java/forge/game/event/GameEventLandPlayed.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventManaBurn.java b/forge-game/src/main/java/forge/game/event/GameEventManaBurn.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventManaBurn.java
rename to forge-game/src/main/java/forge/game/event/GameEventManaBurn.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventManaPool.java b/forge-game/src/main/java/forge/game/event/GameEventManaPool.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventManaPool.java
rename to forge-game/src/main/java/forge/game/event/GameEventManaPool.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventMulligan.java b/forge-game/src/main/java/forge/game/event/GameEventMulligan.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventMulligan.java
rename to forge-game/src/main/java/forge/game/event/GameEventMulligan.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventPlayerControl.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerControl.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventPlayerControl.java
rename to forge-game/src/main/java/forge/game/event/GameEventPlayerControl.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventPlayerDamaged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerDamaged.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventPlayerDamaged.java
rename to forge-game/src/main/java/forge/game/event/GameEventPlayerDamaged.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java
rename to forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventPlayerPoisoned.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerPoisoned.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventPlayerPoisoned.java
rename to forge-game/src/main/java/forge/game/event/GameEventPlayerPoisoned.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventPlayerPriority.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerPriority.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventPlayerPriority.java
rename to forge-game/src/main/java/forge/game/event/GameEventPlayerPriority.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventShuffle.java b/forge-game/src/main/java/forge/game/event/GameEventShuffle.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventShuffle.java
rename to forge-game/src/main/java/forge/game/event/GameEventShuffle.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventSpellAbilityCast.java b/forge-game/src/main/java/forge/game/event/GameEventSpellAbilityCast.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventSpellAbilityCast.java
rename to forge-game/src/main/java/forge/game/event/GameEventSpellAbilityCast.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java b/forge-game/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java
rename to forge-game/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventSpellResolved.java b/forge-game/src/main/java/forge/game/event/GameEventSpellResolved.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventSpellResolved.java
rename to forge-game/src/main/java/forge/game/event/GameEventSpellResolved.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventTokenCreated.java b/forge-game/src/main/java/forge/game/event/GameEventTokenCreated.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventTokenCreated.java
rename to forge-game/src/main/java/forge/game/event/GameEventTokenCreated.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventTurnBegan.java b/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventTurnBegan.java
rename to forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventTurnEnded.java b/forge-game/src/main/java/forge/game/event/GameEventTurnEnded.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventTurnEnded.java
rename to forge-game/src/main/java/forge/game/event/GameEventTurnEnded.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java b/forge-game/src/main/java/forge/game/event/GameEventTurnPhase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java
rename to forge-game/src/main/java/forge/game/event/GameEventTurnPhase.java
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventZone.java b/forge-game/src/main/java/forge/game/event/GameEventZone.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/GameEventZone.java
rename to forge-game/src/main/java/forge/game/event/GameEventZone.java
diff --git a/forge-gui/src/main/java/forge/game/event/IGameEventVisitor.java b/forge-game/src/main/java/forge/game/event/IGameEventVisitor.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/IGameEventVisitor.java
rename to forge-game/src/main/java/forge/game/event/IGameEventVisitor.java
diff --git a/forge-gui/src/main/java/forge/game/event/package-info.java b/forge-game/src/main/java/forge/game/event/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/event/package-info.java
rename to forge-game/src/main/java/forge/game/event/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/mana/Mana.java b/forge-game/src/main/java/forge/game/mana/Mana.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/mana/Mana.java
rename to forge-game/src/main/java/forge/game/mana/Mana.java
diff --git a/forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/mana/ManaCostBeingPaid.java
rename to forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
diff --git a/forge-gui/src/main/java/forge/game/mana/ManaPool.java b/forge-game/src/main/java/forge/game/mana/ManaPool.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/mana/ManaPool.java
rename to forge-game/src/main/java/forge/game/mana/ManaPool.java
diff --git a/forge-gui/src/main/java/forge/game/mana/package-info.java b/forge-game/src/main/java/forge/game/mana/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/mana/package-info.java
rename to forge-game/src/main/java/forge/game/mana/package-info.java
diff --git a/forge-game/src/main/java/forge/game/package-info.java b/forge-game/src/main/java/forge/game/package-info.java
index 8921a7477e3..c1a6d89a2c5 100644
--- a/forge-game/src/main/java/forge/game/package-info.java
+++ b/forge-game/src/main/java/forge/game/package-info.java
@@ -1,8 +1,3 @@
-/**
- * 
- */
-/**
- * @author Max
- *
- */
-package forge.game;
\ No newline at end of file
+/** Forge Card Game. */
+package forge.game;
+
diff --git a/forge-gui/src/main/java/forge/game/phase/EndOfTurn.java b/forge-game/src/main/java/forge/game/phase/EndOfTurn.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/EndOfTurn.java
rename to forge-game/src/main/java/forge/game/phase/EndOfTurn.java
diff --git a/forge-gui/src/main/java/forge/game/phase/ExtraTurn.java b/forge-game/src/main/java/forge/game/phase/ExtraTurn.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/ExtraTurn.java
rename to forge-game/src/main/java/forge/game/phase/ExtraTurn.java
diff --git a/forge-gui/src/main/java/forge/game/phase/Phase.java b/forge-game/src/main/java/forge/game/phase/Phase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/Phase.java
rename to forge-game/src/main/java/forge/game/phase/Phase.java
diff --git a/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/PhaseHandler.java
rename to forge-game/src/main/java/forge/game/phase/PhaseHandler.java
diff --git a/forge-gui/src/main/java/forge/game/phase/PhaseType.java b/forge-game/src/main/java/forge/game/phase/PhaseType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/PhaseType.java
rename to forge-game/src/main/java/forge/game/phase/PhaseType.java
diff --git a/forge-gui/src/main/java/forge/game/phase/Untap.java b/forge-game/src/main/java/forge/game/phase/Untap.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/Untap.java
rename to forge-game/src/main/java/forge/game/phase/Untap.java
diff --git a/forge-gui/src/main/java/forge/game/phase/Upkeep.java b/forge-game/src/main/java/forge/game/phase/Upkeep.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/Upkeep.java
rename to forge-game/src/main/java/forge/game/phase/Upkeep.java
diff --git a/forge-gui/src/main/java/forge/game/phase/package-info.java b/forge-game/src/main/java/forge/game/phase/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/phase/package-info.java
rename to forge-game/src/main/java/forge/game/phase/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/player/GameLossReason.java b/forge-game/src/main/java/forge/game/player/GameLossReason.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/GameLossReason.java
rename to forge-game/src/main/java/forge/game/player/GameLossReason.java
diff --git a/forge-gui/src/main/java/forge/game/player/IHasIcon.java b/forge-game/src/main/java/forge/game/player/IHasIcon.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/IHasIcon.java
rename to forge-game/src/main/java/forge/game/player/IHasIcon.java
diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayer.java b/forge-game/src/main/java/forge/game/player/LobbyPlayer.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/LobbyPlayer.java
rename to forge-game/src/main/java/forge/game/player/LobbyPlayer.java
diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java b/forge-game/src/main/java/forge/game/player/LobbyPlayerAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java
rename to forge-game/src/main/java/forge/game/player/LobbyPlayerAi.java
diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java b/forge-game/src/main/java/forge/game/player/LobbyPlayerRemote.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
rename to forge-game/src/main/java/forge/game/player/LobbyPlayerRemote.java
diff --git a/forge-gui/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/Player.java
rename to forge-game/src/main/java/forge/game/player/Player.java
diff --git a/forge-gui/src/main/java/forge/game/player/PlayerActionConfirmMode.java b/forge-game/src/main/java/forge/game/player/PlayerActionConfirmMode.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/PlayerActionConfirmMode.java
rename to forge-game/src/main/java/forge/game/player/PlayerActionConfirmMode.java
diff --git a/forge-gui/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/PlayerController.java
rename to forge-game/src/main/java/forge/game/player/PlayerController.java
diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java b/forge-game/src/main/java/forge/game/player/PlayerControllerAi.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java
rename to forge-game/src/main/java/forge/game/player/PlayerControllerAi.java
diff --git a/forge-gui/src/main/java/forge/game/player/PlayerOutcome.java b/forge-game/src/main/java/forge/game/player/PlayerOutcome.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/PlayerOutcome.java
rename to forge-game/src/main/java/forge/game/player/PlayerOutcome.java
diff --git a/forge-gui/src/main/java/forge/game/player/PlayerStatistics.java b/forge-game/src/main/java/forge/game/player/PlayerStatistics.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/PlayerStatistics.java
rename to forge-game/src/main/java/forge/game/player/PlayerStatistics.java
diff --git a/forge-gui/src/main/java/forge/game/player/RegisteredPlayer.java b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/RegisteredPlayer.java
rename to forge-game/src/main/java/forge/game/player/RegisteredPlayer.java
diff --git a/forge-gui/src/main/java/forge/game/player/package-info.java b/forge-game/src/main/java/forge/game/player/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/player/package-info.java
rename to forge-game/src/main/java/forge/game/player/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceAddCounter.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceCounter.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceDamage.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceDestroy.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDestroy.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceDestroy.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceDestroy.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceDiscard.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceDiscard.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceDraw.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceDraw.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceGainLife.java b/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceGainLife.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceGameLoss.java b/forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceGameLoss.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceMoved.java b/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceMoved.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceProduceMana.java b/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceProduceMana.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceSetInMotion.java b/forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceSetInMotion.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java b/forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplaceUntap.java b/forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplaceUntap.java
rename to forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplacementEffect.java
rename to forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplacementHandler.java
rename to forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplacementLayer.java b/forge-game/src/main/java/forge/game/replacement/ReplacementLayer.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplacementLayer.java
rename to forge-game/src/main/java/forge/game/replacement/ReplacementLayer.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplacementResult.java b/forge-game/src/main/java/forge/game/replacement/ReplacementResult.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplacementResult.java
rename to forge-game/src/main/java/forge/game/replacement/ReplacementResult.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/ReplacementType.java b/forge-game/src/main/java/forge/game/replacement/ReplacementType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/ReplacementType.java
rename to forge-game/src/main/java/forge/game/replacement/ReplacementType.java
diff --git a/forge-gui/src/main/java/forge/game/replacement/package-info.java b/forge-game/src/main/java/forge/game/replacement/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/replacement/package-info.java
rename to forge-game/src/main/java/forge/game/replacement/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/Ability.java b/forge-game/src/main/java/forge/game/spellability/Ability.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/Ability.java
rename to forge-game/src/main/java/forge/game/spellability/Ability.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/AbilityActivated.java b/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/AbilityActivated.java
rename to forge-game/src/main/java/forge/game/spellability/AbilityActivated.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/AbilityManaPart.java
rename to forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/AbilityStatic.java b/forge-game/src/main/java/forge/game/spellability/AbilityStatic.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/AbilityStatic.java
rename to forge-game/src/main/java/forge/game/spellability/AbilityStatic.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/AbilitySub.java b/forge-game/src/main/java/forge/game/spellability/AbilitySub.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/AbilitySub.java
rename to forge-game/src/main/java/forge/game/spellability/AbilitySub.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java b/forge-game/src/main/java/forge/game/spellability/AbilityTriggered.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java
rename to forge-game/src/main/java/forge/game/spellability/AbilityTriggered.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/ISpellAbility.java b/forge-game/src/main/java/forge/game/spellability/ISpellAbility.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/ISpellAbility.java
rename to forge-game/src/main/java/forge/game/spellability/ISpellAbility.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/OptionalCost.java b/forge-game/src/main/java/forge/game/spellability/OptionalCost.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/OptionalCost.java
rename to forge-game/src/main/java/forge/game/spellability/OptionalCost.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/Spell.java b/forge-game/src/main/java/forge/game/spellability/Spell.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/Spell.java
rename to forge-game/src/main/java/forge/game/spellability/Spell.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/SpellAbility.java
rename to forge-game/src/main/java/forge/game/spellability/SpellAbility.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/SpellAbilityCondition.java
rename to forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
rename to forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
rename to forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/SpellAbilityVariables.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/SpellAbilityVariables.java
rename to forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/SpellPermanent.java b/forge-game/src/main/java/forge/game/spellability/SpellPermanent.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/SpellPermanent.java
rename to forge-game/src/main/java/forge/game/spellability/SpellPermanent.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/TargetChoices.java b/forge-game/src/main/java/forge/game/spellability/TargetChoices.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/TargetChoices.java
rename to forge-game/src/main/java/forge/game/spellability/TargetChoices.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/TargetRestrictions.java b/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/TargetRestrictions.java
rename to forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
diff --git a/forge-gui/src/main/java/forge/game/spellability/package-info.java b/forge-game/src/main/java/forge/game/spellability/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/spellability/package-info.java
rename to forge-game/src/main/java/forge/game/spellability/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbility.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbility.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCostChange.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityCostChange.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityCostChange.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java
rename to forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java
diff --git a/forge-gui/src/main/java/forge/game/staticability/package-info.java b/forge-game/src/main/java/forge/game/staticability/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/staticability/package-info.java
rename to forge-game/src/main/java/forge/game/staticability/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/Trigger.java
rename to forge-game/src/main/java/forge/game/trigger/Trigger.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerAlways.java b/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerAlways.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerAlways.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerAttached.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerAttached.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerAttached.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerAttacks.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerAttacks.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerBecomesTarget.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerBlocks.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerBlocks.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerChampioned.java b/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerChampioned.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerChangesController.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerChangesController.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerChangesZone.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerClashed.java b/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerClashed.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerClashed.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerCounterAdded.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerCounterAdded.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerCounterRemoved.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerCountered.java b/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerCountered.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerCountered.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerCycled.java b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerCycled.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerCycled.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerDamageDone.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerDamageDone.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerDestroyed.java b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerDestroyed.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerDevoured.java b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerDevoured.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerDiscarded.java b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerDiscarded.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerDrawn.java b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerDrawn.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerEvolved.java b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerEvolved.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerFlippedCoin.java b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerFlippedCoin.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerHandler.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerLandPlayed.java b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerLandPlayed.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerLifeGained.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerLifeGained.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerLifeLost.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerLifeLost.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerLosesGame.java b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerLosesGame.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerNewGame.java b/forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerNewGame.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerPhase.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerPhase.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerPhase.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerPlanarDice.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerPlanarDice.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerSacrificed.java b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerSacrificed.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerScry.java b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerScry.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerScry.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerSetInMotion.java b/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerSetInMotion.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerShuffled.java b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerShuffled.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerTaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerTaps.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerTaps.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerTapsForMana.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerTransformed.java b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerTransformed.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerType.java b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerType.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerType.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerUnequip.java b/forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerUnequip.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerUntaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerUntaps.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/TriggerWaiting.java b/forge-game/src/main/java/forge/game/trigger/TriggerWaiting.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/TriggerWaiting.java
rename to forge-game/src/main/java/forge/game/trigger/TriggerWaiting.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java
rename to forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/ZCTrigger.java b/forge-game/src/main/java/forge/game/trigger/ZCTrigger.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/ZCTrigger.java
rename to forge-game/src/main/java/forge/game/trigger/ZCTrigger.java
diff --git a/forge-gui/src/main/java/forge/game/trigger/package-info.java b/forge-game/src/main/java/forge/game/trigger/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/trigger/package-info.java
rename to forge-game/src/main/java/forge/game/trigger/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/zone/MagicStack.java
rename to forge-game/src/main/java/forge/game/zone/MagicStack.java
diff --git a/forge-gui/src/main/java/forge/game/zone/PlayerZone.java b/forge-game/src/main/java/forge/game/zone/PlayerZone.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/zone/PlayerZone.java
rename to forge-game/src/main/java/forge/game/zone/PlayerZone.java
diff --git a/forge-gui/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
rename to forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java
diff --git a/forge-gui/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/zone/Zone.java
rename to forge-game/src/main/java/forge/game/zone/Zone.java
diff --git a/forge-gui/src/main/java/forge/game/zone/ZoneType.java b/forge-game/src/main/java/forge/game/zone/ZoneType.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/zone/ZoneType.java
rename to forge-game/src/main/java/forge/game/zone/ZoneType.java
diff --git a/forge-gui/src/main/java/forge/game/zone/package-info.java b/forge-game/src/main/java/forge/game/zone/package-info.java
similarity index 100%
rename from forge-gui/src/main/java/forge/game/zone/package-info.java
rename to forge-game/src/main/java/forge/game/zone/package-info.java
diff --git a/forge-gui/src/main/java/forge/game/card/package-info.java b/forge-gui/src/main/java/forge/game/card/package-info.java
deleted file mode 100644
index 2e4122db81e..00000000000
--- a/forge-gui/src/main/java/forge/game/card/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author Max
- *
- */
-package forge.game.card;
\ No newline at end of file
diff --git a/forge-gui/src/main/java/forge/game/package-info.java b/forge-gui/src/main/java/forge/game/package-info.java
deleted file mode 100644
index c1a6d89a2c5..00000000000
--- a/forge-gui/src/main/java/forge/game/package-info.java
+++ /dev/null
@@ -1,3 +0,0 @@
-/** Forge Card Game. */
-package forge.game;
-