diff --git a/Mage/pom.xml b/Mage/pom.xml index 88d849517f..457b1f8d25 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -1,4 +1,3 @@ - @@ -32,6 +31,11 @@ ormlite-jdbc 4.48 + + junit + junit + 4.12 + diff --git a/Mage/src/mage/ConditionalMana.java b/Mage/src/main/java/mage/ConditionalMana.java similarity index 100% rename from Mage/src/mage/ConditionalMana.java rename to Mage/src/main/java/mage/ConditionalMana.java diff --git a/Mage/src/mage/MageException.java b/Mage/src/main/java/mage/MageException.java similarity index 100% rename from Mage/src/mage/MageException.java rename to Mage/src/main/java/mage/MageException.java diff --git a/Mage/src/mage/MageInt.java b/Mage/src/main/java/mage/MageInt.java similarity index 100% rename from Mage/src/mage/MageInt.java rename to Mage/src/main/java/mage/MageInt.java diff --git a/Mage/src/mage/MageItem.java b/Mage/src/main/java/mage/MageItem.java similarity index 100% rename from Mage/src/mage/MageItem.java rename to Mage/src/main/java/mage/MageItem.java diff --git a/Mage/src/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java similarity index 100% rename from Mage/src/mage/MageObject.java rename to Mage/src/main/java/mage/MageObject.java diff --git a/Mage/src/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java similarity index 100% rename from Mage/src/mage/MageObjectImpl.java rename to Mage/src/main/java/mage/MageObjectImpl.java diff --git a/Mage/src/mage/MageObjectReference.java b/Mage/src/main/java/mage/MageObjectReference.java similarity index 100% rename from Mage/src/mage/MageObjectReference.java rename to Mage/src/main/java/mage/MageObjectReference.java diff --git a/Mage/src/mage/Mana.java b/Mage/src/main/java/mage/Mana.java similarity index 100% rename from Mage/src/mage/Mana.java rename to Mage/src/main/java/mage/Mana.java diff --git a/Mage/src/mage/ManaSymbol.java b/Mage/src/main/java/mage/ManaSymbol.java similarity index 100% rename from Mage/src/mage/ManaSymbol.java rename to Mage/src/main/java/mage/ManaSymbol.java diff --git a/Mage/src/mage/ObjectColor.java b/Mage/src/main/java/mage/ObjectColor.java similarity index 100% rename from Mage/src/mage/ObjectColor.java rename to Mage/src/main/java/mage/ObjectColor.java diff --git a/Mage/src/mage/abilities/Abilities.java b/Mage/src/main/java/mage/abilities/Abilities.java similarity index 100% rename from Mage/src/mage/abilities/Abilities.java rename to Mage/src/main/java/mage/abilities/Abilities.java diff --git a/Mage/src/mage/abilities/AbilitiesImpl.java b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java similarity index 100% rename from Mage/src/mage/abilities/AbilitiesImpl.java rename to Mage/src/main/java/mage/abilities/AbilitiesImpl.java diff --git a/Mage/src/mage/abilities/Ability.java b/Mage/src/main/java/mage/abilities/Ability.java similarity index 100% rename from Mage/src/mage/abilities/Ability.java rename to Mage/src/main/java/mage/abilities/Ability.java diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java similarity index 100% rename from Mage/src/mage/abilities/AbilityImpl.java rename to Mage/src/main/java/mage/abilities/AbilityImpl.java diff --git a/Mage/src/mage/abilities/ActivatedAbility.java b/Mage/src/main/java/mage/abilities/ActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/ActivatedAbility.java rename to Mage/src/main/java/mage/abilities/ActivatedAbility.java diff --git a/Mage/src/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java similarity index 100% rename from Mage/src/mage/abilities/ActivatedAbilityImpl.java rename to Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java diff --git a/Mage/src/mage/abilities/CompoundAbility.java b/Mage/src/main/java/mage/abilities/CompoundAbility.java similarity index 100% rename from Mage/src/mage/abilities/CompoundAbility.java rename to Mage/src/main/java/mage/abilities/CompoundAbility.java diff --git a/Mage/src/mage/abilities/DelayedTriggeredAbilities.java b/Mage/src/main/java/mage/abilities/DelayedTriggeredAbilities.java similarity index 100% rename from Mage/src/mage/abilities/DelayedTriggeredAbilities.java rename to Mage/src/main/java/mage/abilities/DelayedTriggeredAbilities.java diff --git a/Mage/src/mage/abilities/DelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/DelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/DelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/DelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/EvasionAbility.java b/Mage/src/main/java/mage/abilities/EvasionAbility.java similarity index 100% rename from Mage/src/mage/abilities/EvasionAbility.java rename to Mage/src/main/java/mage/abilities/EvasionAbility.java diff --git a/Mage/src/mage/abilities/LoyaltyAbility.java b/Mage/src/main/java/mage/abilities/LoyaltyAbility.java similarity index 100% rename from Mage/src/mage/abilities/LoyaltyAbility.java rename to Mage/src/main/java/mage/abilities/LoyaltyAbility.java diff --git a/Mage/src/mage/abilities/MageSingleton.java b/Mage/src/main/java/mage/abilities/MageSingleton.java similarity index 100% rename from Mage/src/mage/abilities/MageSingleton.java rename to Mage/src/main/java/mage/abilities/MageSingleton.java diff --git a/Mage/src/mage/abilities/Mode.java b/Mage/src/main/java/mage/abilities/Mode.java similarity index 100% rename from Mage/src/mage/abilities/Mode.java rename to Mage/src/main/java/mage/abilities/Mode.java diff --git a/Mage/src/mage/abilities/Modes.java b/Mage/src/main/java/mage/abilities/Modes.java similarity index 100% rename from Mage/src/mage/abilities/Modes.java rename to Mage/src/main/java/mage/abilities/Modes.java diff --git a/Mage/src/mage/abilities/PlayLandAbility.java b/Mage/src/main/java/mage/abilities/PlayLandAbility.java similarity index 100% rename from Mage/src/mage/abilities/PlayLandAbility.java rename to Mage/src/main/java/mage/abilities/PlayLandAbility.java diff --git a/Mage/src/mage/abilities/SpecialAction.java b/Mage/src/main/java/mage/abilities/SpecialAction.java similarity index 100% rename from Mage/src/mage/abilities/SpecialAction.java rename to Mage/src/main/java/mage/abilities/SpecialAction.java diff --git a/Mage/src/mage/abilities/SpecialActions.java b/Mage/src/main/java/mage/abilities/SpecialActions.java similarity index 100% rename from Mage/src/mage/abilities/SpecialActions.java rename to Mage/src/main/java/mage/abilities/SpecialActions.java diff --git a/Mage/src/mage/abilities/SpellAbility.java b/Mage/src/main/java/mage/abilities/SpellAbility.java similarity index 100% rename from Mage/src/mage/abilities/SpellAbility.java rename to Mage/src/main/java/mage/abilities/SpellAbility.java diff --git a/Mage/src/mage/abilities/StateTriggeredAbility.java b/Mage/src/main/java/mage/abilities/StateTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/StateTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/StateTriggeredAbility.java diff --git a/Mage/src/mage/abilities/StaticAbility.java b/Mage/src/main/java/mage/abilities/StaticAbility.java similarity index 100% rename from Mage/src/mage/abilities/StaticAbility.java rename to Mage/src/main/java/mage/abilities/StaticAbility.java diff --git a/Mage/src/mage/abilities/TriggeredAbilities.java b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java similarity index 100% rename from Mage/src/mage/abilities/TriggeredAbilities.java rename to Mage/src/main/java/mage/abilities/TriggeredAbilities.java diff --git a/Mage/src/mage/abilities/TriggeredAbility.java b/Mage/src/main/java/mage/abilities/TriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/TriggeredAbility.java rename to Mage/src/main/java/mage/abilities/TriggeredAbility.java diff --git a/Mage/src/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java similarity index 100% rename from Mage/src/mage/abilities/TriggeredAbilityImpl.java rename to Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java diff --git a/Mage/src/mage/abilities/abilityword/ConstellationAbility.java b/Mage/src/main/java/mage/abilities/abilityword/ConstellationAbility.java similarity index 100% rename from Mage/src/mage/abilities/abilityword/ConstellationAbility.java rename to Mage/src/main/java/mage/abilities/abilityword/ConstellationAbility.java diff --git a/Mage/src/mage/abilities/abilityword/GrandeurAbility.java b/Mage/src/main/java/mage/abilities/abilityword/GrandeurAbility.java similarity index 100% rename from Mage/src/mage/abilities/abilityword/GrandeurAbility.java rename to Mage/src/main/java/mage/abilities/abilityword/GrandeurAbility.java diff --git a/Mage/src/mage/abilities/abilityword/KinshipAbility.java b/Mage/src/main/java/mage/abilities/abilityword/KinshipAbility.java similarity index 100% rename from Mage/src/mage/abilities/abilityword/KinshipAbility.java rename to Mage/src/main/java/mage/abilities/abilityword/KinshipAbility.java diff --git a/Mage/src/mage/abilities/abilityword/LieutenantAbility.java b/Mage/src/main/java/mage/abilities/abilityword/LieutenantAbility.java similarity index 100% rename from Mage/src/mage/abilities/abilityword/LieutenantAbility.java rename to Mage/src/main/java/mage/abilities/abilityword/LieutenantAbility.java diff --git a/Mage/src/mage/abilities/abilityword/StriveAbility.java b/Mage/src/main/java/mage/abilities/abilityword/StriveAbility.java similarity index 100% rename from Mage/src/mage/abilities/abilityword/StriveAbility.java rename to Mage/src/main/java/mage/abilities/abilityword/StriveAbility.java diff --git a/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/ActivateAsSorceryActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java rename to Mage/src/main/java/mage/abilities/common/ActivateAsSorceryActivatedAbility.java diff --git a/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java rename to Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java diff --git a/Mage/src/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AllyEntersBattlefieldTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java b/Mage/src/main/java/mage/abilities/common/AsEntersBattlefieldAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java rename to Mage/src/main/java/mage/abilities/common/AsEntersBattlefieldAbility.java diff --git a/Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksAloneTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksAloneTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksAloneTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksCreatureYouControlTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksCreatureYouControlTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksCreatureYouControlTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksCreatureYouControlTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksEachCombatStaticAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksEachCombatStaticAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksEachCombatStaticAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksEachCombatStaticAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksEachTurnStaticAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksEachTurnStaticAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AttacksTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/AuraAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AuraAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/AuraAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/AuraAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesAuraAttachToManifestSourceEffect.java b/Mage/src/main/java/mage/abilities/common/BecomesAuraAttachToManifestSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesAuraAttachToManifestSourceEffect.java rename to Mage/src/main/java/mage/abilities/common/BecomesAuraAttachToManifestSourceEffect.java diff --git a/Mage/src/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesBlockedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesBlockedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesTappedAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTappedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesTappedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesTargetAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTargetTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BecomesTargetTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfDrawTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BeginningOfDrawTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfUntapTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BeginningOfUntapTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BlocksAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BlocksCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksCreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BlocksCreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BlocksCreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/BlocksTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/BlocksTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/BlocksTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/CanBeYourCommanderAbility.java b/Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CanBeYourCommanderAbility.java rename to Mage/src/main/java/mage/abilities/common/CanBeYourCommanderAbility.java diff --git a/Mage/src/mage/abilities/common/CanBlockOnlyFlyingAbility.java b/Mage/src/main/java/mage/abilities/common/CanBlockOnlyFlyingAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CanBlockOnlyFlyingAbility.java rename to Mage/src/main/java/mage/abilities/common/CanBlockOnlyFlyingAbility.java diff --git a/Mage/src/mage/abilities/common/CantBeCounteredAbility.java b/Mage/src/main/java/mage/abilities/common/CantBeCounteredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CantBeCounteredAbility.java rename to Mage/src/main/java/mage/abilities/common/CantBeCounteredAbility.java diff --git a/Mage/src/mage/abilities/common/CantBlockAbility.java b/Mage/src/main/java/mage/abilities/common/CantBlockAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CantBlockAbility.java rename to Mage/src/main/java/mage/abilities/common/CantBlockAbility.java diff --git a/Mage/src/mage/abilities/common/CastCommanderAbility.java b/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CastCommanderAbility.java rename to Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java diff --git a/Mage/src/mage/abilities/common/ChancellorAbility.java b/Mage/src/main/java/mage/abilities/common/ChancellorAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/ChancellorAbility.java rename to Mage/src/main/java/mage/abilities/common/ChancellorAbility.java diff --git a/Mage/src/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/ControlsPermanentsControllerTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/CycleAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/CycleAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CycleAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/CycleAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/CycleTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/CycleTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/CycleTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/CycleTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java b/Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java rename to Mage/src/main/java/mage/abilities/common/DamageAsThoughNotBlockedAbility.java diff --git a/Mage/src/mage/abilities/common/DamageDealtToAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DamageDealtToAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DamageDealtToAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DamageDealtToAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsCombatDamageTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsCombatDamageTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealsDamageToOpponentTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesAttachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DiesAttachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DiesCreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DiesTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DiesTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DiesTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DrawCardControllerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DrawCardControllerTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DrawCardControllerTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DrawCardControllerTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/DrawCardOpponentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DrawCardOpponentTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/DrawCardOpponentTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/DrawCardOpponentTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/EndOfCombatTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EndOfCombatTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EndOfCombatTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/EndOfCombatTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersAnotherCreatureYourControlTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersBattlefieldAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersBattlefieldAbility.java diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTappedAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersBattlefieldTappedAbility.java diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersBattlefieldTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersBattlefieldTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/EntersOrLeavesTheBattlefieldSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersOrLeavesTheBattlefieldSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/EntersOrLeavesTheBattlefieldSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/EntersOrLeavesTheBattlefieldSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/ExploitCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/ExploitCreatureTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/FetchLandActivatedAbility.java rename to Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java diff --git a/Mage/src/mage/abilities/common/GainLifeControllerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/GainLifeControllerTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/GainLifeControllerTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/GainLifeControllerTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/GemstoneCavernsAbility.java b/Mage/src/main/java/mage/abilities/common/GemstoneCavernsAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/GemstoneCavernsAbility.java rename to Mage/src/main/java/mage/abilities/common/GemstoneCavernsAbility.java diff --git a/Mage/src/mage/abilities/common/LandfallAbility.java b/Mage/src/main/java/mage/abilities/common/LandfallAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/LandfallAbility.java rename to Mage/src/main/java/mage/abilities/common/LandfallAbility.java diff --git a/Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/LeavesBattlefieldTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/LicidAbility.java b/Mage/src/main/java/mage/abilities/common/LicidAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/LicidAbility.java rename to Mage/src/main/java/mage/abilities/common/LicidAbility.java diff --git a/Mage/src/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java rename to Mage/src/main/java/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java diff --git a/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/OnEventTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/OnEventTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/OnEventTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/PassAbility.java b/Mage/src/main/java/mage/abilities/common/PassAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PassAbility.java rename to Mage/src/main/java/mage/abilities/common/PassAbility.java diff --git a/Mage/src/mage/abilities/common/PayMoreToCastAsThoughtItHadFlashAbility.java b/Mage/src/main/java/mage/abilities/common/PayMoreToCastAsThoughtItHadFlashAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PayMoreToCastAsThoughtItHadFlashAbility.java rename to Mage/src/main/java/mage/abilities/common/PayMoreToCastAsThoughtItHadFlashAbility.java diff --git a/Mage/src/mage/abilities/common/PlanswalkerEntersWithLoyalityCountersAbility.java b/Mage/src/main/java/mage/abilities/common/PlanswalkerEntersWithLoyalityCountersAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PlanswalkerEntersWithLoyalityCountersAbility.java rename to Mage/src/main/java/mage/abilities/common/PlanswalkerEntersWithLoyalityCountersAbility.java diff --git a/Mage/src/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java b/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java rename to Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceAbility.java diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PutIntoGraveFromAnywhereSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/PutIntoGraveFromAnywhereSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/PutIntoGraveFromBattlefieldSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/PutIntoGraveFromBattlefieldSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/SacrificeIfCastAtInstantTimeTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/SacrificeSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SacrificeSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SacrificeSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/SacrificeSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/SimpleActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SimpleActivatedAbility.java rename to Mage/src/main/java/mage/abilities/common/SimpleActivatedAbility.java diff --git a/Mage/src/mage/abilities/common/SimpleEvasionAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleEvasionAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SimpleEvasionAbility.java rename to Mage/src/main/java/mage/abilities/common/SimpleEvasionAbility.java diff --git a/Mage/src/mage/abilities/common/SimpleStaticAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleStaticAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SimpleStaticAbility.java rename to Mage/src/main/java/mage/abilities/common/SimpleStaticAbility.java diff --git a/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SimpleTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SimpleTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/SimpleTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/SkipUntapOptionalAbility.java b/Mage/src/main/java/mage/abilities/common/SkipUntapOptionalAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SkipUntapOptionalAbility.java rename to Mage/src/main/java/mage/abilities/common/SkipUntapOptionalAbility.java diff --git a/Mage/src/mage/abilities/common/SpellCastAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SpellCastAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SpellCastAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/SpellCastAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SpellCastControllerTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/SpellCastControllerTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SpellCastOpponentTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/SpellCastOpponentTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/TapForManaAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/TapForManaAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/TapForManaAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/TapForManaAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/TapForManaAllTriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/common/TapForManaAllTriggeredManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/TapForManaAllTriggeredManaAbility.java rename to Mage/src/main/java/mage/abilities/common/TapForManaAllTriggeredManaAbility.java diff --git a/Mage/src/mage/abilities/common/TapLandForManaAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/TapLandForManaAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/TapLandForManaAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/TapLandForManaAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/TapLandForManaAllTriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/common/TapLandForManaAllTriggeredManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/TapLandForManaAllTriggeredManaAbility.java rename to Mage/src/main/java/mage/abilities/common/TapLandForManaAllTriggeredManaAbility.java diff --git a/Mage/src/mage/abilities/common/TurnFaceUpAbility.java b/Mage/src/main/java/mage/abilities/common/TurnFaceUpAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/TurnFaceUpAbility.java rename to Mage/src/main/java/mage/abilities/common/TurnFaceUpAbility.java diff --git a/Mage/src/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/UnattachedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/UnattachedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/ZoneChangeAllTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/ZoneChangeAllTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/ZoneChangeTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/ZoneChangeTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfMainPhaseDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfMainPhaseDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheBeginOfMainPhaseDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfMainPhaseDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextCleanupDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextCleanupDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextCleanupDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextCleanupDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/OnLeaveReturnExiledToBattlefieldAbility.java diff --git a/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java diff --git a/Mage/src/mage/abilities/condition/CompoundCondition.java b/Mage/src/main/java/mage/abilities/condition/CompoundCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/CompoundCondition.java rename to Mage/src/main/java/mage/abilities/condition/CompoundCondition.java diff --git a/Mage/src/mage/abilities/condition/Condition.java b/Mage/src/main/java/mage/abilities/condition/Condition.java similarity index 100% rename from Mage/src/mage/abilities/condition/Condition.java rename to Mage/src/main/java/mage/abilities/condition/Condition.java diff --git a/Mage/src/mage/abilities/condition/FixedCondition.java b/Mage/src/main/java/mage/abilities/condition/FixedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/FixedCondition.java rename to Mage/src/main/java/mage/abilities/condition/FixedCondition.java diff --git a/Mage/src/mage/abilities/condition/IntCompareCondition.java b/Mage/src/main/java/mage/abilities/condition/IntCompareCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/IntCompareCondition.java rename to Mage/src/main/java/mage/abilities/condition/IntCompareCondition.java diff --git a/Mage/src/mage/abilities/condition/InvertCondition.java b/Mage/src/main/java/mage/abilities/condition/InvertCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/InvertCondition.java rename to Mage/src/main/java/mage/abilities/condition/InvertCondition.java diff --git a/Mage/src/mage/abilities/condition/LockedInCondition.java b/Mage/src/main/java/mage/abilities/condition/LockedInCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/LockedInCondition.java rename to Mage/src/main/java/mage/abilities/condition/LockedInCondition.java diff --git a/Mage/src/mage/abilities/condition/common/AttachedToCounterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/AttachedToCounterCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/AttachedToCounterCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/AttachedToCounterCondition.java diff --git a/Mage/src/mage/abilities/condition/common/AttachedToTappedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/AttachedToTappedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/AttachedToTappedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/AttachedToTappedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/CardsInAnyLibraryCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/CardsInAnyLibraryCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java diff --git a/Mage/src/mage/abilities/condition/common/CardsInControllerGraveCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/CardsInControllerGraveCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java diff --git a/Mage/src/mage/abilities/condition/common/CardsInHandCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/CardsInHandCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CardsInHandCondition.java diff --git a/Mage/src/mage/abilities/condition/common/CardsInOpponentGraveCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/CardsInOpponentGraveCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java diff --git a/Mage/src/mage/abilities/condition/common/CastFromHandCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CastFromHandCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/CastFromHandCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CastFromHandCondition.java diff --git a/Mage/src/mage/abilities/condition/common/CommanderInPlayCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/CommanderInPlayCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java diff --git a/Mage/src/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestPowerCondition.java diff --git a/Mage/src/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/ControlsCreatureGreatestToughnessCondition.java diff --git a/Mage/src/mage/abilities/condition/common/DashedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/DashedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/DashedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/DashedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/DealtDamageToAnOpponent.java b/Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/DealtDamageToAnOpponent.java rename to Mage/src/main/java/mage/abilities/condition/common/DealtDamageToAnOpponent.java diff --git a/Mage/src/mage/abilities/condition/common/DefendingPlayerControlsCondition.java b/Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/DefendingPlayerControlsCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/DefendingPlayerControlsCondition.java diff --git a/Mage/src/mage/abilities/condition/common/DevouredCreaturesCondition.java b/Mage/src/main/java/mage/abilities/condition/common/DevouredCreaturesCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/DevouredCreaturesCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/DevouredCreaturesCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EnchantedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EnchantedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EnchantedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EnchantedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EnchantedCreatureColorCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EnchantedCreatureColorCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EnchantedCreatureColorCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EnchantedCreatureColorCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EnchantedTargetCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EnchantedTargetCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EnchantedTargetCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EnchantedTargetCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EquipmentAttachedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquipmentAttachedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EquipmentAttachedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EquipmentAttachedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EquippedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EquippedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EquippedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EquippedHasSubtypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSubtypeCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EquippedHasSubtypeCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EquippedHasSubtypeCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EquippedHasSupertypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EquippedHasSupertypeCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EquippedHasSupertypeCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EquippedMatchesFilterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EquippedMatchesFilterCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EquippedMatchesFilterCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EquippedMatchesFilterCondition.java diff --git a/Mage/src/mage/abilities/condition/common/EvokedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EvokedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/EvokedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/EvokedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/FaceDownSourceCondition.java b/Mage/src/main/java/mage/abilities/condition/common/FaceDownSourceCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/FaceDownSourceCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/FaceDownSourceCondition.java diff --git a/Mage/src/mage/abilities/condition/common/FatefulHourCondition.java b/Mage/src/main/java/mage/abilities/condition/common/FatefulHourCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/FatefulHourCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/FatefulHourCondition.java diff --git a/Mage/src/mage/abilities/condition/common/FerociousCondition.java b/Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/FerociousCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/FerociousCondition.java diff --git a/Mage/src/mage/abilities/condition/common/FlippedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/FlippedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/FlippedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/FlippedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/FormidableCondition.java b/Mage/src/main/java/mage/abilities/condition/common/FormidableCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/FormidableCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/FormidableCondition.java diff --git a/Mage/src/mage/abilities/condition/common/HellbentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/HellbentCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/HellbentCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/HellbentCondition.java diff --git a/Mage/src/mage/abilities/condition/common/IsPhaseCondition.java b/Mage/src/main/java/mage/abilities/condition/common/IsPhaseCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/IsPhaseCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/IsPhaseCondition.java diff --git a/Mage/src/mage/abilities/condition/common/IsStepCondition.java b/Mage/src/main/java/mage/abilities/condition/common/IsStepCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/IsStepCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/IsStepCondition.java diff --git a/Mage/src/mage/abilities/condition/common/KickedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/KickedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/KickedCostCondition.java b/Mage/src/main/java/mage/abilities/condition/common/KickedCostCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/KickedCostCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/KickedCostCondition.java diff --git a/Mage/src/mage/abilities/condition/common/LandfallCondition.java b/Mage/src/main/java/mage/abilities/condition/common/LandfallCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/LandfallCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/LandfallCondition.java diff --git a/Mage/src/mage/abilities/condition/common/LastTimeCounterRemovedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/LastTimeCounterRemovedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/LastTimeCounterRemovedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/LastTimeCounterRemovedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/ManaWasSpentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ManaWasSpentCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/ManaWasSpentCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/ManaWasSpentCondition.java diff --git a/Mage/src/mage/abilities/condition/common/MetalcraftCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MetalcraftCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/MetalcraftCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/MetalcraftCondition.java diff --git a/Mage/src/mage/abilities/condition/common/ModeChoiceSourceCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ModeChoiceSourceCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/ModeChoiceSourceCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/ModeChoiceSourceCondition.java diff --git a/Mage/src/mage/abilities/condition/common/MonstrousCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MonstrousCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/MonstrousCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/MonstrousCondition.java diff --git a/Mage/src/mage/abilities/condition/common/MorbidCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/MorbidCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/MorbidCondition.java diff --git a/Mage/src/mage/abilities/condition/common/MyMainPhaseCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MyMainPhaseCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/MyMainPhaseCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/MyMainPhaseCondition.java diff --git a/Mage/src/mage/abilities/condition/common/MyTurnBeforeAttackersDeclaredCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MyTurnBeforeAttackersDeclaredCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/MyTurnBeforeAttackersDeclaredCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/MyTurnBeforeAttackersDeclaredCondition.java diff --git a/Mage/src/mage/abilities/condition/common/MyTurnCondition.java b/Mage/src/main/java/mage/abilities/condition/common/MyTurnCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/MyTurnCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/MyTurnCondition.java diff --git a/Mage/src/mage/abilities/condition/common/NoControlledCreatureCondition.java b/Mage/src/main/java/mage/abilities/condition/common/NoControlledCreatureCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/NoControlledCreatureCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/NoControlledCreatureCondition.java diff --git a/Mage/src/mage/abilities/condition/common/NoCreatureCondition.java b/Mage/src/main/java/mage/abilities/condition/common/NoCreatureCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/NoCreatureCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/NoCreatureCondition.java diff --git a/Mage/src/mage/abilities/condition/common/NoCreatureOpponentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/NoCreatureOpponentCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/NoCreatureOpponentCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/NoCreatureOpponentCondition.java diff --git a/Mage/src/mage/abilities/condition/common/NoSpellsWereCastLastTurnCondition.java b/Mage/src/main/java/mage/abilities/condition/common/NoSpellsWereCastLastTurnCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/NoSpellsWereCastLastTurnCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/NoSpellsWereCastLastTurnCondition.java diff --git a/Mage/src/mage/abilities/condition/common/NotMyTurnCondition.java b/Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/NotMyTurnCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/NotMyTurnCondition.java diff --git a/Mage/src/mage/abilities/condition/common/OneControlledCreatureCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OneControlledCreatureCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/OneControlledCreatureCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/OneControlledCreatureCondition.java diff --git a/Mage/src/mage/abilities/condition/common/OpponentControlsMoreCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/OpponentControlsMoreCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/OpponentControlsMoreCondition.java diff --git a/Mage/src/mage/abilities/condition/common/OpponentControlsPermanentCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/OpponentControlsPermanentCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/OpponentControlsPermanentCondition.java diff --git a/Mage/src/mage/abilities/condition/common/OpponentLostLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OpponentLostLifeCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/OpponentLostLifeCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/OpponentLostLifeCondition.java diff --git a/Mage/src/mage/abilities/condition/common/PermanentHasCounterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/PermanentHasCounterCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java diff --git a/Mage/src/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java b/Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java diff --git a/Mage/src/mage/abilities/condition/common/ProwlCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ProwlCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/ProwlCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/ProwlCondition.java diff --git a/Mage/src/mage/abilities/condition/common/RaidCondition.java b/Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/RaidCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java diff --git a/Mage/src/mage/abilities/condition/common/RenownedSourceCondition.java b/Mage/src/main/java/mage/abilities/condition/common/RenownedSourceCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/RenownedSourceCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/RenownedSourceCondition.java diff --git a/Mage/src/mage/abilities/condition/common/RenownedTargetCondition.java b/Mage/src/main/java/mage/abilities/condition/common/RenownedTargetCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/RenownedTargetCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/RenownedTargetCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceAttackingCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceAttackingCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceAttackingCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceAttackingCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceDealtDamageCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceDealtDamageCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceDealtDamageCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceDealtDamageCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceHasCounterCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceHasCounterCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceHasSubtypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceHasSubtypeCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceIsSpellCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceIsSpellCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceIsSpellCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceIsSpellCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceMatchesFilterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceMatchesFilterCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceOnBattlefieldCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceOnBattlefieldCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldControlUnchangedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SourceTappedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceTappedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SourceTappedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SourceTappedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SpellMasteryCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SpellMasteryCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SpellMasteryCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SpellMasteryCondition.java diff --git a/Mage/src/mage/abilities/condition/common/SuspendedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/SuspendedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/TargetHasSubtypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TargetHasSubtypeCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/TargetHasSubtypeCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/TargetHasSubtypeCondition.java diff --git a/Mage/src/mage/abilities/condition/common/TenOrLessLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TenOrLessLifeCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/TenOrLessLifeCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/TenOrLessLifeCondition.java diff --git a/Mage/src/mage/abilities/condition/common/TopLibraryCardTypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TopLibraryCardTypeCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/TopLibraryCardTypeCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/TopLibraryCardTypeCondition.java diff --git a/Mage/src/mage/abilities/condition/common/TransformedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TransformedCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/TransformedCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/TransformedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/TributeNotPaidCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/TributeNotPaidCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/TributeNotPaidCondition.java diff --git a/Mage/src/mage/abilities/condition/common/TwoOrMoreSpellsWereCastLastTurnCondition.java b/Mage/src/main/java/mage/abilities/condition/common/TwoOrMoreSpellsWereCastLastTurnCondition.java similarity index 100% rename from Mage/src/mage/abilities/condition/common/TwoOrMoreSpellsWereCastLastTurnCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/TwoOrMoreSpellsWereCastLastTurnCondition.java diff --git a/Mage/src/mage/abilities/costs/AbilityCosts.java b/Mage/src/main/java/mage/abilities/costs/AbilityCosts.java similarity index 100% rename from Mage/src/mage/abilities/costs/AbilityCosts.java rename to Mage/src/main/java/mage/abilities/costs/AbilityCosts.java diff --git a/Mage/src/mage/abilities/costs/AdjustingSourceCosts.java b/Mage/src/main/java/mage/abilities/costs/AdjustingSourceCosts.java similarity index 100% rename from Mage/src/mage/abilities/costs/AdjustingSourceCosts.java rename to Mage/src/main/java/mage/abilities/costs/AdjustingSourceCosts.java diff --git a/Mage/src/mage/abilities/costs/AlternativeCost.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/AlternativeCost.java rename to Mage/src/main/java/mage/abilities/costs/AlternativeCost.java diff --git a/Mage/src/mage/abilities/costs/AlternativeCost2.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCost2.java similarity index 100% rename from Mage/src/mage/abilities/costs/AlternativeCost2.java rename to Mage/src/main/java/mage/abilities/costs/AlternativeCost2.java diff --git a/Mage/src/mage/abilities/costs/AlternativeCost2Impl.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCost2Impl.java similarity index 100% rename from Mage/src/mage/abilities/costs/AlternativeCost2Impl.java rename to Mage/src/main/java/mage/abilities/costs/AlternativeCost2Impl.java diff --git a/Mage/src/mage/abilities/costs/AlternativeCostImpl.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCostImpl.java similarity index 100% rename from Mage/src/mage/abilities/costs/AlternativeCostImpl.java rename to Mage/src/main/java/mage/abilities/costs/AlternativeCostImpl.java diff --git a/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java b/Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java similarity index 100% rename from Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java rename to Mage/src/main/java/mage/abilities/costs/AlternativeCostSourceAbility.java diff --git a/Mage/src/mage/abilities/costs/AlternativeSourceCosts.java b/Mage/src/main/java/mage/abilities/costs/AlternativeSourceCosts.java similarity index 100% rename from Mage/src/mage/abilities/costs/AlternativeSourceCosts.java rename to Mage/src/main/java/mage/abilities/costs/AlternativeSourceCosts.java diff --git a/Mage/src/mage/abilities/costs/CompositeCost.java b/Mage/src/main/java/mage/abilities/costs/CompositeCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/CompositeCost.java rename to Mage/src/main/java/mage/abilities/costs/CompositeCost.java diff --git a/Mage/src/mage/abilities/costs/Cost.java b/Mage/src/main/java/mage/abilities/costs/Cost.java similarity index 100% rename from Mage/src/mage/abilities/costs/Cost.java rename to Mage/src/main/java/mage/abilities/costs/Cost.java diff --git a/Mage/src/mage/abilities/costs/CostImpl.java b/Mage/src/main/java/mage/abilities/costs/CostImpl.java similarity index 100% rename from Mage/src/mage/abilities/costs/CostImpl.java rename to Mage/src/main/java/mage/abilities/costs/CostImpl.java diff --git a/Mage/src/mage/abilities/costs/Costs.java b/Mage/src/main/java/mage/abilities/costs/Costs.java similarity index 100% rename from Mage/src/mage/abilities/costs/Costs.java rename to Mage/src/main/java/mage/abilities/costs/Costs.java diff --git a/Mage/src/mage/abilities/costs/CostsImpl.java b/Mage/src/main/java/mage/abilities/costs/CostsImpl.java similarity index 100% rename from Mage/src/mage/abilities/costs/CostsImpl.java rename to Mage/src/main/java/mage/abilities/costs/CostsImpl.java diff --git a/Mage/src/mage/abilities/costs/DynamicCost.java b/Mage/src/main/java/mage/abilities/costs/DynamicCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/DynamicCost.java rename to Mage/src/main/java/mage/abilities/costs/DynamicCost.java diff --git a/Mage/src/mage/abilities/costs/OptionalAdditionalCost.java b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/OptionalAdditionalCost.java rename to Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCost.java diff --git a/Mage/src/mage/abilities/costs/OptionalAdditionalCostImpl.java b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java similarity index 100% rename from Mage/src/mage/abilities/costs/OptionalAdditionalCostImpl.java rename to Mage/src/main/java/mage/abilities/costs/OptionalAdditionalCostImpl.java diff --git a/Mage/src/mage/abilities/costs/OptionalAdditionalModeSourceCosts.java b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalModeSourceCosts.java similarity index 100% rename from Mage/src/mage/abilities/costs/OptionalAdditionalModeSourceCosts.java rename to Mage/src/main/java/mage/abilities/costs/OptionalAdditionalModeSourceCosts.java diff --git a/Mage/src/mage/abilities/costs/OptionalAdditionalSourceCosts.java b/Mage/src/main/java/mage/abilities/costs/OptionalAdditionalSourceCosts.java similarity index 100% rename from Mage/src/mage/abilities/costs/OptionalAdditionalSourceCosts.java rename to Mage/src/main/java/mage/abilities/costs/OptionalAdditionalSourceCosts.java diff --git a/Mage/src/mage/abilities/costs/OrCost.java b/Mage/src/main/java/mage/abilities/costs/OrCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/OrCost.java rename to Mage/src/main/java/mage/abilities/costs/OrCost.java diff --git a/Mage/src/mage/abilities/costs/VariableCost.java b/Mage/src/main/java/mage/abilities/costs/VariableCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/VariableCost.java rename to Mage/src/main/java/mage/abilities/costs/VariableCost.java diff --git a/Mage/src/mage/abilities/costs/VariableCostImpl.java b/Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java similarity index 100% rename from Mage/src/mage/abilities/costs/VariableCostImpl.java rename to Mage/src/main/java/mage/abilities/costs/VariableCostImpl.java diff --git a/Mage/src/mage/abilities/costs/common/ControlPermanentCost.java b/Mage/src/main/java/mage/abilities/costs/common/ControlPermanentCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ControlPermanentCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ControlPermanentCost.java diff --git a/Mage/src/mage/abilities/costs/common/DiscardCardCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardCardCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/DiscardCardCost.java rename to Mage/src/main/java/mage/abilities/costs/common/DiscardCardCost.java diff --git a/Mage/src/mage/abilities/costs/common/DiscardHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/DiscardHandCost.java rename to Mage/src/main/java/mage/abilities/costs/common/DiscardHandCost.java diff --git a/Mage/src/mage/abilities/costs/common/DiscardSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/DiscardSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/DiscardSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/DiscardTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/DiscardTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/DiscardXTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/DiscardXTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/DiscardXTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/DiscardXTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileFromGraveCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileFromHandCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileFromHandCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileFromStackCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileFromStackCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileFromTopOfLibraryCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileSourceFromGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileSourceFromGraveCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileSourceFromGraveCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileTopCardOfGraveyardCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileTopCreatureCardOfGraveyardCost.java diff --git a/Mage/src/mage/abilities/costs/common/ExileXFromYourGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileXFromYourGraveCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ExileXFromYourGraveCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ExileXFromYourGraveCost.java diff --git a/Mage/src/mage/abilities/costs/common/GainLifeOpponentCost.java b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/GainLifeOpponentCost.java rename to Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java diff --git a/Mage/src/mage/abilities/costs/common/GainLifePlayersCost.java b/Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/GainLifePlayersCost.java rename to Mage/src/main/java/mage/abilities/costs/common/GainLifePlayersCost.java diff --git a/Mage/src/mage/abilities/costs/common/PayLifeCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/PayLifeCost.java rename to Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java diff --git a/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java rename to Mage/src/main/java/mage/abilities/costs/common/PayLoyaltyCost.java diff --git a/Mage/src/mage/abilities/costs/common/PayVariableLifeCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayVariableLifeCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/PayVariableLifeCost.java rename to Mage/src/main/java/mage/abilities/costs/common/PayVariableLifeCost.java diff --git a/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java rename to Mage/src/main/java/mage/abilities/costs/common/PayVariableLoyaltyCost.java diff --git a/Mage/src/mage/abilities/costs/common/PutCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/PutCountersSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/PutCountersSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java rename to Mage/src/main/java/mage/abilities/costs/common/PutTopCardOfYourLibraryToGraveyardCost.java diff --git a/Mage/src/mage/abilities/costs/common/RemoveCounterCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/RemoveCounterCost.java rename to Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java diff --git a/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/RemoveVariableCountersTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java diff --git a/Mage/src/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ReturnToHandFromGraveyardCost.java diff --git a/Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/ReturnToHandSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/ReturnToHandSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/RevealHandSourceControllerCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/RevealHandSourceControllerCost.java rename to Mage/src/main/java/mage/abilities/costs/common/RevealHandSourceControllerCost.java diff --git a/Mage/src/mage/abilities/costs/common/RevealSourceFromYourHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/RevealSourceFromYourHandCost.java rename to Mage/src/main/java/mage/abilities/costs/common/RevealSourceFromYourHandCost.java diff --git a/Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java b/Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/RevealTargetFromHandCost.java rename to Mage/src/main/java/mage/abilities/costs/common/RevealTargetFromHandCost.java diff --git a/Mage/src/mage/abilities/costs/common/SacrificeAllCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/SacrificeAllCost.java rename to Mage/src/main/java/mage/abilities/costs/common/SacrificeAllCost.java diff --git a/Mage/src/mage/abilities/costs/common/SacrificeSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/SacrificeSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/SacrificeSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/SacrificeTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/SacrificeXTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeXTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/SacrificeXTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/SacrificeXTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/TapSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/TapSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/TapSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/TapTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/TapTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/TapVariableTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/TapVariableTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/TapVariableTargetCost.java diff --git a/Mage/src/mage/abilities/costs/common/UntapSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/UntapSourceCost.java rename to Mage/src/main/java/mage/abilities/costs/common/UntapSourceCost.java diff --git a/Mage/src/mage/abilities/costs/common/UntapTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/common/UntapTargetCost.java rename to Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java diff --git a/Mage/src/mage/abilities/costs/mana/AlternateManaPaymentAbility.java b/Mage/src/main/java/mage/abilities/costs/mana/AlternateManaPaymentAbility.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/AlternateManaPaymentAbility.java rename to Mage/src/main/java/mage/abilities/costs/mana/AlternateManaPaymentAbility.java diff --git a/Mage/src/mage/abilities/costs/mana/ColoredManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/ColoredManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/ColoredManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/ColoredManaCost.java diff --git a/Mage/src/mage/abilities/costs/mana/GenericManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/GenericManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/GenericManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/GenericManaCost.java diff --git a/Mage/src/mage/abilities/costs/mana/HybridManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/HybridManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/HybridManaCost.java diff --git a/Mage/src/mage/abilities/costs/mana/ManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/ManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/ManaCost.java diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/ManaCostImpl.java rename to Mage/src/main/java/mage/abilities/costs/mana/ManaCostImpl.java diff --git a/Mage/src/mage/abilities/costs/mana/ManaCosts.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/ManaCosts.java rename to Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java rename to Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java diff --git a/Mage/src/mage/abilities/costs/mana/ManaSymbols.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/ManaSymbols.java rename to Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java diff --git a/Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/MonoHybridManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/MonoHybridManaCost.java diff --git a/Mage/src/mage/abilities/costs/mana/PhyrexianManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/PhyrexianManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/PhyrexianManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/PhyrexianManaCost.java diff --git a/Mage/src/mage/abilities/costs/mana/SnowManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/SnowManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/SnowManaCost.java diff --git a/Mage/src/mage/abilities/costs/mana/VariableManaCost.java b/Mage/src/main/java/mage/abilities/costs/mana/VariableManaCost.java similarity index 100% rename from Mage/src/mage/abilities/costs/mana/VariableManaCost.java rename to Mage/src/main/java/mage/abilities/costs/mana/VariableManaCost.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalAsThoughEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalAsThoughEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalAsThoughEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalAsThoughEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinuousEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalContinuousEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalGainActivatedAbility.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalManaEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalManaEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalManaEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalReplacementEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalReplacementEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalReplacementEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalReplacementEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalRequirementEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalRequirementEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalRequirementEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalRestrictionEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalRestrictionEffect.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalRestrictionEffect.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalRestrictionEffect.java diff --git a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java diff --git a/Mage/src/mage/abilities/dynamicvalue/DynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/DynamicValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/DynamicValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/DynamicValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/IntPlusDynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/IntPlusDynamicValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/IntPlusDynamicValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/IntPlusDynamicValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/MultipliedValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/MultipliedValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/MultipliedValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/MultipliedValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/AttackingCreatureCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingCreatureCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/AttackingCreatureCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/AttackingCreatureCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/AuraAttachedCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/AuraAttachedCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/AuraAttachedCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInAllHandsCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerGraveyardCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInControllerHandCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetPlayerHandCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInTargetPlayerHandCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetPlayerHandCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInTargetPlayerHandCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetPlayersGraveyardCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInTargetPlayersGraveyardCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetPlayersGraveyardCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInTargetPlayersGraveyardCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ControllerLifeCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerLifeCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ControllerLifeCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerLifeCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CountersCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CountersCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CreaturesDiedThisTurnCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CreaturesDiedThisTurnCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/CreaturesDiedThisTurnCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/CreaturesDiedThisTurnCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/DevotionCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/DevotionCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/DevotionCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/DevouredCreaturesCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DevouredCreaturesCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/DevouredCreaturesCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/DevouredCreaturesCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardConvertedMana.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/DomainValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ExileFromHandCostCardConvertedMana.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/GetXValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GetXValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/GetXValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/GetXValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/HighestConvertedManaCostValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestConvertedManaCostValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/HighestConvertedManaCostValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/HighestConvertedManaCostValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ManacostVariableValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ManacostVariableValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ManacostVariableValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ManacostVariableValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/MorphManacostVariableValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/MorphManacostVariableValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/MorphManacostVariableValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/MorphManacostVariableValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/MultikickerCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/MultikickerCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/MultikickerCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/NumericSetToEffectValues.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/NumericSetToEffectValues.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/NumericSetToEffectValues.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/NumericSetToEffectValues.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ParleyCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/ParleyCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsTargetOpponentControlsCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/RemovedCountersForCostValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/RemovedCountersForCostValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/RemovedCountersForCostValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/RemovedCountersForCostValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/RevealTargetFromHandCostCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/RevealTargetFromHandCostCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/RevealTargetFromHandCostCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/RevealTargetFromHandCostCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostConvertedMana.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesPower.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SacrificeCostCreaturesToughness.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SignInversionDynamicValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentToughnessValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/StaticValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/StaticValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/StaticValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/StaticValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SunburstCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SunburstCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SunburstCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SunburstCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/SweepNumber.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/SweepNumber.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/SweepNumber.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/SweepNumber.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetConvertedManaCost.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanenToughnessValue.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/TargetPermanentPowerCount.java diff --git a/Mage/src/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java similarity index 100% rename from Mage/src/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java rename to Mage/src/main/java/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java diff --git a/Mage/src/mage/abilities/effects/ApplyCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/ApplyCountersEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/ApplyCountersEffect.java rename to Mage/src/main/java/mage/abilities/effects/ApplyCountersEffect.java diff --git a/Mage/src/mage/abilities/effects/AsThoughEffect.java b/Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/AsThoughEffect.java rename to Mage/src/main/java/mage/abilities/effects/AsThoughEffect.java diff --git a/Mage/src/mage/abilities/effects/AsThoughEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/AsThoughEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/AsThoughEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/AsThoughManaEffect.java b/Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/AsThoughManaEffect.java rename to Mage/src/main/java/mage/abilities/effects/AsThoughManaEffect.java diff --git a/Mage/src/mage/abilities/effects/AsTurnedFaceUpEffect.java b/Mage/src/main/java/mage/abilities/effects/AsTurnedFaceUpEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/AsTurnedFaceUpEffect.java rename to Mage/src/main/java/mage/abilities/effects/AsTurnedFaceUpEffect.java diff --git a/Mage/src/mage/abilities/effects/AuraReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/AuraReplacementEffect.java rename to Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java diff --git a/Mage/src/mage/abilities/effects/ContinuousEffect.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/ContinuousEffect.java rename to Mage/src/main/java/mage/abilities/effects/ContinuousEffect.java diff --git a/Mage/src/mage/abilities/effects/ContinuousEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/ContinuousEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java similarity index 100% rename from Mage/src/mage/abilities/effects/ContinuousEffects.java rename to Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java diff --git a/Mage/src/mage/abilities/effects/ContinuousEffectsList.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java similarity index 100% rename from Mage/src/mage/abilities/effects/ContinuousEffectsList.java rename to Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java diff --git a/Mage/src/mage/abilities/effects/ContinuousRuleModifyingEffect.java b/Mage/src/main/java/mage/abilities/effects/ContinuousRuleModifyingEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/ContinuousRuleModifyingEffect.java rename to Mage/src/main/java/mage/abilities/effects/ContinuousRuleModifyingEffect.java diff --git a/Mage/src/mage/abilities/effects/ContinuousRuleModifyingEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/ContinuousRuleModifyingEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/ContinuousRuleModifyingEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/ContinuousRuleModifyingEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/CostModificationEffect.java b/Mage/src/main/java/mage/abilities/effects/CostModificationEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/CostModificationEffect.java rename to Mage/src/main/java/mage/abilities/effects/CostModificationEffect.java diff --git a/Mage/src/mage/abilities/effects/Effect.java b/Mage/src/main/java/mage/abilities/effects/Effect.java similarity index 100% rename from Mage/src/mage/abilities/effects/Effect.java rename to Mage/src/main/java/mage/abilities/effects/Effect.java diff --git a/Mage/src/mage/abilities/effects/EffectImpl.java b/Mage/src/main/java/mage/abilities/effects/EffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/EffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/EffectImpl.java diff --git a/Mage/src/mage/abilities/effects/Effects.java b/Mage/src/main/java/mage/abilities/effects/Effects.java similarity index 100% rename from Mage/src/mage/abilities/effects/Effects.java rename to Mage/src/main/java/mage/abilities/effects/Effects.java diff --git a/Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/EntersBattlefieldEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java rename to Mage/src/main/java/mage/abilities/effects/EntersBattlefieldEffect.java diff --git a/Mage/src/mage/abilities/effects/OneShotEffect.java b/Mage/src/main/java/mage/abilities/effects/OneShotEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/OneShotEffect.java rename to Mage/src/main/java/mage/abilities/effects/OneShotEffect.java diff --git a/Mage/src/mage/abilities/effects/PayCostToAttackBlockEffect.java b/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/PayCostToAttackBlockEffect.java rename to Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffect.java diff --git a/Mage/src/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/PlaneswalkerRedirectionEffect.java b/Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/PlaneswalkerRedirectionEffect.java rename to Mage/src/main/java/mage/abilities/effects/PlaneswalkerRedirectionEffect.java diff --git a/Mage/src/mage/abilities/effects/PreventionEffect.java b/Mage/src/main/java/mage/abilities/effects/PreventionEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/PreventionEffect.java rename to Mage/src/main/java/mage/abilities/effects/PreventionEffect.java diff --git a/Mage/src/mage/abilities/effects/PreventionEffectData.java b/Mage/src/main/java/mage/abilities/effects/PreventionEffectData.java similarity index 100% rename from Mage/src/mage/abilities/effects/PreventionEffectData.java rename to Mage/src/main/java/mage/abilities/effects/PreventionEffectData.java diff --git a/Mage/src/mage/abilities/effects/PreventionEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/PreventionEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/PreventionEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/PreventionEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/PutTokenOntoBattlefieldCopySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/PutTokenOntoBattlefieldCopySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/PutTokenOntoBattlefieldCopySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/PutTokenOntoBattlefieldCopySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/RedirectionEffect.java b/Mage/src/main/java/mage/abilities/effects/RedirectionEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/RedirectionEffect.java rename to Mage/src/main/java/mage/abilities/effects/RedirectionEffect.java diff --git a/Mage/src/mage/abilities/effects/ReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/ReplacementEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/ReplacementEffect.java rename to Mage/src/main/java/mage/abilities/effects/ReplacementEffect.java diff --git a/Mage/src/mage/abilities/effects/ReplacementEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/ReplacementEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/ReplacementEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/ReplacementEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/RequirementEffect.java b/Mage/src/main/java/mage/abilities/effects/RequirementEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/RequirementEffect.java rename to Mage/src/main/java/mage/abilities/effects/RequirementEffect.java diff --git a/Mage/src/mage/abilities/effects/RestrictionEffect.java b/Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/RestrictionEffect.java rename to Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java diff --git a/Mage/src/mage/abilities/effects/RestrictionUntapNotMoreThanEffect.java b/Mage/src/main/java/mage/abilities/effects/RestrictionUntapNotMoreThanEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/RestrictionUntapNotMoreThanEffect.java rename to Mage/src/main/java/mage/abilities/effects/RestrictionUntapNotMoreThanEffect.java diff --git a/Mage/src/mage/abilities/effects/SearchEffect.java b/Mage/src/main/java/mage/abilities/effects/SearchEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/SearchEffect.java rename to Mage/src/main/java/mage/abilities/effects/SearchEffect.java diff --git a/Mage/src/mage/abilities/effects/SpliceCardEffect.java b/Mage/src/main/java/mage/abilities/effects/SpliceCardEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/SpliceCardEffect.java rename to Mage/src/main/java/mage/abilities/effects/SpliceCardEffect.java diff --git a/Mage/src/mage/abilities/effects/SpliceCardEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/SpliceCardEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/SpliceCardEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/SpliceCardEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/WhileConditionContinuousEffect.java b/Mage/src/main/java/mage/abilities/effects/WhileConditionContinuousEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/WhileConditionContinuousEffect.java rename to Mage/src/main/java/mage/abilities/effects/WhileConditionContinuousEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddConditionalColorlessManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddConditionalColorlessManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddConditionalColorlessManaEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddConditionalColorlessManaEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddConditionalManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddConditionalManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddConditionalManaEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddConditionalManaEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddContinuousEffectToGame.java b/Mage/src/main/java/mage/abilities/effects/common/AddContinuousEffectToGame.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddContinuousEffectToGame.java rename to Mage/src/main/java/mage/abilities/effects/common/AddContinuousEffectToGame.java diff --git a/Mage/src/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyColorEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyColorEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddManaToManaPoolSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolSourceControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddManaToManaPoolSourceControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolSourceControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AffinityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AffinityEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AffinityEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AffinityEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AmplifyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AmplifyEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java diff --git a/Mage/src/mage/abilities/effects/common/AttachEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AttachEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/AttachEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/AttachEffect.java diff --git a/Mage/src/mage/abilities/effects/common/BasicManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/BasicManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/BasicManaEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/BasicManaEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantActivateAbilitiesAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeCounteredControlledEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantBeCounteredControlledEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantBeCounteredControlledEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeCounteredSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantBeCounteredSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantBeCounteredSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantBeRegeneratedTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantBeRegeneratedTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantBeTargetedAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantBeTargetedSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CantBeTargetedTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CastCardFromOutsideTheGameEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CastSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/effects/common/CastSourceTriggeredAbility.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CastSourceTriggeredAbility.java rename to Mage/src/main/java/mage/abilities/effects/common/CastSourceTriggeredAbility.java diff --git a/Mage/src/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChooseBasicLandTypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseBasicLandTypeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChooseBasicLandTypeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChooseBasicLandTypeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseColorEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChooseColorEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChooseColorEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChooseCreatureTypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChooseCreatureTypeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChooseLandTypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChooseLandTypeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChooseLandTypeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChooseModeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChooseModeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChooseNewTargetsTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseNewTargetsTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChooseNewTargetsTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChooseNewTargetsTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChooseOpponentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseOpponentEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChooseOpponentEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChooseOpponentEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ChoosePlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChoosePlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ChoosePlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ChoosePlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CipherEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CipherEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ClashEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ClashEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ClashWinReturnToHandSpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CopyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CopyEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CopyPermanentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CopyPermanentEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CopyTargetSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTargetSpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CopyTargetSpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CopyTargetSpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CopyTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CopyTokenEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CounterTargetAndSearchGraveyardHandLibraryEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CounterTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CounterTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CounterTargetWithReplacementEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CounterUnlessPaysEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CreateDelayedTriggeredAbilityEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CreateSpecialActionEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateSpecialActionEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CreateSpecialActionEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CreateSpecialActionEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CreateTokenEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/CreateTokenTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageAllControlledTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageAttachedControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageAttachedControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageEachOtherEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageEachOtherEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageEachOtherEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageEachOtherEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageEverythingEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageEverythingEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageEverythingEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageMultiEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageMultiEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageMultiEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamagePlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamagePlayersEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageSelfEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageSelfEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageSelfEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageTargetControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageTargetControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DamageTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DamageTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroyAllControlledTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroyAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroyAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroyAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroyAllNamedPermanentsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroyAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroyAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroyAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroyMultiTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroyMultiTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroyMultiTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroyTargetAtBeginningOfNextEndStepEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DetainAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DetainAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DetainTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DetainTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DetainTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DevourEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DevourEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DevourEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DiscardOntoBattlefieldEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoIfClashWonEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DoIfClashWonEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DoIfCostPaid.java rename to Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java diff --git a/Mage/src/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DoUnlessAnyPlayerPaysEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DontUntapAsLongAsSourceTappedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersNextUntapStepTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepEnchantedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DrawCardAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DrawCardAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DrawCardAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DrawCardSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DrawCardSourceControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DrawCardSourceControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DrawCardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DrawCardTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DrawDiscardControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DrawDiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DrawDiscardTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/DynamicManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DynamicManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/DynamicManaEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/DynamicManaEffect.java diff --git a/Mage/src/mage/abilities/effects/common/EndTurnEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EndTurnEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/EndTurnEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/EndTurnEffect.java diff --git a/Mage/src/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/EnterBattlefieldPayCostOrPutGraveyardEffect.java diff --git a/Mage/src/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java diff --git a/Mage/src/mage/abilities/effects/common/EnvoyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EnvoyEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/EnvoyEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/EnvoyEffect.java diff --git a/Mage/src/mage/abilities/effects/common/EpicEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/EpicEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileAndReturnTransformedSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileFromZoneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileFromZoneTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllPlayersEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileGraveyardAllTargetPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileReturnToBattlefieldOwnerNextEndStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileReturnToBattlefieldOwnerNextEndStepEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileReturnToBattlefieldOwnerNextEndStepEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileReturnToBattlefieldOwnerNextEndStepEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileSpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileSpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileSpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ExileTargetForSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ExileTargetForSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ExileTargetForSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/FightTargetSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/FightTargetSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/FightTargetsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/FightTargetsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/FlipSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/FlipSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/GainLifeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/GainLifeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/GainLifeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/GetEmblemEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/GetEmblemEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/GetEmblemEffect.java diff --git a/Mage/src/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/GetEmblemTargetPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/HideawayPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/HideawayPlayEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/HideawayPlayEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ImprintTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ImprintTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ImprintTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/InfoEffect.java b/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/InfoEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LookAtTargetPlayerHandEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LookLibraryControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryMayPutToBottomEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryMayPutToBottomEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LookLibraryMayPutToBottomEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LookLibraryMayPutToBottomEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseControlOnOtherPlayersControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseGameSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseGameSourceControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseGameSourceControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseGameSourceControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseGameTargetPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseHalfLifeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseHalfLifeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseLifeAllPlayersEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseLifeControllerAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseLifeOpponentsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseLifeSourceControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/LoseLifeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/LoseLifeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ManaEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java diff --git a/Mage/src/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/NameACardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/NameACardEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/NameACardEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/NameACardEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PassEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PassEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PassEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PassEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PhaseOutSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PhaseOutSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PhaseOutSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PhaseOutTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PhaseOutTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PhaseOutTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PlayTargetWithoutPayingManaEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PopulateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PopulateEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageByAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageByAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageByAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageToAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageToAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAndByAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageToAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageToAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageToControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageToControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToPlayersEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventAllNonCombatDamageToAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllNonCombatDamageToAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventAllNonCombatDamageToAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventAllNonCombatDamageToAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageBySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventCombatDamageToSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventDamageBySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageBySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventDamageBySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventDamageBySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventDamageByTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventDamageByTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventDamageByTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventDamageToSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventDamageToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventDamageToTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetMultiAmountEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToYouEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToYouEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToYouEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToYouEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutOnLibrarySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutOnLibrarySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutOnLibrarySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutOnLibrarySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutOnLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutOnLibraryTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutOnLibraryTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutOntoBattlefieldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutOntoBattlefieldTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutOntoBattlefieldTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutOntoBattlefieldTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RedirectDamageFromSourceToTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RedirectDamageFromSourceToTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RedirectDamageFromSourceToTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RedirectDamageFromSourceToTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RegenerateAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RegenerateAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RegenerateAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RegenerateAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RegenerateAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RegenerateAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RegenerateSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RegenerateSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RegenerateSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RegenerateTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RegenerateTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RemoveAllCountersSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveAllCountersSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RemoveAllCountersSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RemoveAllCountersSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RemoveDelayedTriggeredAbilityEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RemoveFromCombatSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RemoveFromCombatSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RemoveFromCombatTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RemoveSpecialActionEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RemoveSpecialActionEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RemoveSpecialActionEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToHandTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToHandTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToHandTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToHandEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToHandAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToHandAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandChosenControlledPermanentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandChosenControlledPermanentEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToHandChosenControlledPermanentEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToHandChosenControlledPermanentEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromBattlefieldAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToHandSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToHandSpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToHandSpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToHandTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ReturnToLibrarySpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RevealAndShuffleIntoLibrarySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealAndShuffleIntoLibrarySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RevealAndShuffleIntoLibrarySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RevealAndShuffleIntoLibrarySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RevealHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealHandTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RevealHandTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RevealHandTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java diff --git a/Mage/src/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/RevealTargetPlayerLibraryEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeEquippedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeEquippedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeOpponentsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessConditionEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessConditionEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessConditionEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessConditionEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeSourceUnlessPaysEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SacrificeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SacrificeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SacrificeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SetPlayerLifeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SetPlayerLifeAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibrarySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ShuffleLibrarySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibrarySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ShuffleLibrarySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ShuffleLibrarySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ShuffleSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleSpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ShuffleSpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ShuffleSpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SkipDrawStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipDrawStepEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SkipDrawStepEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SkipDrawStepEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java diff --git a/Mage/src/mage/abilities/effects/common/SkipUntapOptionalSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipUntapOptionalSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/SkipUntapOptionalSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/SkipUntapOptionalSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/TapAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/TapAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/TapAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/TapEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapEnchantedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/TapEnchantedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/TapEnchantedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/TapSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/TapSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/TapSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java diff --git a/Mage/src/mage/abilities/effects/common/TapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/TapTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/TransformSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TransformSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/TransformSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/TransformSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/UntapAllControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapAllControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/UntapAllControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/UntapAllControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/UntapAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/UntapAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/UntapAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/UntapAllLandsControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/UntapAllLandsControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/UntapEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapEnchantedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/UntapEnchantedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/UntapEnchantedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/UntapLandsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/UntapLandsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/UntapSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/UntapSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/UntapSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/UntapTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/WinGameSourceControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/WinGameSourceControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/WinGameSourceControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/WinGameSourceControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/AttacksIfAbleTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/BlocksIfAbleTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CanAttackAsThoughItDidntHaveDefenderTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackBlockUnlessPaysSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantAttackYouUnlessPayManaAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouUnlessPayManaAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantAttackYouUnlessPayManaAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouUnlessPayManaAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByAllTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithGreaterPowerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByCreaturesWithLessPowerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByMoreThanOneSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByOneTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByTargetSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByTargetSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedByTargetSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedByTargetSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBeBlockedTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBeBlockedTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBlockAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockAttackActivateAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockCreaturesSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockCreaturesSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBlockCreaturesSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockCreaturesSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBlockSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBlockTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/CantBlockUnlessPayManaAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockUnlessPayManaAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/CantBlockUnlessPayManaAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/CantBlockUnlessPayManaAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAtLeastOneTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardColorAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubTypeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/AssignNoCombatDamageSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandEnchantedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBasicLandTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesChosenCreatureTypeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorOrColorsTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTypeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesFaceDownCreatureEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesSubtypeAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostControlledEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEnchantedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostEquippedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostEquippedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostEquippedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostPairedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostPairedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostPairedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostPairedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostSourceWhileControlsEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/BoostTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/BoostTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/BoostTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CantGainLifeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CastAsThoughItHadFlashSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderManaReplacementEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/ControlEnchantedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ControlEnchantedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/ControlEnchantedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/ControlEnchantedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/DontLoseByZeroOrLessLifeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/DontLoseByZeroOrLessLifeEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/DontLoseByZeroOrLessLifeEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/DontLoseByZeroOrLessLifeEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityPairedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilitySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainControlTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainProtectionFromColorSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainProtectionFromColorSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromTypeTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/GainSuspendEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainSuspendEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/GainSuspendEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/GainSuspendEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LifeTotalCantChangeControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LifeTotalCantChangeControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LifeTotalCantChangeControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LifeTotalCantChangeControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAllAbilitiesAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAllAbilitiesAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllAbilitiesTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAllCreatureTypesTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/MaximumHandSizeControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/PlayAdditionalLandsControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/PlayAdditionalLandsControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/PlayTheTopCardEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithHandRevealedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/PlayWithTheTopCardRevealedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardColorAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SetCardSubtypeAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetPowerSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SetPowerSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SetPowerToughnessTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SetToughnessSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SetToughnessSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SetToughnessSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SetToughnessSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/continuous/UntapAllDuringEachOtherPlayersUntapStepEffect.java diff --git a/Mage/src/mage/abilities/effects/common/cost/CommanderCostModification.java b/Mage/src/main/java/mage/abilities/effects/common/cost/CommanderCostModification.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/cost/CommanderCostModification.java rename to Mage/src/main/java/mage/abilities/effects/common/cost/CommanderCostModification.java diff --git a/Mage/src/mage/abilities/effects/common/cost/CostModificationEffectImpl.java b/Mage/src/main/java/mage/abilities/effects/common/cost/CostModificationEffectImpl.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/cost/CostModificationEffectImpl.java rename to Mage/src/main/java/mage/abilities/effects/common/cost/CostModificationEffectImpl.java diff --git a/Mage/src/mage/abilities/effects/common/cost/SpellCostReductionSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellCostReductionSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/cost/SpellCostReductionSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/cost/SpellCostReductionSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/cost/SpellsCostIncreasementAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostIncreasementAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/cost/SpellsCostIncreasementAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostIncreasementAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/cost/SpellsCostIncreasementControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostIncreasementControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/cost/SpellsCostIncreasementControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostIncreasementControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/cost/SpellsCostReductionControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddCountersAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddCountersControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddCountersTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddPoisonCounterTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/discard/DiscardControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/discard/DiscardControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardHandAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/discard/DiscardHandAllEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardHandControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/discard/DiscardHandControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/discard/DiscardTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/discard/DiscardTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java b/Mage/src/main/java/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java rename to Mage/src/main/java/mage/abilities/effects/common/replacement/DealtDamageToCreatureBySourceDies.java diff --git a/Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CantRegenerateTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/ruleModifying/CastOnlyIfYouHaveCastAnotherSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CastOnlyIfYouHaveCastAnotherSpellEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/ruleModifying/CastOnlyIfYouHaveCastAnotherSpellEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/ruleModifying/CastOnlyIfYouHaveCastAnotherSpellEffect.java diff --git a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java diff --git a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java diff --git a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutOnLibraryEffect.java diff --git a/Mage/src/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java diff --git a/Mage/src/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnControllerEffect.java diff --git a/Mage/src/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/turn/AddExtraTurnTargetEffect.java diff --git a/Mage/src/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java b/Mage/src/main/java/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/turn/ControlTargetPlayerNextTurnEffect.java diff --git a/Mage/src/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/common/turn/SkipNextTurnSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/BolsterEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/BolsterEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/BolsterEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/BolsterEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/FatesealEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/FatesealEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/FatesealEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/ManifestEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/ManifestEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/ManifestEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorAttachedEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/ProtectionChosenColorSourceEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/ScryEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ScryEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/ScryEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/ScryEffect.java diff --git a/Mage/src/mage/abilities/effects/keyword/SweepEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java similarity index 100% rename from Mage/src/mage/abilities/effects/keyword/SweepEffect.java rename to Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java diff --git a/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java b/Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java rename to Mage/src/main/java/mage/abilities/keyword/AffinityForArtifactsAbility.java diff --git a/Mage/src/mage/abilities/keyword/AffinityForLandTypeAbility.java b/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/AffinityForLandTypeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java diff --git a/Mage/src/mage/abilities/keyword/AmplifyAbility.java b/Mage/src/main/java/mage/abilities/keyword/AmplifyAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/AmplifyAbility.java rename to Mage/src/main/java/mage/abilities/keyword/AmplifyAbility.java diff --git a/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java b/Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/AnnihilatorAbility.java rename to Mage/src/main/java/mage/abilities/keyword/AnnihilatorAbility.java diff --git a/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java b/Mage/src/main/java/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java rename to Mage/src/main/java/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java diff --git a/Mage/src/mage/abilities/keyword/AuraSwapAbility.java b/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/AuraSwapAbility.java rename to Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java diff --git a/Mage/src/mage/abilities/keyword/AwakenAbility.java b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/AwakenAbility.java rename to Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java diff --git a/Mage/src/mage/abilities/keyword/BasicLandcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/BasicLandcyclingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BasicLandcyclingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BasicLandcyclingAbility.java diff --git a/Mage/src/mage/abilities/keyword/BattalionAbility.java b/Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BattalionAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BattalionAbility.java diff --git a/Mage/src/mage/abilities/keyword/BattleCryAbility.java b/Mage/src/main/java/mage/abilities/keyword/BattleCryAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BattleCryAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BattleCryAbility.java diff --git a/Mage/src/mage/abilities/keyword/BestowAbility.java b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BestowAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BestowAbility.java diff --git a/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java b/Mage/src/main/java/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java diff --git a/Mage/src/mage/abilities/keyword/BloodrushAbility.java b/Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BloodrushAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BloodrushAbility.java diff --git a/Mage/src/mage/abilities/keyword/BloodthirstAbility.java b/Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BloodthirstAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BloodthirstAbility.java diff --git a/Mage/src/mage/abilities/keyword/BushidoAbility.java b/Mage/src/main/java/mage/abilities/keyword/BushidoAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BushidoAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BushidoAbility.java diff --git a/Mage/src/mage/abilities/keyword/BuybackAbility.java b/Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/BuybackAbility.java rename to Mage/src/main/java/mage/abilities/keyword/BuybackAbility.java diff --git a/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java b/Mage/src/main/java/mage/abilities/keyword/CanAttackOnlyAloneAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java rename to Mage/src/main/java/mage/abilities/keyword/CanAttackOnlyAloneAbility.java diff --git a/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java b/Mage/src/main/java/mage/abilities/keyword/CantAttackAloneAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java rename to Mage/src/main/java/mage/abilities/keyword/CantAttackAloneAbility.java diff --git a/Mage/src/mage/abilities/keyword/CantBeBlockedSourceAbility.java b/Mage/src/main/java/mage/abilities/keyword/CantBeBlockedSourceAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/CantBeBlockedSourceAbility.java rename to Mage/src/main/java/mage/abilities/keyword/CantBeBlockedSourceAbility.java diff --git a/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java b/Mage/src/main/java/mage/abilities/keyword/CantBlockAloneAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java rename to Mage/src/main/java/mage/abilities/keyword/CantBlockAloneAbility.java diff --git a/Mage/src/mage/abilities/keyword/CascadeAbility.java b/Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/CascadeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java diff --git a/Mage/src/mage/abilities/keyword/ChampionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ChampionAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java diff --git a/Mage/src/mage/abilities/keyword/ChangelingAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChangelingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ChangelingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ChangelingAbility.java diff --git a/Mage/src/mage/abilities/keyword/ChannelAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ChannelAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ChannelAbility.java diff --git a/Mage/src/mage/abilities/keyword/ConspireAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ConspireAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java diff --git a/Mage/src/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ConvokeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ConvokeAbility.java diff --git a/Mage/src/mage/abilities/keyword/CumulativeUpkeepAbility.java b/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/CumulativeUpkeepAbility.java rename to Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java diff --git a/Mage/src/mage/abilities/keyword/CyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/CyclingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java diff --git a/Mage/src/mage/abilities/keyword/DashAbility.java b/Mage/src/main/java/mage/abilities/keyword/DashAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DashAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DashAbility.java diff --git a/Mage/src/mage/abilities/keyword/DeathtouchAbility.java b/Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DeathtouchAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DeathtouchAbility.java diff --git a/Mage/src/mage/abilities/keyword/DefenderAbility.java b/Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DefenderAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DefenderAbility.java diff --git a/Mage/src/mage/abilities/keyword/DelveAbility.java b/Mage/src/main/java/mage/abilities/keyword/DelveAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DelveAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DelveAbility.java diff --git a/Mage/src/mage/abilities/keyword/DethroneAbility.java b/Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DethroneAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DethroneAbility.java diff --git a/Mage/src/mage/abilities/keyword/DevoidAbility.java b/Mage/src/main/java/mage/abilities/keyword/DevoidAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DevoidAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DevoidAbility.java diff --git a/Mage/src/mage/abilities/keyword/DevourAbility.java b/Mage/src/main/java/mage/abilities/keyword/DevourAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DevourAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DevourAbility.java diff --git a/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java b/Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DoubleStrikeAbility.java diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/main/java/mage/abilities/keyword/DredgeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/DredgeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/DredgeAbility.java diff --git a/Mage/src/mage/abilities/keyword/EchoAbility.java b/Mage/src/main/java/mage/abilities/keyword/EchoAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/EchoAbility.java rename to Mage/src/main/java/mage/abilities/keyword/EchoAbility.java diff --git a/Mage/src/mage/abilities/keyword/EnchantAbility.java b/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/EnchantAbility.java rename to Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java diff --git a/Mage/src/mage/abilities/keyword/EntwineAbility.java b/Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/EntwineAbility.java rename to Mage/src/main/java/mage/abilities/keyword/EntwineAbility.java diff --git a/Mage/src/mage/abilities/keyword/EquipAbility.java b/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/EquipAbility.java rename to Mage/src/main/java/mage/abilities/keyword/EquipAbility.java diff --git a/Mage/src/mage/abilities/keyword/EvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/EvokeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/EvokeAbility.java diff --git a/Mage/src/mage/abilities/keyword/EvolveAbility.java b/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/EvolveAbility.java rename to Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java diff --git a/Mage/src/mage/abilities/keyword/ExaltedAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExaltedAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ExaltedAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ExaltedAbility.java diff --git a/Mage/src/mage/abilities/keyword/ExploitAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExploitAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ExploitAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ExploitAbility.java diff --git a/Mage/src/mage/abilities/keyword/ExtortAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ExtortAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ExtortAbility.java diff --git a/Mage/src/mage/abilities/keyword/FadingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FadingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FadingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FadingAbility.java diff --git a/Mage/src/mage/abilities/keyword/FearAbility.java b/Mage/src/main/java/mage/abilities/keyword/FearAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FearAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FearAbility.java diff --git a/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java b/Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FirstStrikeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FirstStrikeAbility.java diff --git a/Mage/src/mage/abilities/keyword/FlankingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlankingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FlankingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FlankingAbility.java diff --git a/Mage/src/mage/abilities/keyword/FlashAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FlashAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FlashAbility.java diff --git a/Mage/src/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FlashbackAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FlashbackAbility.java diff --git a/Mage/src/mage/abilities/keyword/FlyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FlyingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FlyingAbility.java diff --git a/Mage/src/mage/abilities/keyword/ForecastAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ForecastAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java diff --git a/Mage/src/mage/abilities/keyword/ForestcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ForestcyclingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java diff --git a/Mage/src/mage/abilities/keyword/ForestwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ForestwalkAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java diff --git a/Mage/src/mage/abilities/keyword/FortifyAbility.java b/Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/FortifyAbility.java rename to Mage/src/main/java/mage/abilities/keyword/FortifyAbility.java diff --git a/Mage/src/mage/abilities/keyword/GraftAbility.java b/Mage/src/main/java/mage/abilities/keyword/GraftAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/GraftAbility.java rename to Mage/src/main/java/mage/abilities/keyword/GraftAbility.java diff --git a/Mage/src/mage/abilities/keyword/GravestormAbility.java b/Mage/src/main/java/mage/abilities/keyword/GravestormAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/GravestormAbility.java rename to Mage/src/main/java/mage/abilities/keyword/GravestormAbility.java diff --git a/Mage/src/mage/abilities/keyword/HasteAbility.java b/Mage/src/main/java/mage/abilities/keyword/HasteAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/HasteAbility.java rename to Mage/src/main/java/mage/abilities/keyword/HasteAbility.java diff --git a/Mage/src/mage/abilities/keyword/HauntAbility.java b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/HauntAbility.java rename to Mage/src/main/java/mage/abilities/keyword/HauntAbility.java diff --git a/Mage/src/mage/abilities/keyword/HeroicAbility.java b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/HeroicAbility.java rename to Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java diff --git a/Mage/src/mage/abilities/keyword/HexproofAbility.java b/Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/HexproofAbility.java rename to Mage/src/main/java/mage/abilities/keyword/HexproofAbility.java diff --git a/Mage/src/mage/abilities/keyword/HideawayAbility.java b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/HideawayAbility.java rename to Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java diff --git a/Mage/src/mage/abilities/keyword/HorsemanshipAbility.java b/Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/HorsemanshipAbility.java rename to Mage/src/main/java/mage/abilities/keyword/HorsemanshipAbility.java diff --git a/Mage/src/mage/abilities/keyword/IndestructibleAbility.java b/Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/IndestructibleAbility.java rename to Mage/src/main/java/mage/abilities/keyword/IndestructibleAbility.java diff --git a/Mage/src/mage/abilities/keyword/InfectAbility.java b/Mage/src/main/java/mage/abilities/keyword/InfectAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/InfectAbility.java rename to Mage/src/main/java/mage/abilities/keyword/InfectAbility.java diff --git a/Mage/src/mage/abilities/keyword/IngestAbility.java b/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/IngestAbility.java rename to Mage/src/main/java/mage/abilities/keyword/IngestAbility.java diff --git a/Mage/src/mage/abilities/keyword/InspiredAbility.java b/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/InspiredAbility.java rename to Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java diff --git a/Mage/src/mage/abilities/keyword/IntimidateAbility.java b/Mage/src/main/java/mage/abilities/keyword/IntimidateAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/IntimidateAbility.java rename to Mage/src/main/java/mage/abilities/keyword/IntimidateAbility.java diff --git a/Mage/src/mage/abilities/keyword/IslandcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/IslandcyclingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java diff --git a/Mage/src/mage/abilities/keyword/IslandwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/IslandwalkAbility.java rename to Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java diff --git a/Mage/src/mage/abilities/keyword/KickerAbility.java b/Mage/src/main/java/mage/abilities/keyword/KickerAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/KickerAbility.java rename to Mage/src/main/java/mage/abilities/keyword/KickerAbility.java diff --git a/Mage/src/mage/abilities/keyword/LandwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/LandwalkAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/LandwalkAbility.java rename to Mage/src/main/java/mage/abilities/keyword/LandwalkAbility.java diff --git a/Mage/src/mage/abilities/keyword/LevelUpAbility.java b/Mage/src/main/java/mage/abilities/keyword/LevelUpAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/LevelUpAbility.java rename to Mage/src/main/java/mage/abilities/keyword/LevelUpAbility.java diff --git a/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java similarity index 100% rename from Mage/src/mage/abilities/keyword/LevelerCardBuilder.java rename to Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java diff --git a/Mage/src/mage/abilities/keyword/LeylineAbility.java b/Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/LeylineAbility.java rename to Mage/src/main/java/mage/abilities/keyword/LeylineAbility.java diff --git a/Mage/src/mage/abilities/keyword/LifelinkAbility.java b/Mage/src/main/java/mage/abilities/keyword/LifelinkAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/LifelinkAbility.java rename to Mage/src/main/java/mage/abilities/keyword/LifelinkAbility.java diff --git a/Mage/src/mage/abilities/keyword/LivingWeaponAbility.java b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/LivingWeaponAbility.java rename to Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java diff --git a/Mage/src/mage/abilities/keyword/MadnessAbility.java b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MadnessAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java diff --git a/Mage/src/mage/abilities/keyword/MenaceAbility.java b/Mage/src/main/java/mage/abilities/keyword/MenaceAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MenaceAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MenaceAbility.java diff --git a/Mage/src/mage/abilities/keyword/MiracleAbility.java b/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MiracleAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java diff --git a/Mage/src/mage/abilities/keyword/ModularAbility.java b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ModularAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ModularAbility.java diff --git a/Mage/src/mage/abilities/keyword/MonstrosityAbility.java b/Mage/src/main/java/mage/abilities/keyword/MonstrosityAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MonstrosityAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MonstrosityAbility.java diff --git a/Mage/src/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MorphAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MorphAbility.java diff --git a/Mage/src/mage/abilities/keyword/MountaincyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MountaincyclingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java diff --git a/Mage/src/mage/abilities/keyword/MountainwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MountainwalkAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java diff --git a/Mage/src/mage/abilities/keyword/MultikickerAbility.java b/Mage/src/main/java/mage/abilities/keyword/MultikickerAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MultikickerAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MultikickerAbility.java diff --git a/Mage/src/mage/abilities/keyword/MyriadAbility.java b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/MyriadAbility.java rename to Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java diff --git a/Mage/src/mage/abilities/keyword/NinjutsuAbility.java b/Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/NinjutsuAbility.java rename to Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java diff --git a/Mage/src/mage/abilities/keyword/OfferingAbility.java b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/OfferingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java diff --git a/Mage/src/mage/abilities/keyword/OutlastAbility.java b/Mage/src/main/java/mage/abilities/keyword/OutlastAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/OutlastAbility.java rename to Mage/src/main/java/mage/abilities/keyword/OutlastAbility.java diff --git a/Mage/src/mage/abilities/keyword/OverloadAbility.java b/Mage/src/main/java/mage/abilities/keyword/OverloadAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/OverloadAbility.java rename to Mage/src/main/java/mage/abilities/keyword/OverloadAbility.java diff --git a/Mage/src/mage/abilities/keyword/PersistAbility.java b/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/PersistAbility.java rename to Mage/src/main/java/mage/abilities/keyword/PersistAbility.java diff --git a/Mage/src/mage/abilities/keyword/PhasingAbility.java b/Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/PhasingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/PhasingAbility.java diff --git a/Mage/src/mage/abilities/keyword/PlainscyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/PlainscyclingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java diff --git a/Mage/src/mage/abilities/keyword/PlainswalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/PlainswalkAbility.java rename to Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java diff --git a/Mage/src/mage/abilities/keyword/PoisonousAbility.java b/Mage/src/main/java/mage/abilities/keyword/PoisonousAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/PoisonousAbility.java rename to Mage/src/main/java/mage/abilities/keyword/PoisonousAbility.java diff --git a/Mage/src/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ProtectionAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java diff --git a/Mage/src/mage/abilities/keyword/ProvokeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ProvokeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ProvokeAbility.java diff --git a/Mage/src/mage/abilities/keyword/ProwessAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProwessAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ProwessAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ProwessAbility.java diff --git a/Mage/src/mage/abilities/keyword/ProwlAbility.java b/Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ProwlAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ProwlAbility.java diff --git a/Mage/src/mage/abilities/keyword/RampageAbility.java b/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/RampageAbility.java rename to Mage/src/main/java/mage/abilities/keyword/RampageAbility.java diff --git a/Mage/src/mage/abilities/keyword/ReachAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReachAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ReachAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ReachAbility.java diff --git a/Mage/src/mage/abilities/keyword/ReboundAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ReboundAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ReboundAbility.java diff --git a/Mage/src/mage/abilities/keyword/RecoverAbility.java b/Mage/src/main/java/mage/abilities/keyword/RecoverAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/RecoverAbility.java rename to Mage/src/main/java/mage/abilities/keyword/RecoverAbility.java diff --git a/Mage/src/mage/abilities/keyword/ReinforceAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ReinforceAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ReinforceAbility.java diff --git a/Mage/src/mage/abilities/keyword/RenownAbility.java b/Mage/src/main/java/mage/abilities/keyword/RenownAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/RenownAbility.java rename to Mage/src/main/java/mage/abilities/keyword/RenownAbility.java diff --git a/Mage/src/mage/abilities/keyword/ReplicateAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ReplicateAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java diff --git a/Mage/src/mage/abilities/keyword/RetraceAbility.java b/Mage/src/main/java/mage/abilities/keyword/RetraceAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/RetraceAbility.java rename to Mage/src/main/java/mage/abilities/keyword/RetraceAbility.java diff --git a/Mage/src/mage/abilities/keyword/RippleAbility.java b/Mage/src/main/java/mage/abilities/keyword/RippleAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/RippleAbility.java rename to Mage/src/main/java/mage/abilities/keyword/RippleAbility.java diff --git a/Mage/src/mage/abilities/keyword/ScavengeAbility.java b/Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ScavengeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ScavengeAbility.java diff --git a/Mage/src/mage/abilities/keyword/ShadowAbility.java b/Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ShadowAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ShadowAbility.java diff --git a/Mage/src/mage/abilities/keyword/ShroudAbility.java b/Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/ShroudAbility.java rename to Mage/src/main/java/mage/abilities/keyword/ShroudAbility.java diff --git a/Mage/src/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SoulbondAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java diff --git a/Mage/src/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SoulshiftAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java diff --git a/Mage/src/mage/abilities/keyword/SpliceOntoArcaneAbility.java b/Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SpliceOntoArcaneAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SpliceOntoArcaneAbility.java diff --git a/Mage/src/mage/abilities/keyword/SplitSecondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SplitSecondAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SplitSecondAbility.java diff --git a/Mage/src/mage/abilities/keyword/StormAbility.java b/Mage/src/main/java/mage/abilities/keyword/StormAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/StormAbility.java rename to Mage/src/main/java/mage/abilities/keyword/StormAbility.java diff --git a/Mage/src/mage/abilities/keyword/SunburstAbility.java b/Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SunburstAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java diff --git a/Mage/src/mage/abilities/keyword/SuspendAbility.java b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SuspendAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java diff --git a/Mage/src/mage/abilities/keyword/SwampcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SwampcyclingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java diff --git a/Mage/src/mage/abilities/keyword/SwampwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/SwampwalkAbility.java rename to Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java diff --git a/Mage/src/mage/abilities/keyword/TotemArmorAbility.java b/Mage/src/main/java/mage/abilities/keyword/TotemArmorAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/TotemArmorAbility.java rename to Mage/src/main/java/mage/abilities/keyword/TotemArmorAbility.java diff --git a/Mage/src/mage/abilities/keyword/TrampleAbility.java b/Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/TrampleAbility.java rename to Mage/src/main/java/mage/abilities/keyword/TrampleAbility.java diff --git a/Mage/src/mage/abilities/keyword/TransformAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/TransformAbility.java rename to Mage/src/main/java/mage/abilities/keyword/TransformAbility.java diff --git a/Mage/src/mage/abilities/keyword/TransmuteAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/TransmuteAbility.java rename to Mage/src/main/java/mage/abilities/keyword/TransmuteAbility.java diff --git a/Mage/src/mage/abilities/keyword/TributeAbility.java b/Mage/src/main/java/mage/abilities/keyword/TributeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/TributeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/TributeAbility.java diff --git a/Mage/src/mage/abilities/keyword/UndyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/UndyingAbility.java rename to Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java diff --git a/Mage/src/mage/abilities/keyword/UnearthAbility.java b/Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/UnearthAbility.java rename to Mage/src/main/java/mage/abilities/keyword/UnearthAbility.java diff --git a/Mage/src/mage/abilities/keyword/UnleashAbility.java b/Mage/src/main/java/mage/abilities/keyword/UnleashAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/UnleashAbility.java rename to Mage/src/main/java/mage/abilities/keyword/UnleashAbility.java diff --git a/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java b/Mage/src/main/java/mage/abilities/keyword/VanishingSacrificeAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java rename to Mage/src/main/java/mage/abilities/keyword/VanishingSacrificeAbility.java diff --git a/Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java b/Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java rename to Mage/src/main/java/mage/abilities/keyword/VanishingUpkeepAbility.java diff --git a/Mage/src/mage/abilities/keyword/VigilanceAbility.java b/Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/VigilanceAbility.java rename to Mage/src/main/java/mage/abilities/keyword/VigilanceAbility.java diff --git a/Mage/src/mage/abilities/keyword/WitherAbility.java b/Mage/src/main/java/mage/abilities/keyword/WitherAbility.java similarity index 100% rename from Mage/src/mage/abilities/keyword/WitherAbility.java rename to Mage/src/main/java/mage/abilities/keyword/WitherAbility.java diff --git a/Mage/src/mage/abilities/mana/ActivateAsSorceryManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ActivateAsSorceryManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ActivateAsSorceryManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ActivateAsSorceryManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ActivateIfConditionManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ActivateIfConditionManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ActivateIfConditionManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ActivateIfConditionManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ActivateOncePerTurnManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ActivateOncePerTurnManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ActivateOncePerTurnManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ActivateOncePerTurnManaAbility.java diff --git a/Mage/src/mage/abilities/mana/AnyColorManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/AnyColorManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/AnyColorManaAbility.java diff --git a/Mage/src/mage/abilities/mana/AnyColorOpponentLandsProduceManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorOpponentLandsProduceManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/AnyColorOpponentLandsProduceManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/AnyColorOpponentLandsProduceManaAbility.java diff --git a/Mage/src/mage/abilities/mana/BasicManaAbility.java b/Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/BasicManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/BasicManaAbility.java diff --git a/Mage/src/mage/abilities/mana/BlackManaAbility.java b/Mage/src/main/java/mage/abilities/mana/BlackManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/BlackManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/BlackManaAbility.java diff --git a/Mage/src/mage/abilities/mana/BlueManaAbility.java b/Mage/src/main/java/mage/abilities/mana/BlueManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/BlueManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/BlueManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ColorlessManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ColorlessManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ColorlessManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ColorlessManaAbility.java diff --git a/Mage/src/mage/abilities/mana/CommanderColorIdentityManaAbility.java b/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/CommanderColorIdentityManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ConditionalAnyColorManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ConditionalColoredManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ConditionalColoredManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ConditionalColoredManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ConditionalColoredManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ConditionalColorlessManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ConditionalColorlessManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ConditionalColorlessManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ConditionalColorlessManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ConditionalManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ConditionalManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java diff --git a/Mage/src/mage/abilities/mana/DelayedTriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/mana/DelayedTriggeredManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/DelayedTriggeredManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/DelayedTriggeredManaAbility.java diff --git a/Mage/src/mage/abilities/mana/DynamicManaAbility.java b/Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/DynamicManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java diff --git a/Mage/src/mage/abilities/mana/GreenManaAbility.java b/Mage/src/main/java/mage/abilities/mana/GreenManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/GreenManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/GreenManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/ManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/ManaAbility.java diff --git a/Mage/src/mage/abilities/mana/ManaOptions.java b/Mage/src/main/java/mage/abilities/mana/ManaOptions.java similarity index 100% rename from Mage/src/mage/abilities/mana/ManaOptions.java rename to Mage/src/main/java/mage/abilities/mana/ManaOptions.java diff --git a/Mage/src/mage/abilities/mana/RedManaAbility.java b/Mage/src/main/java/mage/abilities/mana/RedManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/RedManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/RedManaAbility.java diff --git a/Mage/src/mage/abilities/mana/SimpleManaAbility.java b/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/SimpleManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java diff --git a/Mage/src/mage/abilities/mana/TriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/TriggeredManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java diff --git a/Mage/src/mage/abilities/mana/WhiteManaAbility.java b/Mage/src/main/java/mage/abilities/mana/WhiteManaAbility.java similarity index 100% rename from Mage/src/mage/abilities/mana/WhiteManaAbility.java rename to Mage/src/main/java/mage/abilities/mana/WhiteManaAbility.java diff --git a/Mage/src/mage/abilities/mana/builder/Builder.java b/Mage/src/main/java/mage/abilities/mana/builder/Builder.java similarity index 100% rename from Mage/src/mage/abilities/mana/builder/Builder.java rename to Mage/src/main/java/mage/abilities/mana/builder/Builder.java diff --git a/Mage/src/mage/abilities/mana/builder/ConditionalManaBuilder.java b/Mage/src/main/java/mage/abilities/mana/builder/ConditionalManaBuilder.java similarity index 100% rename from Mage/src/mage/abilities/mana/builder/ConditionalManaBuilder.java rename to Mage/src/main/java/mage/abilities/mana/builder/ConditionalManaBuilder.java diff --git a/Mage/src/mage/abilities/mana/conditional/ArtifactCastConditionalMana.java b/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastConditionalMana.java similarity index 100% rename from Mage/src/mage/abilities/mana/conditional/ArtifactCastConditionalMana.java rename to Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastConditionalMana.java diff --git a/Mage/src/mage/abilities/mana/conditional/ArtifactCastManaCondition.java b/Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java similarity index 100% rename from Mage/src/mage/abilities/mana/conditional/ArtifactCastManaCondition.java rename to Mage/src/main/java/mage/abilities/mana/conditional/ArtifactCastManaCondition.java diff --git a/Mage/src/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java b/Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java similarity index 100% rename from Mage/src/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java rename to Mage/src/main/java/mage/abilities/mana/conditional/ConditionalSpellManaBuilder.java diff --git a/Mage/src/mage/abilities/mana/conditional/CreatureCastConditionalMana.java b/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastConditionalMana.java similarity index 100% rename from Mage/src/mage/abilities/mana/conditional/CreatureCastConditionalMana.java rename to Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastConditionalMana.java diff --git a/Mage/src/mage/abilities/mana/conditional/CreatureCastManaCondition.java b/Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java similarity index 100% rename from Mage/src/mage/abilities/mana/conditional/CreatureCastManaCondition.java rename to Mage/src/main/java/mage/abilities/mana/conditional/CreatureCastManaCondition.java diff --git a/Mage/src/mage/abilities/mana/conditional/ManaCondition.java b/Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java similarity index 100% rename from Mage/src/mage/abilities/mana/conditional/ManaCondition.java rename to Mage/src/main/java/mage/abilities/mana/conditional/ManaCondition.java diff --git a/Mage/src/mage/actions/MageDrawAction.java b/Mage/src/main/java/mage/actions/MageDrawAction.java similarity index 100% rename from Mage/src/mage/actions/MageDrawAction.java rename to Mage/src/main/java/mage/actions/MageDrawAction.java diff --git a/Mage/src/mage/actions/MageLoseGameAction.java b/Mage/src/main/java/mage/actions/MageLoseGameAction.java similarity index 100% rename from Mage/src/mage/actions/MageLoseGameAction.java rename to Mage/src/main/java/mage/actions/MageLoseGameAction.java diff --git a/Mage/src/mage/actions/impl/MageAction.java b/Mage/src/main/java/mage/actions/impl/MageAction.java similarity index 100% rename from Mage/src/mage/actions/impl/MageAction.java rename to Mage/src/main/java/mage/actions/impl/MageAction.java diff --git a/Mage/src/mage/actions/score/ArtificialScoringSystem.java b/Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java similarity index 100% rename from Mage/src/mage/actions/score/ArtificialScoringSystem.java rename to Mage/src/main/java/mage/actions/score/ArtificialScoringSystem.java diff --git a/Mage/src/mage/actions/score/ScoringConstants.java b/Mage/src/main/java/mage/actions/score/ScoringConstants.java similarity index 100% rename from Mage/src/mage/actions/score/ScoringConstants.java rename to Mage/src/main/java/mage/actions/score/ScoringConstants.java diff --git a/Mage/src/mage/actions/score/ScoringSystem.java b/Mage/src/main/java/mage/actions/score/ScoringSystem.java similarity index 100% rename from Mage/src/mage/actions/score/ScoringSystem.java rename to Mage/src/main/java/mage/actions/score/ScoringSystem.java diff --git a/Mage/src/mage/cards/Card.java b/Mage/src/main/java/mage/cards/Card.java similarity index 100% rename from Mage/src/mage/cards/Card.java rename to Mage/src/main/java/mage/cards/Card.java diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java similarity index 100% rename from Mage/src/mage/cards/CardImpl.java rename to Mage/src/main/java/mage/cards/CardImpl.java diff --git a/Mage/src/mage/cards/Cards.java b/Mage/src/main/java/mage/cards/Cards.java similarity index 100% rename from Mage/src/mage/cards/Cards.java rename to Mage/src/main/java/mage/cards/Cards.java diff --git a/Mage/src/mage/cards/CardsImpl.java b/Mage/src/main/java/mage/cards/CardsImpl.java similarity index 100% rename from Mage/src/mage/cards/CardsImpl.java rename to Mage/src/main/java/mage/cards/CardsImpl.java diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java similarity index 100% rename from Mage/src/mage/cards/ExpansionSet.java rename to Mage/src/main/java/mage/cards/ExpansionSet.java diff --git a/Mage/src/mage/cards/LevelerCard.java b/Mage/src/main/java/mage/cards/LevelerCard.java similarity index 100% rename from Mage/src/mage/cards/LevelerCard.java rename to Mage/src/main/java/mage/cards/LevelerCard.java diff --git a/Mage/src/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java similarity index 100% rename from Mage/src/mage/cards/Sets.java rename to Mage/src/main/java/mage/cards/Sets.java diff --git a/Mage/src/mage/cards/SplitCard.java b/Mage/src/main/java/mage/cards/SplitCard.java similarity index 100% rename from Mage/src/mage/cards/SplitCard.java rename to Mage/src/main/java/mage/cards/SplitCard.java diff --git a/Mage/src/mage/cards/SplitCardHalf.java b/Mage/src/main/java/mage/cards/SplitCardHalf.java similarity index 100% rename from Mage/src/mage/cards/SplitCardHalf.java rename to Mage/src/main/java/mage/cards/SplitCardHalf.java diff --git a/Mage/src/mage/cards/SplitCardHalfImpl.java b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java similarity index 100% rename from Mage/src/mage/cards/SplitCardHalfImpl.java rename to Mage/src/main/java/mage/cards/SplitCardHalfImpl.java diff --git a/Mage/src/mage/cards/basiclands/BasicLand.java b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java similarity index 100% rename from Mage/src/mage/cards/basiclands/BasicLand.java rename to Mage/src/main/java/mage/cards/basiclands/BasicLand.java diff --git a/Mage/src/mage/cards/basiclands/Forest.java b/Mage/src/main/java/mage/cards/basiclands/Forest.java similarity index 100% rename from Mage/src/mage/cards/basiclands/Forest.java rename to Mage/src/main/java/mage/cards/basiclands/Forest.java diff --git a/Mage/src/mage/cards/basiclands/Island.java b/Mage/src/main/java/mage/cards/basiclands/Island.java similarity index 100% rename from Mage/src/mage/cards/basiclands/Island.java rename to Mage/src/main/java/mage/cards/basiclands/Island.java diff --git a/Mage/src/mage/cards/basiclands/Mountain.java b/Mage/src/main/java/mage/cards/basiclands/Mountain.java similarity index 100% rename from Mage/src/mage/cards/basiclands/Mountain.java rename to Mage/src/main/java/mage/cards/basiclands/Mountain.java diff --git a/Mage/src/mage/cards/basiclands/Plains.java b/Mage/src/main/java/mage/cards/basiclands/Plains.java similarity index 100% rename from Mage/src/mage/cards/basiclands/Plains.java rename to Mage/src/main/java/mage/cards/basiclands/Plains.java diff --git a/Mage/src/mage/cards/basiclands/Swamp.java b/Mage/src/main/java/mage/cards/basiclands/Swamp.java similarity index 100% rename from Mage/src/mage/cards/basiclands/Swamp.java rename to Mage/src/main/java/mage/cards/basiclands/Swamp.java diff --git a/Mage/src/mage/cards/decks/Constructed.java b/Mage/src/main/java/mage/cards/decks/Constructed.java similarity index 100% rename from Mage/src/mage/cards/decks/Constructed.java rename to Mage/src/main/java/mage/cards/decks/Constructed.java diff --git a/Mage/src/mage/cards/decks/Deck.java b/Mage/src/main/java/mage/cards/decks/Deck.java similarity index 100% rename from Mage/src/mage/cards/decks/Deck.java rename to Mage/src/main/java/mage/cards/decks/Deck.java diff --git a/Mage/src/mage/cards/decks/DeckCardInfo.java b/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java similarity index 100% rename from Mage/src/mage/cards/decks/DeckCardInfo.java rename to Mage/src/main/java/mage/cards/decks/DeckCardInfo.java diff --git a/Mage/src/mage/cards/decks/DeckCardLists.java b/Mage/src/main/java/mage/cards/decks/DeckCardLists.java similarity index 100% rename from Mage/src/mage/cards/decks/DeckCardLists.java rename to Mage/src/main/java/mage/cards/decks/DeckCardLists.java diff --git a/Mage/src/mage/cards/decks/DeckValidator.java b/Mage/src/main/java/mage/cards/decks/DeckValidator.java similarity index 100% rename from Mage/src/mage/cards/decks/DeckValidator.java rename to Mage/src/main/java/mage/cards/decks/DeckValidator.java diff --git a/Mage/src/mage/cards/decks/InvalidDeckException.java b/Mage/src/main/java/mage/cards/decks/InvalidDeckException.java similarity index 100% rename from Mage/src/mage/cards/decks/InvalidDeckException.java rename to Mage/src/main/java/mage/cards/decks/InvalidDeckException.java diff --git a/Mage/src/mage/cards/decks/importer/DckDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java similarity index 100% rename from Mage/src/mage/cards/decks/importer/DckDeckImporter.java rename to Mage/src/main/java/mage/cards/decks/importer/DckDeckImporter.java diff --git a/Mage/src/mage/cards/decks/importer/DecDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java similarity index 100% rename from Mage/src/mage/cards/decks/importer/DecDeckImporter.java rename to Mage/src/main/java/mage/cards/decks/importer/DecDeckImporter.java diff --git a/Mage/src/mage/cards/decks/importer/DeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java similarity index 100% rename from Mage/src/mage/cards/decks/importer/DeckImporter.java rename to Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java diff --git a/Mage/src/mage/cards/decks/importer/DeckImporterUtil.java b/Mage/src/main/java/mage/cards/decks/importer/DeckImporterUtil.java similarity index 100% rename from Mage/src/mage/cards/decks/importer/DeckImporterUtil.java rename to Mage/src/main/java/mage/cards/decks/importer/DeckImporterUtil.java diff --git a/Mage/src/mage/cards/decks/importer/MWSDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java similarity index 100% rename from Mage/src/mage/cards/decks/importer/MWSDeckImporter.java rename to Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java diff --git a/Mage/src/mage/cards/decks/importer/TxtDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java similarity index 100% rename from Mage/src/mage/cards/decks/importer/TxtDeckImporter.java rename to Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java diff --git a/Mage/src/mage/cards/mock/MockAbility.java b/Mage/src/main/java/mage/cards/mock/MockAbility.java similarity index 100% rename from Mage/src/mage/cards/mock/MockAbility.java rename to Mage/src/main/java/mage/cards/mock/MockAbility.java diff --git a/Mage/src/mage/cards/mock/MockCard.java b/Mage/src/main/java/mage/cards/mock/MockCard.java similarity index 100% rename from Mage/src/mage/cards/mock/MockCard.java rename to Mage/src/main/java/mage/cards/mock/MockCard.java diff --git a/Mage/src/mage/cards/mock/MockSplitCard.java b/Mage/src/main/java/mage/cards/mock/MockSplitCard.java similarity index 100% rename from Mage/src/mage/cards/mock/MockSplitCard.java rename to Mage/src/main/java/mage/cards/mock/MockSplitCard.java diff --git a/Mage/src/mage/cards/mock/MockSplitCardHalf.java b/Mage/src/main/java/mage/cards/mock/MockSplitCardHalf.java similarity index 100% rename from Mage/src/mage/cards/mock/MockSplitCardHalf.java rename to Mage/src/main/java/mage/cards/mock/MockSplitCardHalf.java diff --git a/Mage/src/mage/cards/repository/CardCriteria.java b/Mage/src/main/java/mage/cards/repository/CardCriteria.java similarity index 100% rename from Mage/src/mage/cards/repository/CardCriteria.java rename to Mage/src/main/java/mage/cards/repository/CardCriteria.java diff --git a/Mage/src/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java similarity index 100% rename from Mage/src/mage/cards/repository/CardInfo.java rename to Mage/src/main/java/mage/cards/repository/CardInfo.java diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java similarity index 100% rename from Mage/src/mage/cards/repository/CardRepository.java rename to Mage/src/main/java/mage/cards/repository/CardRepository.java diff --git a/Mage/src/mage/cards/repository/CardScanner.java b/Mage/src/main/java/mage/cards/repository/CardScanner.java similarity index 100% rename from Mage/src/mage/cards/repository/CardScanner.java rename to Mage/src/main/java/mage/cards/repository/CardScanner.java diff --git a/Mage/src/mage/cards/repository/DatabaseVersion.java b/Mage/src/main/java/mage/cards/repository/DatabaseVersion.java similarity index 100% rename from Mage/src/mage/cards/repository/DatabaseVersion.java rename to Mage/src/main/java/mage/cards/repository/DatabaseVersion.java diff --git a/Mage/src/mage/cards/repository/ExpansionInfo.java b/Mage/src/main/java/mage/cards/repository/ExpansionInfo.java similarity index 100% rename from Mage/src/mage/cards/repository/ExpansionInfo.java rename to Mage/src/main/java/mage/cards/repository/ExpansionInfo.java diff --git a/Mage/src/mage/cards/repository/ExpansionRepository.java b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java similarity index 100% rename from Mage/src/mage/cards/repository/ExpansionRepository.java rename to Mage/src/main/java/mage/cards/repository/ExpansionRepository.java diff --git a/Mage/src/mage/cards/repository/RepositoryUtil.java b/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java similarity index 100% rename from Mage/src/mage/cards/repository/RepositoryUtil.java rename to Mage/src/main/java/mage/cards/repository/RepositoryUtil.java diff --git a/Mage/src/mage/choices/Choice.java b/Mage/src/main/java/mage/choices/Choice.java similarity index 100% rename from Mage/src/mage/choices/Choice.java rename to Mage/src/main/java/mage/choices/Choice.java diff --git a/Mage/src/mage/choices/ChoiceBasicLandType.java b/Mage/src/main/java/mage/choices/ChoiceBasicLandType.java similarity index 100% rename from Mage/src/mage/choices/ChoiceBasicLandType.java rename to Mage/src/main/java/mage/choices/ChoiceBasicLandType.java diff --git a/Mage/src/mage/choices/ChoiceColor.java b/Mage/src/main/java/mage/choices/ChoiceColor.java similarity index 100% rename from Mage/src/mage/choices/ChoiceColor.java rename to Mage/src/main/java/mage/choices/ChoiceColor.java diff --git a/Mage/src/mage/choices/ChoiceColorOrArtifact.java b/Mage/src/main/java/mage/choices/ChoiceColorOrArtifact.java similarity index 100% rename from Mage/src/mage/choices/ChoiceColorOrArtifact.java rename to Mage/src/main/java/mage/choices/ChoiceColorOrArtifact.java diff --git a/Mage/src/mage/choices/ChoiceImpl.java b/Mage/src/main/java/mage/choices/ChoiceImpl.java similarity index 100% rename from Mage/src/mage/choices/ChoiceImpl.java rename to Mage/src/main/java/mage/choices/ChoiceImpl.java diff --git a/Mage/src/mage/choices/ChoiceLeftOrRight.java b/Mage/src/main/java/mage/choices/ChoiceLeftOrRight.java similarity index 100% rename from Mage/src/mage/choices/ChoiceLeftOrRight.java rename to Mage/src/main/java/mage/choices/ChoiceLeftOrRight.java diff --git a/Mage/src/mage/choices/Choices.java b/Mage/src/main/java/mage/choices/Choices.java similarity index 100% rename from Mage/src/mage/choices/Choices.java rename to Mage/src/main/java/mage/choices/Choices.java diff --git a/Mage/src/mage/constants/AbilityType.java b/Mage/src/main/java/mage/constants/AbilityType.java similarity index 100% rename from Mage/src/mage/constants/AbilityType.java rename to Mage/src/main/java/mage/constants/AbilityType.java diff --git a/Mage/src/mage/constants/AbilityWord.java b/Mage/src/main/java/mage/constants/AbilityWord.java similarity index 100% rename from Mage/src/mage/constants/AbilityWord.java rename to Mage/src/main/java/mage/constants/AbilityWord.java diff --git a/Mage/src/mage/constants/AsThoughEffectType.java b/Mage/src/main/java/mage/constants/AsThoughEffectType.java similarity index 100% rename from Mage/src/mage/constants/AsThoughEffectType.java rename to Mage/src/main/java/mage/constants/AsThoughEffectType.java diff --git a/Mage/src/mage/constants/AttachmentType.java b/Mage/src/main/java/mage/constants/AttachmentType.java similarity index 100% rename from Mage/src/mage/constants/AttachmentType.java rename to Mage/src/main/java/mage/constants/AttachmentType.java diff --git a/Mage/src/mage/constants/CardType.java b/Mage/src/main/java/mage/constants/CardType.java similarity index 100% rename from Mage/src/mage/constants/CardType.java rename to Mage/src/main/java/mage/constants/CardType.java diff --git a/Mage/src/mage/constants/ColoredManaSymbol.java b/Mage/src/main/java/mage/constants/ColoredManaSymbol.java similarity index 100% rename from Mage/src/mage/constants/ColoredManaSymbol.java rename to Mage/src/main/java/mage/constants/ColoredManaSymbol.java diff --git a/Mage/src/mage/constants/CostModificationType.java b/Mage/src/main/java/mage/constants/CostModificationType.java similarity index 100% rename from Mage/src/mage/constants/CostModificationType.java rename to Mage/src/main/java/mage/constants/CostModificationType.java diff --git a/Mage/src/mage/constants/DependencyType.java b/Mage/src/main/java/mage/constants/DependencyType.java similarity index 100% rename from Mage/src/mage/constants/DependencyType.java rename to Mage/src/main/java/mage/constants/DependencyType.java diff --git a/Mage/src/mage/constants/Duration.java b/Mage/src/main/java/mage/constants/Duration.java similarity index 100% rename from Mage/src/mage/constants/Duration.java rename to Mage/src/main/java/mage/constants/Duration.java diff --git a/Mage/src/mage/constants/EffectType.java b/Mage/src/main/java/mage/constants/EffectType.java similarity index 100% rename from Mage/src/mage/constants/EffectType.java rename to Mage/src/main/java/mage/constants/EffectType.java diff --git a/Mage/src/mage/constants/EnlargeMode.java b/Mage/src/main/java/mage/constants/EnlargeMode.java similarity index 100% rename from Mage/src/mage/constants/EnlargeMode.java rename to Mage/src/main/java/mage/constants/EnlargeMode.java diff --git a/Mage/src/mage/constants/Layer.java b/Mage/src/main/java/mage/constants/Layer.java similarity index 100% rename from Mage/src/mage/constants/Layer.java rename to Mage/src/main/java/mage/constants/Layer.java diff --git a/Mage/src/mage/constants/MageObjectType.java b/Mage/src/main/java/mage/constants/MageObjectType.java similarity index 100% rename from Mage/src/mage/constants/MageObjectType.java rename to Mage/src/main/java/mage/constants/MageObjectType.java diff --git a/Mage/src/mage/constants/ManaType.java b/Mage/src/main/java/mage/constants/ManaType.java similarity index 100% rename from Mage/src/mage/constants/ManaType.java rename to Mage/src/main/java/mage/constants/ManaType.java diff --git a/Mage/src/mage/constants/MatchTimeLimit.java b/Mage/src/main/java/mage/constants/MatchTimeLimit.java similarity index 100% rename from Mage/src/mage/constants/MatchTimeLimit.java rename to Mage/src/main/java/mage/constants/MatchTimeLimit.java diff --git a/Mage/src/mage/constants/MultiplayerAttackOption.java b/Mage/src/main/java/mage/constants/MultiplayerAttackOption.java similarity index 100% rename from Mage/src/mage/constants/MultiplayerAttackOption.java rename to Mage/src/main/java/mage/constants/MultiplayerAttackOption.java diff --git a/Mage/src/mage/constants/Outcome.java b/Mage/src/main/java/mage/constants/Outcome.java similarity index 100% rename from Mage/src/mage/constants/Outcome.java rename to Mage/src/main/java/mage/constants/Outcome.java diff --git a/Mage/src/mage/constants/PhaseStep.java b/Mage/src/main/java/mage/constants/PhaseStep.java similarity index 100% rename from Mage/src/mage/constants/PhaseStep.java rename to Mage/src/main/java/mage/constants/PhaseStep.java diff --git a/Mage/src/mage/constants/PlayerAction.java b/Mage/src/main/java/mage/constants/PlayerAction.java similarity index 100% rename from Mage/src/mage/constants/PlayerAction.java rename to Mage/src/main/java/mage/constants/PlayerAction.java diff --git a/Mage/src/mage/constants/RangeOfInfluence.java b/Mage/src/main/java/mage/constants/RangeOfInfluence.java similarity index 100% rename from Mage/src/mage/constants/RangeOfInfluence.java rename to Mage/src/main/java/mage/constants/RangeOfInfluence.java diff --git a/Mage/src/mage/constants/Rarity.java b/Mage/src/main/java/mage/constants/Rarity.java similarity index 100% rename from Mage/src/mage/constants/Rarity.java rename to Mage/src/main/java/mage/constants/Rarity.java diff --git a/Mage/src/mage/constants/SetTargetPointer.java b/Mage/src/main/java/mage/constants/SetTargetPointer.java similarity index 100% rename from Mage/src/mage/constants/SetTargetPointer.java rename to Mage/src/main/java/mage/constants/SetTargetPointer.java diff --git a/Mage/src/mage/constants/SetType.java b/Mage/src/main/java/mage/constants/SetType.java similarity index 100% rename from Mage/src/mage/constants/SetType.java rename to Mage/src/main/java/mage/constants/SetType.java diff --git a/Mage/src/mage/constants/SkillLevel.java b/Mage/src/main/java/mage/constants/SkillLevel.java similarity index 100% rename from Mage/src/mage/constants/SkillLevel.java rename to Mage/src/main/java/mage/constants/SkillLevel.java diff --git a/Mage/src/mage/constants/SpellAbilityType.java b/Mage/src/main/java/mage/constants/SpellAbilityType.java similarity index 100% rename from Mage/src/mage/constants/SpellAbilityType.java rename to Mage/src/main/java/mage/constants/SpellAbilityType.java diff --git a/Mage/src/mage/constants/SubLayer.java b/Mage/src/main/java/mage/constants/SubLayer.java similarity index 100% rename from Mage/src/mage/constants/SubLayer.java rename to Mage/src/main/java/mage/constants/SubLayer.java diff --git a/Mage/src/mage/constants/TableState.java b/Mage/src/main/java/mage/constants/TableState.java similarity index 100% rename from Mage/src/mage/constants/TableState.java rename to Mage/src/main/java/mage/constants/TableState.java diff --git a/Mage/src/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java similarity index 100% rename from Mage/src/mage/constants/TargetController.java rename to Mage/src/main/java/mage/constants/TargetController.java diff --git a/Mage/src/mage/constants/TimingRule.java b/Mage/src/main/java/mage/constants/TimingRule.java similarity index 100% rename from Mage/src/mage/constants/TimingRule.java rename to Mage/src/main/java/mage/constants/TimingRule.java diff --git a/Mage/src/mage/constants/TournamentPlayerState.java b/Mage/src/main/java/mage/constants/TournamentPlayerState.java similarity index 100% rename from Mage/src/mage/constants/TournamentPlayerState.java rename to Mage/src/main/java/mage/constants/TournamentPlayerState.java diff --git a/Mage/src/mage/constants/TurnPhase.java b/Mage/src/main/java/mage/constants/TurnPhase.java similarity index 100% rename from Mage/src/mage/constants/TurnPhase.java rename to Mage/src/main/java/mage/constants/TurnPhase.java diff --git a/Mage/src/mage/constants/WatcherScope.java b/Mage/src/main/java/mage/constants/WatcherScope.java similarity index 100% rename from Mage/src/mage/constants/WatcherScope.java rename to Mage/src/main/java/mage/constants/WatcherScope.java diff --git a/Mage/src/mage/constants/Zone.java b/Mage/src/main/java/mage/constants/Zone.java similarity index 100% rename from Mage/src/mage/constants/Zone.java rename to Mage/src/main/java/mage/constants/Zone.java diff --git a/Mage/src/mage/counters/BoostCounter.java b/Mage/src/main/java/mage/counters/BoostCounter.java similarity index 100% rename from Mage/src/mage/counters/BoostCounter.java rename to Mage/src/main/java/mage/counters/BoostCounter.java diff --git a/Mage/src/mage/counters/Counter.java b/Mage/src/main/java/mage/counters/Counter.java similarity index 100% rename from Mage/src/mage/counters/Counter.java rename to Mage/src/main/java/mage/counters/Counter.java diff --git a/Mage/src/mage/counters/CounterType.java b/Mage/src/main/java/mage/counters/CounterType.java similarity index 100% rename from Mage/src/mage/counters/CounterType.java rename to Mage/src/main/java/mage/counters/CounterType.java diff --git a/Mage/src/mage/counters/Counters.java b/Mage/src/main/java/mage/counters/Counters.java similarity index 100% rename from Mage/src/mage/counters/Counters.java rename to Mage/src/main/java/mage/counters/Counters.java diff --git a/Mage/src/mage/filter/Filter.java b/Mage/src/main/java/mage/filter/Filter.java similarity index 100% rename from Mage/src/mage/filter/Filter.java rename to Mage/src/main/java/mage/filter/Filter.java diff --git a/Mage/src/mage/filter/FilterAbility.java b/Mage/src/main/java/mage/filter/FilterAbility.java similarity index 100% rename from Mage/src/mage/filter/FilterAbility.java rename to Mage/src/main/java/mage/filter/FilterAbility.java diff --git a/Mage/src/mage/filter/FilterCard.java b/Mage/src/main/java/mage/filter/FilterCard.java similarity index 100% rename from Mage/src/mage/filter/FilterCard.java rename to Mage/src/main/java/mage/filter/FilterCard.java diff --git a/Mage/src/mage/filter/FilterImpl.java b/Mage/src/main/java/mage/filter/FilterImpl.java similarity index 100% rename from Mage/src/mage/filter/FilterImpl.java rename to Mage/src/main/java/mage/filter/FilterImpl.java diff --git a/Mage/src/mage/filter/FilterInPlay.java b/Mage/src/main/java/mage/filter/FilterInPlay.java similarity index 100% rename from Mage/src/mage/filter/FilterInPlay.java rename to Mage/src/main/java/mage/filter/FilterInPlay.java diff --git a/Mage/src/mage/filter/FilterMana.java b/Mage/src/main/java/mage/filter/FilterMana.java similarity index 100% rename from Mage/src/mage/filter/FilterMana.java rename to Mage/src/main/java/mage/filter/FilterMana.java diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/main/java/mage/filter/FilterObject.java similarity index 100% rename from Mage/src/mage/filter/FilterObject.java rename to Mage/src/main/java/mage/filter/FilterObject.java diff --git a/Mage/src/mage/filter/FilterPermanent.java b/Mage/src/main/java/mage/filter/FilterPermanent.java similarity index 100% rename from Mage/src/mage/filter/FilterPermanent.java rename to Mage/src/main/java/mage/filter/FilterPermanent.java diff --git a/Mage/src/mage/filter/FilterPlayer.java b/Mage/src/main/java/mage/filter/FilterPlayer.java similarity index 100% rename from Mage/src/mage/filter/FilterPlayer.java rename to Mage/src/main/java/mage/filter/FilterPlayer.java diff --git a/Mage/src/mage/filter/FilterSpell.java b/Mage/src/main/java/mage/filter/FilterSpell.java similarity index 100% rename from Mage/src/mage/filter/FilterSpell.java rename to Mage/src/main/java/mage/filter/FilterSpell.java diff --git a/Mage/src/mage/filter/FilterStackObject.java b/Mage/src/main/java/mage/filter/FilterStackObject.java similarity index 100% rename from Mage/src/mage/filter/FilterStackObject.java rename to Mage/src/main/java/mage/filter/FilterStackObject.java diff --git a/Mage/src/mage/filter/common/FilterArtifactCard.java b/Mage/src/main/java/mage/filter/common/FilterArtifactCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterArtifactCard.java rename to Mage/src/main/java/mage/filter/common/FilterArtifactCard.java diff --git a/Mage/src/mage/filter/common/FilterArtifactOrEnchantmentPermanent.java b/Mage/src/main/java/mage/filter/common/FilterArtifactOrEnchantmentPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterArtifactOrEnchantmentPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterArtifactOrEnchantmentPermanent.java diff --git a/Mage/src/mage/filter/common/FilterArtifactPermanent.java b/Mage/src/main/java/mage/filter/common/FilterArtifactPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterArtifactPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterArtifactPermanent.java diff --git a/Mage/src/mage/filter/common/FilterArtifactSpell.java b/Mage/src/main/java/mage/filter/common/FilterArtifactSpell.java similarity index 100% rename from Mage/src/mage/filter/common/FilterArtifactSpell.java rename to Mage/src/main/java/mage/filter/common/FilterArtifactSpell.java diff --git a/Mage/src/mage/filter/common/FilterAttackingCreature.java b/Mage/src/main/java/mage/filter/common/FilterAttackingCreature.java similarity index 100% rename from Mage/src/mage/filter/common/FilterAttackingCreature.java rename to Mage/src/main/java/mage/filter/common/FilterAttackingCreature.java diff --git a/Mage/src/mage/filter/common/FilterAttackingOrBlockingCreature.java b/Mage/src/main/java/mage/filter/common/FilterAttackingOrBlockingCreature.java similarity index 100% rename from Mage/src/mage/filter/common/FilterAttackingOrBlockingCreature.java rename to Mage/src/main/java/mage/filter/common/FilterAttackingOrBlockingCreature.java diff --git a/Mage/src/mage/filter/common/FilterBasicLandCard.java b/Mage/src/main/java/mage/filter/common/FilterBasicLandCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterBasicLandCard.java rename to Mage/src/main/java/mage/filter/common/FilterBasicLandCard.java diff --git a/Mage/src/mage/filter/common/FilterBlockingCreature.java b/Mage/src/main/java/mage/filter/common/FilterBlockingCreature.java similarity index 100% rename from Mage/src/mage/filter/common/FilterBlockingCreature.java rename to Mage/src/main/java/mage/filter/common/FilterBlockingCreature.java diff --git a/Mage/src/mage/filter/common/FilterBySubtypeCard.java b/Mage/src/main/java/mage/filter/common/FilterBySubtypeCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterBySubtypeCard.java rename to Mage/src/main/java/mage/filter/common/FilterBySubtypeCard.java diff --git a/Mage/src/mage/filter/common/FilterControlledArtifactPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledArtifactPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterControlledArtifactPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterControlledArtifactPermanent.java diff --git a/Mage/src/mage/filter/common/FilterControlledCreatureInPlay.java b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java similarity index 100% rename from Mage/src/mage/filter/common/FilterControlledCreatureInPlay.java rename to Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java diff --git a/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java rename to Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java diff --git a/Mage/src/mage/filter/common/FilterControlledEnchantmentPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledEnchantmentPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterControlledEnchantmentPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterControlledEnchantmentPermanent.java diff --git a/Mage/src/mage/filter/common/FilterControlledLandPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledLandPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterControlledLandPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterControlledLandPermanent.java diff --git a/Mage/src/mage/filter/common/FilterControlledPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterControlledPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java diff --git a/Mage/src/mage/filter/common/FilterControlledPlaneswalkerPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledPlaneswalkerPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterControlledPlaneswalkerPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterControlledPlaneswalkerPermanent.java diff --git a/Mage/src/mage/filter/common/FilterCreatureCard.java b/Mage/src/main/java/mage/filter/common/FilterCreatureCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureCard.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureCard.java diff --git a/Mage/src/mage/filter/common/FilterCreatureForAttack.java b/Mage/src/main/java/mage/filter/common/FilterCreatureForAttack.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureForAttack.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureForAttack.java diff --git a/Mage/src/mage/filter/common/FilterCreatureForCombat.java b/Mage/src/main/java/mage/filter/common/FilterCreatureForCombat.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureForCombat.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureForCombat.java diff --git a/Mage/src/mage/filter/common/FilterCreatureForCombatBase.java b/Mage/src/main/java/mage/filter/common/FilterCreatureForCombatBase.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureForCombatBase.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureForCombatBase.java diff --git a/Mage/src/mage/filter/common/FilterCreatureForCombatBlock.java b/Mage/src/main/java/mage/filter/common/FilterCreatureForCombatBlock.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureForCombatBlock.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureForCombatBlock.java diff --git a/Mage/src/mage/filter/common/FilterCreatureOrPlaneswalkerPermanent.java b/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlaneswalkerPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureOrPlaneswalkerPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureOrPlaneswalkerPermanent.java diff --git a/Mage/src/mage/filter/common/FilterCreatureOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureOrPlayer.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureOrPlayer.java diff --git a/Mage/src/mage/filter/common/FilterCreaturePermanent.java b/Mage/src/main/java/mage/filter/common/FilterCreaturePermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreaturePermanent.java rename to Mage/src/main/java/mage/filter/common/FilterCreaturePermanent.java diff --git a/Mage/src/mage/filter/common/FilterCreatureSpell.java b/Mage/src/main/java/mage/filter/common/FilterCreatureSpell.java similarity index 100% rename from Mage/src/mage/filter/common/FilterCreatureSpell.java rename to Mage/src/main/java/mage/filter/common/FilterCreatureSpell.java diff --git a/Mage/src/mage/filter/common/FilterEnchantmentCard.java b/Mage/src/main/java/mage/filter/common/FilterEnchantmentCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterEnchantmentCard.java rename to Mage/src/main/java/mage/filter/common/FilterEnchantmentCard.java diff --git a/Mage/src/mage/filter/common/FilterEnchantmentPermanent.java b/Mage/src/main/java/mage/filter/common/FilterEnchantmentPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterEnchantmentPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterEnchantmentPermanent.java diff --git a/Mage/src/mage/filter/common/FilterInstantOrSorceryCard.java b/Mage/src/main/java/mage/filter/common/FilterInstantOrSorceryCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterInstantOrSorceryCard.java rename to Mage/src/main/java/mage/filter/common/FilterInstantOrSorceryCard.java diff --git a/Mage/src/mage/filter/common/FilterInstantOrSorcerySpell.java b/Mage/src/main/java/mage/filter/common/FilterInstantOrSorcerySpell.java similarity index 100% rename from Mage/src/mage/filter/common/FilterInstantOrSorcerySpell.java rename to Mage/src/main/java/mage/filter/common/FilterInstantOrSorcerySpell.java diff --git a/Mage/src/mage/filter/common/FilterLandCard.java b/Mage/src/main/java/mage/filter/common/FilterLandCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterLandCard.java rename to Mage/src/main/java/mage/filter/common/FilterLandCard.java diff --git a/Mage/src/mage/filter/common/FilterLandPermanent.java b/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterLandPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterLandPermanent.java diff --git a/Mage/src/mage/filter/common/FilterNonlandCard.java b/Mage/src/main/java/mage/filter/common/FilterNonlandCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterNonlandCard.java rename to Mage/src/main/java/mage/filter/common/FilterNonlandCard.java diff --git a/Mage/src/mage/filter/common/FilterNonlandPermanent.java b/Mage/src/main/java/mage/filter/common/FilterNonlandPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterNonlandPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterNonlandPermanent.java diff --git a/Mage/src/mage/filter/common/FilterOwnedCard.java b/Mage/src/main/java/mage/filter/common/FilterOwnedCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterOwnedCard.java rename to Mage/src/main/java/mage/filter/common/FilterOwnedCard.java diff --git a/Mage/src/mage/filter/common/FilterPermanentCard.java b/Mage/src/main/java/mage/filter/common/FilterPermanentCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterPermanentCard.java rename to Mage/src/main/java/mage/filter/common/FilterPermanentCard.java diff --git a/Mage/src/mage/filter/common/FilterPermanentOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java similarity index 100% rename from Mage/src/mage/filter/common/FilterPermanentOrPlayer.java rename to Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayer.java diff --git a/Mage/src/mage/filter/common/FilterPermanentOrPlayerWithCounter.java b/Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayerWithCounter.java similarity index 100% rename from Mage/src/mage/filter/common/FilterPermanentOrPlayerWithCounter.java rename to Mage/src/main/java/mage/filter/common/FilterPermanentOrPlayerWithCounter.java diff --git a/Mage/src/mage/filter/common/FilterPlaneswalkerOrPlayer.java b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java similarity index 100% rename from Mage/src/mage/filter/common/FilterPlaneswalkerOrPlayer.java rename to Mage/src/main/java/mage/filter/common/FilterPlaneswalkerOrPlayer.java diff --git a/Mage/src/mage/filter/common/FilterPlaneswalkerPermanent.java b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterPlaneswalkerPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterPlaneswalkerPermanent.java diff --git a/Mage/src/mage/filter/common/FilterSpellOrPermanent.java b/Mage/src/main/java/mage/filter/common/FilterSpellOrPermanent.java similarity index 100% rename from Mage/src/mage/filter/common/FilterSpellOrPermanent.java rename to Mage/src/main/java/mage/filter/common/FilterSpellOrPermanent.java diff --git a/Mage/src/mage/filter/common/FilterSpiritOrArcaneCard.java b/Mage/src/main/java/mage/filter/common/FilterSpiritOrArcaneCard.java similarity index 100% rename from Mage/src/mage/filter/common/FilterSpiritOrArcaneCard.java rename to Mage/src/main/java/mage/filter/common/FilterSpiritOrArcaneCard.java diff --git a/Mage/src/mage/filter/common/FilterUntappedCreature.java b/Mage/src/main/java/mage/filter/common/FilterUntappedCreature.java similarity index 100% rename from Mage/src/mage/filter/common/FilterUntappedCreature.java rename to Mage/src/main/java/mage/filter/common/FilterUntappedCreature.java diff --git a/Mage/src/mage/filter/predicate/IntComparePredicate.java b/Mage/src/main/java/mage/filter/predicate/IntComparePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/IntComparePredicate.java rename to Mage/src/main/java/mage/filter/predicate/IntComparePredicate.java diff --git a/Mage/src/mage/filter/predicate/ObjectPlayer.java b/Mage/src/main/java/mage/filter/predicate/ObjectPlayer.java similarity index 100% rename from Mage/src/mage/filter/predicate/ObjectPlayer.java rename to Mage/src/main/java/mage/filter/predicate/ObjectPlayer.java diff --git a/Mage/src/mage/filter/predicate/ObjectPlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/ObjectPlayerPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/ObjectPlayerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/ObjectPlayerPredicate.java diff --git a/Mage/src/mage/filter/predicate/ObjectSourcePlayer.java b/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayer.java similarity index 100% rename from Mage/src/mage/filter/predicate/ObjectSourcePlayer.java rename to Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayer.java diff --git a/Mage/src/mage/filter/predicate/ObjectSourcePlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayerPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/ObjectSourcePlayerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/ObjectSourcePlayerPredicate.java diff --git a/Mage/src/mage/filter/predicate/Predicate.java b/Mage/src/main/java/mage/filter/predicate/Predicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/Predicate.java rename to Mage/src/main/java/mage/filter/predicate/Predicate.java diff --git a/Mage/src/mage/filter/predicate/Predicates.java b/Mage/src/main/java/mage/filter/predicate/Predicates.java similarity index 100% rename from Mage/src/mage/filter/predicate/Predicates.java rename to Mage/src/main/java/mage/filter/predicate/Predicates.java diff --git a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/AbilityPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/AbilityPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/AnotherCardPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherCardPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/AnotherCardPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/AnotherCardPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/AnotherTargetPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/AnotherTargetPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/AnotherTargetPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/CardIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/CardIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/CardTypePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/CardTypePredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/ChosenSubtypePredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/ColorPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ColorPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/ColorPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/ColorPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/ColorlessPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ColorlessPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/ColorlessPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/ColorlessPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/FromSetPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/FromSetPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/FromSetPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/MonocoloredPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/MonocoloredPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/MonocoloredPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/MonocoloredPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/MulticoloredPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/MulticoloredPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/MulticoloredPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NamePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/NamePredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/NamePredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/NumberOfTargetsPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/PowerPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/PowerPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/PowerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/PowerPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/SharesColorWithSourcePredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SubtypePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/SubtypePredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/SupertypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/SupertypePredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/ToughnessPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/ToughnessPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/ToughnessPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/ToughnessPredicate.java diff --git a/Mage/src/mage/filter/predicate/mageobject/VariableManaCostPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/mageobject/VariableManaCostPredicate.java rename to Mage/src/main/java/mage/filter/predicate/mageobject/VariableManaCostPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java diff --git a/Mage/src/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java diff --git a/Mage/src/mage/filter/predicate/other/CardCanTargetPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/CardCanTargetPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/other/CardCanTargetPermanentId.java diff --git a/Mage/src/mage/filter/predicate/other/CardTextPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/CardTextPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/CardTextPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/CounterCardPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/CounterCardPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/CounterCardPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/CounterCardPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/ExpansionSetPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/ExpansionSetPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/ExpansionSetPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/ExpansionSetPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/FaceDownPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/FaceDownPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/FaceDownPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/FaceDownPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/OwnerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/OwnerIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/OwnerIdPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/OwnerPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/OwnerPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/OwnerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/OwnerPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/PermanentCanTargetPermanentId.java b/Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/PermanentCanTargetPermanentId.java rename to Mage/src/main/java/mage/filter/predicate/other/PermanentCanTargetPermanentId.java diff --git a/Mage/src/mage/filter/predicate/other/PlayerCanGainLifePredicate.java b/Mage/src/main/java/mage/filter/predicate/other/PlayerCanGainLifePredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/PlayerCanGainLifePredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/PlayerCanGainLifePredicate.java diff --git a/Mage/src/mage/filter/predicate/other/PlayerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/PlayerIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/PlayerIdPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/PlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/PlayerPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/PlayerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/PlayerPredicate.java diff --git a/Mage/src/mage/filter/predicate/other/TargetsPermanentPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/other/TargetsPermanentPredicate.java rename to Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/AnotherPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/AnotherPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/AnotherPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/AttachedToPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/AttachedToPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/AttackingPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttackingPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/AttackingPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/AttackingPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/BlockedByIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/BlockedByIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/BlockedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/BlockedPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/BlockedPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/BlockedPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/BlockingAttackerIdPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/BlockingPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/BlockingPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/BlockingPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/BlockingPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/CardCounterPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/CardCounterPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/CardCounterPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/CardCounterPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/CommanderPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/CommanderPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/ControllerIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/ControllerIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/ControllerIdPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/ControllerPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/ControllerPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/ControllerPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/CounterAnyPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/CounterAnyPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/CounterAnyPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/CounterAnyPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/CounterPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/CounterPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/CounterPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/EnchantedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/EnchantedPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/EnchantedPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/EnchantedPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/PermanentIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/PermanentIdPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/PermanentIdPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/SummoningSicknessPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/SummoningSicknessPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/SummoningSicknessPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/SummoningSicknessPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/TappedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/TappedPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/TappedPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/TappedPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/TokenPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/TokenPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/TokenPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/TokenPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/UnblockedPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/UnblockedPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/UnblockedPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/UnblockedPredicate.java diff --git a/Mage/src/mage/filter/predicate/permanent/WasDealtDamageThisTurnPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/WasDealtDamageThisTurnPredicate.java similarity index 100% rename from Mage/src/mage/filter/predicate/permanent/WasDealtDamageThisTurnPredicate.java rename to Mage/src/main/java/mage/filter/predicate/permanent/WasDealtDamageThisTurnPredicate.java diff --git a/Mage/src/mage/game/CardAttribute.java b/Mage/src/main/java/mage/game/CardAttribute.java similarity index 100% rename from Mage/src/mage/game/CardAttribute.java rename to Mage/src/main/java/mage/game/CardAttribute.java diff --git a/Mage/src/mage/game/CardState.java b/Mage/src/main/java/mage/game/CardState.java similarity index 100% rename from Mage/src/mage/game/CardState.java rename to Mage/src/main/java/mage/game/CardState.java diff --git a/Mage/src/mage/game/Controllable.java b/Mage/src/main/java/mage/game/Controllable.java similarity index 100% rename from Mage/src/mage/game/Controllable.java rename to Mage/src/main/java/mage/game/Controllable.java diff --git a/Mage/src/mage/game/Exile.java b/Mage/src/main/java/mage/game/Exile.java similarity index 100% rename from Mage/src/mage/game/Exile.java rename to Mage/src/main/java/mage/game/Exile.java diff --git a/Mage/src/mage/game/ExileZone.java b/Mage/src/main/java/mage/game/ExileZone.java similarity index 100% rename from Mage/src/mage/game/ExileZone.java rename to Mage/src/main/java/mage/game/ExileZone.java diff --git a/Mage/src/mage/game/Game.java b/Mage/src/main/java/mage/game/Game.java similarity index 100% rename from Mage/src/mage/game/Game.java rename to Mage/src/main/java/mage/game/Game.java diff --git a/Mage/src/mage/game/GameCommanderImpl.java b/Mage/src/main/java/mage/game/GameCommanderImpl.java similarity index 100% rename from Mage/src/mage/game/GameCommanderImpl.java rename to Mage/src/main/java/mage/game/GameCommanderImpl.java diff --git a/Mage/src/mage/game/GameException.java b/Mage/src/main/java/mage/game/GameException.java similarity index 100% rename from Mage/src/mage/game/GameException.java rename to Mage/src/main/java/mage/game/GameException.java diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java similarity index 100% rename from Mage/src/mage/game/GameImpl.java rename to Mage/src/main/java/mage/game/GameImpl.java diff --git a/Mage/src/mage/game/GameInfo.java b/Mage/src/main/java/mage/game/GameInfo.java similarity index 100% rename from Mage/src/mage/game/GameInfo.java rename to Mage/src/main/java/mage/game/GameInfo.java diff --git a/Mage/src/mage/game/GameOptions.java b/Mage/src/main/java/mage/game/GameOptions.java similarity index 100% rename from Mage/src/mage/game/GameOptions.java rename to Mage/src/main/java/mage/game/GameOptions.java diff --git a/Mage/src/mage/game/GameReplay.java b/Mage/src/main/java/mage/game/GameReplay.java similarity index 100% rename from Mage/src/mage/game/GameReplay.java rename to Mage/src/main/java/mage/game/GameReplay.java diff --git a/Mage/src/mage/game/GameState.java b/Mage/src/main/java/mage/game/GameState.java similarity index 100% rename from Mage/src/mage/game/GameState.java rename to Mage/src/main/java/mage/game/GameState.java diff --git a/Mage/src/mage/game/GameStates.java b/Mage/src/main/java/mage/game/GameStates.java similarity index 100% rename from Mage/src/mage/game/GameStates.java rename to Mage/src/main/java/mage/game/GameStates.java diff --git a/Mage/src/mage/game/GameTinyLeadersImpl.java b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java similarity index 100% rename from Mage/src/mage/game/GameTinyLeadersImpl.java rename to Mage/src/main/java/mage/game/GameTinyLeadersImpl.java diff --git a/Mage/src/mage/game/Graveyard.java b/Mage/src/main/java/mage/game/Graveyard.java similarity index 100% rename from Mage/src/mage/game/Graveyard.java rename to Mage/src/main/java/mage/game/Graveyard.java diff --git a/Mage/src/mage/game/LookedAt.java b/Mage/src/main/java/mage/game/LookedAt.java similarity index 100% rename from Mage/src/mage/game/LookedAt.java rename to Mage/src/main/java/mage/game/LookedAt.java diff --git a/Mage/src/mage/game/Revealed.java b/Mage/src/main/java/mage/game/Revealed.java similarity index 100% rename from Mage/src/mage/game/Revealed.java rename to Mage/src/main/java/mage/game/Revealed.java diff --git a/Mage/src/mage/game/Seat.java b/Mage/src/main/java/mage/game/Seat.java similarity index 100% rename from Mage/src/mage/game/Seat.java rename to Mage/src/main/java/mage/game/Seat.java diff --git a/Mage/src/mage/game/Table.java b/Mage/src/main/java/mage/game/Table.java similarity index 100% rename from Mage/src/mage/game/Table.java rename to Mage/src/main/java/mage/game/Table.java diff --git a/Mage/src/mage/game/Team.java b/Mage/src/main/java/mage/game/Team.java similarity index 100% rename from Mage/src/mage/game/Team.java rename to Mage/src/main/java/mage/game/Team.java diff --git a/Mage/src/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java similarity index 100% rename from Mage/src/mage/game/combat/Combat.java rename to Mage/src/main/java/mage/game/combat/Combat.java diff --git a/Mage/src/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java similarity index 100% rename from Mage/src/mage/game/combat/CombatGroup.java rename to Mage/src/main/java/mage/game/combat/CombatGroup.java diff --git a/Mage/src/mage/game/command/Command.java b/Mage/src/main/java/mage/game/command/Command.java similarity index 100% rename from Mage/src/mage/game/command/Command.java rename to Mage/src/main/java/mage/game/command/Command.java diff --git a/Mage/src/mage/game/command/CommandObject.java b/Mage/src/main/java/mage/game/command/CommandObject.java similarity index 100% rename from Mage/src/mage/game/command/CommandObject.java rename to Mage/src/main/java/mage/game/command/CommandObject.java diff --git a/Mage/src/mage/game/command/Commander.java b/Mage/src/main/java/mage/game/command/Commander.java similarity index 100% rename from Mage/src/mage/game/command/Commander.java rename to Mage/src/main/java/mage/game/command/Commander.java diff --git a/Mage/src/mage/game/command/Emblem.java b/Mage/src/main/java/mage/game/command/Emblem.java similarity index 100% rename from Mage/src/mage/game/command/Emblem.java rename to Mage/src/main/java/mage/game/command/Emblem.java diff --git a/Mage/src/mage/game/draft/BoosterDraft.java b/Mage/src/main/java/mage/game/draft/BoosterDraft.java similarity index 100% rename from Mage/src/mage/game/draft/BoosterDraft.java rename to Mage/src/main/java/mage/game/draft/BoosterDraft.java diff --git a/Mage/src/mage/game/draft/Draft.java b/Mage/src/main/java/mage/game/draft/Draft.java similarity index 100% rename from Mage/src/mage/game/draft/Draft.java rename to Mage/src/main/java/mage/game/draft/Draft.java diff --git a/Mage/src/mage/game/draft/DraftCube.java b/Mage/src/main/java/mage/game/draft/DraftCube.java similarity index 100% rename from Mage/src/mage/game/draft/DraftCube.java rename to Mage/src/main/java/mage/game/draft/DraftCube.java diff --git a/Mage/src/mage/game/draft/DraftImpl.java b/Mage/src/main/java/mage/game/draft/DraftImpl.java similarity index 100% rename from Mage/src/mage/game/draft/DraftImpl.java rename to Mage/src/main/java/mage/game/draft/DraftImpl.java diff --git a/Mage/src/mage/game/draft/DraftOptions.java b/Mage/src/main/java/mage/game/draft/DraftOptions.java similarity index 100% rename from Mage/src/mage/game/draft/DraftOptions.java rename to Mage/src/main/java/mage/game/draft/DraftOptions.java diff --git a/Mage/src/mage/game/draft/DraftPlayer.java b/Mage/src/main/java/mage/game/draft/DraftPlayer.java similarity index 100% rename from Mage/src/mage/game/draft/DraftPlayer.java rename to Mage/src/main/java/mage/game/draft/DraftPlayer.java diff --git a/Mage/src/mage/game/draft/RandomBoosterDraft.java b/Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java similarity index 100% rename from Mage/src/mage/game/draft/RandomBoosterDraft.java rename to Mage/src/main/java/mage/game/draft/RandomBoosterDraft.java diff --git a/Mage/src/mage/game/events/DamageCreatureEvent.java b/Mage/src/main/java/mage/game/events/DamageCreatureEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamageCreatureEvent.java rename to Mage/src/main/java/mage/game/events/DamageCreatureEvent.java diff --git a/Mage/src/mage/game/events/DamageEvent.java b/Mage/src/main/java/mage/game/events/DamageEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamageEvent.java rename to Mage/src/main/java/mage/game/events/DamageEvent.java diff --git a/Mage/src/mage/game/events/DamagePlaneswalkerEvent.java b/Mage/src/main/java/mage/game/events/DamagePlaneswalkerEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamagePlaneswalkerEvent.java rename to Mage/src/main/java/mage/game/events/DamagePlaneswalkerEvent.java diff --git a/Mage/src/mage/game/events/DamagePlayerEvent.java b/Mage/src/main/java/mage/game/events/DamagePlayerEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamagePlayerEvent.java rename to Mage/src/main/java/mage/game/events/DamagePlayerEvent.java diff --git a/Mage/src/mage/game/events/DamagedCreatureEvent.java b/Mage/src/main/java/mage/game/events/DamagedCreatureEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamagedCreatureEvent.java rename to Mage/src/main/java/mage/game/events/DamagedCreatureEvent.java diff --git a/Mage/src/mage/game/events/DamagedEvent.java b/Mage/src/main/java/mage/game/events/DamagedEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamagedEvent.java rename to Mage/src/main/java/mage/game/events/DamagedEvent.java diff --git a/Mage/src/mage/game/events/DamagedPlaneswalkerEvent.java b/Mage/src/main/java/mage/game/events/DamagedPlaneswalkerEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamagedPlaneswalkerEvent.java rename to Mage/src/main/java/mage/game/events/DamagedPlaneswalkerEvent.java diff --git a/Mage/src/mage/game/events/DamagedPlayerEvent.java b/Mage/src/main/java/mage/game/events/DamagedPlayerEvent.java similarity index 100% rename from Mage/src/mage/game/events/DamagedPlayerEvent.java rename to Mage/src/main/java/mage/game/events/DamagedPlayerEvent.java diff --git a/Mage/src/mage/game/events/EntersTheBattlefieldEvent.java b/Mage/src/main/java/mage/game/events/EntersTheBattlefieldEvent.java similarity index 100% rename from Mage/src/mage/game/events/EntersTheBattlefieldEvent.java rename to Mage/src/main/java/mage/game/events/EntersTheBattlefieldEvent.java diff --git a/Mage/src/mage/game/events/EventDispatcher.java b/Mage/src/main/java/mage/game/events/EventDispatcher.java similarity index 100% rename from Mage/src/mage/game/events/EventDispatcher.java rename to Mage/src/main/java/mage/game/events/EventDispatcher.java diff --git a/Mage/src/mage/game/events/EventSource.java b/Mage/src/main/java/mage/game/events/EventSource.java similarity index 100% rename from Mage/src/mage/game/events/EventSource.java rename to Mage/src/main/java/mage/game/events/EventSource.java diff --git a/Mage/src/mage/game/events/ExternalEvent.java b/Mage/src/main/java/mage/game/events/ExternalEvent.java similarity index 100% rename from Mage/src/mage/game/events/ExternalEvent.java rename to Mage/src/main/java/mage/game/events/ExternalEvent.java diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/main/java/mage/game/events/GameEvent.java similarity index 100% rename from Mage/src/mage/game/events/GameEvent.java rename to Mage/src/main/java/mage/game/events/GameEvent.java diff --git a/Mage/src/mage/game/events/Listener.java b/Mage/src/main/java/mage/game/events/Listener.java similarity index 100% rename from Mage/src/mage/game/events/Listener.java rename to Mage/src/main/java/mage/game/events/Listener.java diff --git a/Mage/src/mage/game/events/MageEvent.java b/Mage/src/main/java/mage/game/events/MageEvent.java similarity index 100% rename from Mage/src/mage/game/events/MageEvent.java rename to Mage/src/main/java/mage/game/events/MageEvent.java diff --git a/Mage/src/mage/game/events/ManaEvent.java b/Mage/src/main/java/mage/game/events/ManaEvent.java similarity index 100% rename from Mage/src/mage/game/events/ManaEvent.java rename to Mage/src/main/java/mage/game/events/ManaEvent.java diff --git a/Mage/src/mage/game/events/PlayerQueryEvent.java b/Mage/src/main/java/mage/game/events/PlayerQueryEvent.java similarity index 100% rename from Mage/src/mage/game/events/PlayerQueryEvent.java rename to Mage/src/main/java/mage/game/events/PlayerQueryEvent.java diff --git a/Mage/src/mage/game/events/PlayerQueryEventSource.java b/Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java similarity index 100% rename from Mage/src/mage/game/events/PlayerQueryEventSource.java rename to Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java diff --git a/Mage/src/mage/game/events/TableEvent.java b/Mage/src/main/java/mage/game/events/TableEvent.java similarity index 100% rename from Mage/src/mage/game/events/TableEvent.java rename to Mage/src/main/java/mage/game/events/TableEvent.java diff --git a/Mage/src/mage/game/events/TableEventSource.java b/Mage/src/main/java/mage/game/events/TableEventSource.java similarity index 100% rename from Mage/src/mage/game/events/TableEventSource.java rename to Mage/src/main/java/mage/game/events/TableEventSource.java diff --git a/Mage/src/mage/game/events/ZoneChangeEvent.java b/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java similarity index 100% rename from Mage/src/mage/game/events/ZoneChangeEvent.java rename to Mage/src/main/java/mage/game/events/ZoneChangeEvent.java diff --git a/Mage/src/mage/game/events/ZoneChangeGroupEvent.java b/Mage/src/main/java/mage/game/events/ZoneChangeGroupEvent.java similarity index 100% rename from Mage/src/mage/game/events/ZoneChangeGroupEvent.java rename to Mage/src/main/java/mage/game/events/ZoneChangeGroupEvent.java diff --git a/Mage/src/mage/game/match/Match.java b/Mage/src/main/java/mage/game/match/Match.java similarity index 100% rename from Mage/src/mage/game/match/Match.java rename to Mage/src/main/java/mage/game/match/Match.java diff --git a/Mage/src/mage/game/match/MatchImpl.java b/Mage/src/main/java/mage/game/match/MatchImpl.java similarity index 100% rename from Mage/src/mage/game/match/MatchImpl.java rename to Mage/src/main/java/mage/game/match/MatchImpl.java diff --git a/Mage/src/mage/game/match/MatchOptions.java b/Mage/src/main/java/mage/game/match/MatchOptions.java similarity index 100% rename from Mage/src/mage/game/match/MatchOptions.java rename to Mage/src/main/java/mage/game/match/MatchOptions.java diff --git a/Mage/src/mage/game/match/MatchPlayer.java b/Mage/src/main/java/mage/game/match/MatchPlayer.java similarity index 100% rename from Mage/src/mage/game/match/MatchPlayer.java rename to Mage/src/main/java/mage/game/match/MatchPlayer.java diff --git a/Mage/src/mage/game/match/MatchType.java b/Mage/src/main/java/mage/game/match/MatchType.java similarity index 100% rename from Mage/src/mage/game/match/MatchType.java rename to Mage/src/main/java/mage/game/match/MatchType.java diff --git a/Mage/src/mage/game/permanent/Battlefield.java b/Mage/src/main/java/mage/game/permanent/Battlefield.java similarity index 100% rename from Mage/src/mage/game/permanent/Battlefield.java rename to Mage/src/main/java/mage/game/permanent/Battlefield.java diff --git a/Mage/src/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java similarity index 100% rename from Mage/src/mage/game/permanent/Permanent.java rename to Mage/src/main/java/mage/game/permanent/Permanent.java diff --git a/Mage/src/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java similarity index 100% rename from Mage/src/mage/game/permanent/PermanentCard.java rename to Mage/src/main/java/mage/game/permanent/PermanentCard.java diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java similarity index 100% rename from Mage/src/mage/game/permanent/PermanentImpl.java rename to Mage/src/main/java/mage/game/permanent/PermanentImpl.java diff --git a/Mage/src/mage/game/permanent/PermanentToken.java b/Mage/src/main/java/mage/game/permanent/PermanentToken.java similarity index 100% rename from Mage/src/mage/game/permanent/PermanentToken.java rename to Mage/src/main/java/mage/game/permanent/PermanentToken.java diff --git a/Mage/src/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/AngelToken.java rename to Mage/src/main/java/mage/game/permanent/token/AngelToken.java diff --git a/Mage/src/mage/game/permanent/token/BearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/BearToken.java rename to Mage/src/main/java/mage/game/permanent/token/BearToken.java diff --git a/Mage/src/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/BeastToken.java rename to Mage/src/main/java/mage/game/permanent/token/BeastToken.java diff --git a/Mage/src/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java similarity index 100% rename from Mage/src/mage/game/permanent/token/BeastToken2.java rename to Mage/src/main/java/mage/game/permanent/token/BeastToken2.java diff --git a/Mage/src/mage/game/permanent/token/BirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/BirdToken.java rename to Mage/src/main/java/mage/game/permanent/token/BirdToken.java diff --git a/Mage/src/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/CatToken.java rename to Mage/src/main/java/mage/game/permanent/token/CatToken.java diff --git a/Mage/src/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/CentaurToken.java rename to Mage/src/main/java/mage/game/permanent/token/CentaurToken.java diff --git a/Mage/src/mage/game/permanent/token/CitizenToken.java b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/CitizenToken.java rename to Mage/src/main/java/mage/game/permanent/token/CitizenToken.java diff --git a/Mage/src/mage/game/permanent/token/DemonToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/DemonToken.java rename to Mage/src/main/java/mage/game/permanent/token/DemonToken.java diff --git a/Mage/src/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/DragonToken.java rename to Mage/src/main/java/mage/game/permanent/token/DragonToken.java diff --git a/Mage/src/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java similarity index 100% rename from Mage/src/mage/game/permanent/token/DragonToken2.java rename to Mage/src/main/java/mage/game/permanent/token/DragonToken2.java diff --git a/Mage/src/mage/game/permanent/token/DrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/DrakeToken.java rename to Mage/src/main/java/mage/game/permanent/token/DrakeToken.java diff --git a/Mage/src/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/EldraziScionToken.java rename to Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java diff --git a/Mage/src/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/EldraziSpawnToken.java rename to Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java diff --git a/Mage/src/mage/game/permanent/token/ElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/ElementalToken.java rename to Mage/src/main/java/mage/game/permanent/token/ElementalToken.java diff --git a/Mage/src/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/ElephantToken.java rename to Mage/src/main/java/mage/game/permanent/token/ElephantToken.java diff --git a/Mage/src/mage/game/permanent/token/ElfToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/ElfToken.java rename to Mage/src/main/java/mage/game/permanent/token/ElfToken.java diff --git a/Mage/src/mage/game/permanent/token/EmptyToken.java b/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/EmptyToken.java rename to Mage/src/main/java/mage/game/permanent/token/EmptyToken.java diff --git a/Mage/src/mage/game/permanent/token/FaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/FaerieRogueToken.java rename to Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java diff --git a/Mage/src/mage/game/permanent/token/FrogToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/FrogToken.java rename to Mage/src/main/java/mage/game/permanent/token/FrogToken.java diff --git a/Mage/src/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/GoatToken.java rename to Mage/src/main/java/mage/game/permanent/token/GoatToken.java diff --git a/Mage/src/mage/game/permanent/token/GoblinRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/GoblinRogueToken.java rename to Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java diff --git a/Mage/src/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/GoblinToken.java rename to Mage/src/main/java/mage/game/permanent/token/GoblinToken.java diff --git a/Mage/src/mage/game/permanent/token/GoblinTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/GoblinTokenWithHaste.java similarity index 100% rename from Mage/src/mage/game/permanent/token/GoblinTokenWithHaste.java rename to Mage/src/main/java/mage/game/permanent/token/GoblinTokenWithHaste.java diff --git a/Mage/src/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/GolemToken.java rename to Mage/src/main/java/mage/game/permanent/token/GolemToken.java diff --git a/Mage/src/mage/game/permanent/token/HornetToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/HornetToken.java rename to Mage/src/main/java/mage/game/permanent/token/HornetToken.java diff --git a/Mage/src/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/HumanToken.java rename to Mage/src/main/java/mage/game/permanent/token/HumanToken.java diff --git a/Mage/src/mage/game/permanent/token/InsectInfectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/InsectInfectToken.java rename to Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java diff --git a/Mage/src/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/InsectToken.java rename to Mage/src/main/java/mage/game/permanent/token/InsectToken.java diff --git a/Mage/src/mage/game/permanent/token/KithkinToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/KithkinToken.java rename to Mage/src/main/java/mage/game/permanent/token/KithkinToken.java diff --git a/Mage/src/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/KnightToken.java rename to Mage/src/main/java/mage/game/permanent/token/KnightToken.java diff --git a/Mage/src/mage/game/permanent/token/KorSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/KorSoldierToken.java rename to Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java diff --git a/Mage/src/mage/game/permanent/token/MerfolkWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/MerfolkWizardToken.java rename to Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java diff --git a/Mage/src/mage/game/permanent/token/MinionToken.java b/Mage/src/main/java/mage/game/permanent/token/MinionToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/MinionToken.java rename to Mage/src/main/java/mage/game/permanent/token/MinionToken.java diff --git a/Mage/src/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/MyrToken.java rename to Mage/src/main/java/mage/game/permanent/token/MyrToken.java diff --git a/Mage/src/mage/game/permanent/token/PegasusToken.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/PegasusToken.java rename to Mage/src/main/java/mage/game/permanent/token/PegasusToken.java diff --git a/Mage/src/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/PlantToken.java rename to Mage/src/main/java/mage/game/permanent/token/PlantToken.java diff --git a/Mage/src/mage/game/permanent/token/RatToken.java b/Mage/src/main/java/mage/game/permanent/token/RatToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/RatToken.java rename to Mage/src/main/java/mage/game/permanent/token/RatToken.java diff --git a/Mage/src/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SaprolingToken.java rename to Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java diff --git a/Mage/src/mage/game/permanent/token/SliverToken.java b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SliverToken.java rename to Mage/src/main/java/mage/game/permanent/token/SliverToken.java diff --git a/Mage/src/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SnakeToken.java rename to Mage/src/main/java/mage/game/permanent/token/SnakeToken.java diff --git a/Mage/src/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SoldierToken.java rename to Mage/src/main/java/mage/game/permanent/token/SoldierToken.java diff --git a/Mage/src/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SoldierTokenWithHaste.java rename to Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java diff --git a/Mage/src/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SpiderToken.java rename to Mage/src/main/java/mage/game/permanent/token/SpiderToken.java diff --git a/Mage/src/mage/game/permanent/token/SpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SpiritToken.java rename to Mage/src/main/java/mage/game/permanent/token/SpiritToken.java diff --git a/Mage/src/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SpiritWhiteToken.java rename to Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java diff --git a/Mage/src/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/SquirrelToken.java rename to Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java diff --git a/Mage/src/mage/game/permanent/token/ThopterColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/ThopterColorlessToken.java rename to Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java diff --git a/Mage/src/mage/game/permanent/token/ThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/ThrullToken.java rename to Mage/src/main/java/mage/game/permanent/token/ThrullToken.java diff --git a/Mage/src/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java similarity index 100% rename from Mage/src/mage/game/permanent/token/Token.java rename to Mage/src/main/java/mage/game/permanent/token/Token.java diff --git a/Mage/src/mage/game/permanent/token/WarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/WarriorToken.java rename to Mage/src/main/java/mage/game/permanent/token/WarriorToken.java diff --git a/Mage/src/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/WolfToken.java rename to Mage/src/main/java/mage/game/permanent/token/WolfToken.java diff --git a/Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java similarity index 100% rename from Mage/src/mage/game/permanent/token/WolfTokenWithDeathtouch.java rename to Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java diff --git a/Mage/src/mage/game/permanent/token/WurmToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/WurmToken.java rename to Mage/src/main/java/mage/game/permanent/token/WurmToken.java diff --git a/Mage/src/mage/game/permanent/token/WurmToken2.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java similarity index 100% rename from Mage/src/mage/game/permanent/token/WurmToken2.java rename to Mage/src/main/java/mage/game/permanent/token/WurmToken2.java diff --git a/Mage/src/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java similarity index 100% rename from Mage/src/mage/game/permanent/token/ZombieToken.java rename to Mage/src/main/java/mage/game/permanent/token/ZombieToken.java diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java similarity index 100% rename from Mage/src/mage/game/stack/Spell.java rename to Mage/src/main/java/mage/game/stack/Spell.java diff --git a/Mage/src/mage/game/stack/SpellStack.java b/Mage/src/main/java/mage/game/stack/SpellStack.java similarity index 100% rename from Mage/src/mage/game/stack/SpellStack.java rename to Mage/src/main/java/mage/game/stack/SpellStack.java diff --git a/Mage/src/mage/game/stack/StackAbility.java b/Mage/src/main/java/mage/game/stack/StackAbility.java similarity index 100% rename from Mage/src/mage/game/stack/StackAbility.java rename to Mage/src/main/java/mage/game/stack/StackAbility.java diff --git a/Mage/src/mage/game/stack/StackObjImpl.java b/Mage/src/main/java/mage/game/stack/StackObjImpl.java similarity index 100% rename from Mage/src/mage/game/stack/StackObjImpl.java rename to Mage/src/main/java/mage/game/stack/StackObjImpl.java diff --git a/Mage/src/mage/game/stack/StackObject.java b/Mage/src/main/java/mage/game/stack/StackObject.java similarity index 100% rename from Mage/src/mage/game/stack/StackObject.java rename to Mage/src/main/java/mage/game/stack/StackObject.java diff --git a/Mage/src/mage/game/tournament/LimitedOptions.java b/Mage/src/main/java/mage/game/tournament/LimitedOptions.java similarity index 100% rename from Mage/src/mage/game/tournament/LimitedOptions.java rename to Mage/src/main/java/mage/game/tournament/LimitedOptions.java diff --git a/Mage/src/mage/game/tournament/Round.java b/Mage/src/main/java/mage/game/tournament/Round.java similarity index 100% rename from Mage/src/mage/game/tournament/Round.java rename to Mage/src/main/java/mage/game/tournament/Round.java diff --git a/Mage/src/mage/game/tournament/Tournament.java b/Mage/src/main/java/mage/game/tournament/Tournament.java similarity index 100% rename from Mage/src/mage/game/tournament/Tournament.java rename to Mage/src/main/java/mage/game/tournament/Tournament.java diff --git a/Mage/src/mage/game/tournament/TournamentImpl.java b/Mage/src/main/java/mage/game/tournament/TournamentImpl.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentImpl.java rename to Mage/src/main/java/mage/game/tournament/TournamentImpl.java diff --git a/Mage/src/mage/game/tournament/TournamentOptions.java b/Mage/src/main/java/mage/game/tournament/TournamentOptions.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentOptions.java rename to Mage/src/main/java/mage/game/tournament/TournamentOptions.java diff --git a/Mage/src/mage/game/tournament/TournamentPairing.java b/Mage/src/main/java/mage/game/tournament/TournamentPairing.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentPairing.java rename to Mage/src/main/java/mage/game/tournament/TournamentPairing.java diff --git a/Mage/src/mage/game/tournament/TournamentPlayer.java b/Mage/src/main/java/mage/game/tournament/TournamentPlayer.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentPlayer.java rename to Mage/src/main/java/mage/game/tournament/TournamentPlayer.java diff --git a/Mage/src/mage/game/tournament/TournamentSealedOptions.java b/Mage/src/main/java/mage/game/tournament/TournamentSealedOptions.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentSealedOptions.java rename to Mage/src/main/java/mage/game/tournament/TournamentSealedOptions.java diff --git a/Mage/src/mage/game/tournament/TournamentSingleElimination.java b/Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentSingleElimination.java rename to Mage/src/main/java/mage/game/tournament/TournamentSingleElimination.java diff --git a/Mage/src/mage/game/tournament/TournamentSwiss.java b/Mage/src/main/java/mage/game/tournament/TournamentSwiss.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentSwiss.java rename to Mage/src/main/java/mage/game/tournament/TournamentSwiss.java diff --git a/Mage/src/mage/game/tournament/TournamentType.java b/Mage/src/main/java/mage/game/tournament/TournamentType.java similarity index 100% rename from Mage/src/mage/game/tournament/TournamentType.java rename to Mage/src/main/java/mage/game/tournament/TournamentType.java diff --git a/Mage/src/mage/game/tournament/pairing/RoundPairings.java b/Mage/src/main/java/mage/game/tournament/pairing/RoundPairings.java similarity index 100% rename from Mage/src/mage/game/tournament/pairing/RoundPairings.java rename to Mage/src/main/java/mage/game/tournament/pairing/RoundPairings.java diff --git a/Mage/src/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java similarity index 100% rename from Mage/src/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java rename to Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java diff --git a/Mage/src/mage/game/tournament/pairing/SwissPairingSimple.java b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java similarity index 100% rename from Mage/src/mage/game/tournament/pairing/SwissPairingSimple.java rename to Mage/src/main/java/mage/game/tournament/pairing/SwissPairingSimple.java diff --git a/Mage/src/mage/game/turn/BeginCombatStep.java b/Mage/src/main/java/mage/game/turn/BeginCombatStep.java similarity index 100% rename from Mage/src/mage/game/turn/BeginCombatStep.java rename to Mage/src/main/java/mage/game/turn/BeginCombatStep.java diff --git a/Mage/src/mage/game/turn/BeginningPhase.java b/Mage/src/main/java/mage/game/turn/BeginningPhase.java similarity index 100% rename from Mage/src/mage/game/turn/BeginningPhase.java rename to Mage/src/main/java/mage/game/turn/BeginningPhase.java diff --git a/Mage/src/mage/game/turn/CleanupStep.java b/Mage/src/main/java/mage/game/turn/CleanupStep.java similarity index 100% rename from Mage/src/mage/game/turn/CleanupStep.java rename to Mage/src/main/java/mage/game/turn/CleanupStep.java diff --git a/Mage/src/mage/game/turn/CombatDamageStep.java b/Mage/src/main/java/mage/game/turn/CombatDamageStep.java similarity index 100% rename from Mage/src/mage/game/turn/CombatDamageStep.java rename to Mage/src/main/java/mage/game/turn/CombatDamageStep.java diff --git a/Mage/src/mage/game/turn/CombatPhase.java b/Mage/src/main/java/mage/game/turn/CombatPhase.java similarity index 100% rename from Mage/src/mage/game/turn/CombatPhase.java rename to Mage/src/main/java/mage/game/turn/CombatPhase.java diff --git a/Mage/src/mage/game/turn/DeclareAttackersStep.java b/Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java similarity index 100% rename from Mage/src/mage/game/turn/DeclareAttackersStep.java rename to Mage/src/main/java/mage/game/turn/DeclareAttackersStep.java diff --git a/Mage/src/mage/game/turn/DeclareBlockersStep.java b/Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java similarity index 100% rename from Mage/src/mage/game/turn/DeclareBlockersStep.java rename to Mage/src/main/java/mage/game/turn/DeclareBlockersStep.java diff --git a/Mage/src/mage/game/turn/DrawStep.java b/Mage/src/main/java/mage/game/turn/DrawStep.java similarity index 100% rename from Mage/src/mage/game/turn/DrawStep.java rename to Mage/src/main/java/mage/game/turn/DrawStep.java diff --git a/Mage/src/mage/game/turn/EndOfCombatStep.java b/Mage/src/main/java/mage/game/turn/EndOfCombatStep.java similarity index 100% rename from Mage/src/mage/game/turn/EndOfCombatStep.java rename to Mage/src/main/java/mage/game/turn/EndOfCombatStep.java diff --git a/Mage/src/mage/game/turn/EndPhase.java b/Mage/src/main/java/mage/game/turn/EndPhase.java similarity index 100% rename from Mage/src/mage/game/turn/EndPhase.java rename to Mage/src/main/java/mage/game/turn/EndPhase.java diff --git a/Mage/src/mage/game/turn/EndStep.java b/Mage/src/main/java/mage/game/turn/EndStep.java similarity index 100% rename from Mage/src/mage/game/turn/EndStep.java rename to Mage/src/main/java/mage/game/turn/EndStep.java diff --git a/Mage/src/mage/game/turn/FirstCombatDamageStep.java b/Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java similarity index 100% rename from Mage/src/mage/game/turn/FirstCombatDamageStep.java rename to Mage/src/main/java/mage/game/turn/FirstCombatDamageStep.java diff --git a/Mage/src/mage/game/turn/Phase.java b/Mage/src/main/java/mage/game/turn/Phase.java similarity index 100% rename from Mage/src/mage/game/turn/Phase.java rename to Mage/src/main/java/mage/game/turn/Phase.java diff --git a/Mage/src/mage/game/turn/PostCombatMainPhase.java b/Mage/src/main/java/mage/game/turn/PostCombatMainPhase.java similarity index 100% rename from Mage/src/mage/game/turn/PostCombatMainPhase.java rename to Mage/src/main/java/mage/game/turn/PostCombatMainPhase.java diff --git a/Mage/src/mage/game/turn/PostCombatMainStep.java b/Mage/src/main/java/mage/game/turn/PostCombatMainStep.java similarity index 100% rename from Mage/src/mage/game/turn/PostCombatMainStep.java rename to Mage/src/main/java/mage/game/turn/PostCombatMainStep.java diff --git a/Mage/src/mage/game/turn/PreCombatMainPhase.java b/Mage/src/main/java/mage/game/turn/PreCombatMainPhase.java similarity index 100% rename from Mage/src/mage/game/turn/PreCombatMainPhase.java rename to Mage/src/main/java/mage/game/turn/PreCombatMainPhase.java diff --git a/Mage/src/mage/game/turn/PreCombatMainStep.java b/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java similarity index 100% rename from Mage/src/mage/game/turn/PreCombatMainStep.java rename to Mage/src/main/java/mage/game/turn/PreCombatMainStep.java diff --git a/Mage/src/mage/game/turn/Step.java b/Mage/src/main/java/mage/game/turn/Step.java similarity index 100% rename from Mage/src/mage/game/turn/Step.java rename to Mage/src/main/java/mage/game/turn/Step.java diff --git a/Mage/src/mage/game/turn/Turn.java b/Mage/src/main/java/mage/game/turn/Turn.java similarity index 100% rename from Mage/src/mage/game/turn/Turn.java rename to Mage/src/main/java/mage/game/turn/Turn.java diff --git a/Mage/src/mage/game/turn/TurnMod.java b/Mage/src/main/java/mage/game/turn/TurnMod.java similarity index 100% rename from Mage/src/mage/game/turn/TurnMod.java rename to Mage/src/main/java/mage/game/turn/TurnMod.java diff --git a/Mage/src/mage/game/turn/TurnMods.java b/Mage/src/main/java/mage/game/turn/TurnMods.java similarity index 100% rename from Mage/src/mage/game/turn/TurnMods.java rename to Mage/src/main/java/mage/game/turn/TurnMods.java diff --git a/Mage/src/mage/game/turn/UntapStep.java b/Mage/src/main/java/mage/game/turn/UntapStep.java similarity index 100% rename from Mage/src/mage/game/turn/UntapStep.java rename to Mage/src/main/java/mage/game/turn/UntapStep.java diff --git a/Mage/src/mage/game/turn/UpkeepStep.java b/Mage/src/main/java/mage/game/turn/UpkeepStep.java similarity index 100% rename from Mage/src/mage/game/turn/UpkeepStep.java rename to Mage/src/main/java/mage/game/turn/UpkeepStep.java diff --git a/Mage/src/mage/players/Library.java b/Mage/src/main/java/mage/players/Library.java similarity index 100% rename from Mage/src/mage/players/Library.java rename to Mage/src/main/java/mage/players/Library.java diff --git a/Mage/src/mage/players/ManaPool.java b/Mage/src/main/java/mage/players/ManaPool.java similarity index 100% rename from Mage/src/mage/players/ManaPool.java rename to Mage/src/main/java/mage/players/ManaPool.java diff --git a/Mage/src/mage/players/ManaPoolItem.java b/Mage/src/main/java/mage/players/ManaPoolItem.java similarity index 100% rename from Mage/src/mage/players/ManaPoolItem.java rename to Mage/src/main/java/mage/players/ManaPoolItem.java diff --git a/Mage/src/mage/players/Player.java b/Mage/src/main/java/mage/players/Player.java similarity index 100% rename from Mage/src/mage/players/Player.java rename to Mage/src/main/java/mage/players/Player.java diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java similarity index 100% rename from Mage/src/mage/players/PlayerImpl.java rename to Mage/src/main/java/mage/players/PlayerImpl.java diff --git a/Mage/src/mage/players/PlayerList.java b/Mage/src/main/java/mage/players/PlayerList.java similarity index 100% rename from Mage/src/mage/players/PlayerList.java rename to Mage/src/main/java/mage/players/PlayerList.java diff --git a/Mage/src/mage/players/Players.java b/Mage/src/main/java/mage/players/Players.java similarity index 100% rename from Mage/src/mage/players/Players.java rename to Mage/src/main/java/mage/players/Players.java diff --git a/Mage/src/mage/players/net/SkipPrioritySteps.java b/Mage/src/main/java/mage/players/net/SkipPrioritySteps.java similarity index 100% rename from Mage/src/mage/players/net/SkipPrioritySteps.java rename to Mage/src/main/java/mage/players/net/SkipPrioritySteps.java diff --git a/Mage/src/mage/players/net/UserData.java b/Mage/src/main/java/mage/players/net/UserData.java similarity index 100% rename from Mage/src/mage/players/net/UserData.java rename to Mage/src/main/java/mage/players/net/UserData.java diff --git a/Mage/src/mage/players/net/UserGroup.java b/Mage/src/main/java/mage/players/net/UserGroup.java similarity index 100% rename from Mage/src/mage/players/net/UserGroup.java rename to Mage/src/main/java/mage/players/net/UserGroup.java diff --git a/Mage/src/mage/players/net/UserSkipPrioritySteps.java b/Mage/src/main/java/mage/players/net/UserSkipPrioritySteps.java similarity index 100% rename from Mage/src/mage/players/net/UserSkipPrioritySteps.java rename to Mage/src/main/java/mage/players/net/UserSkipPrioritySteps.java diff --git a/Mage/src/mage/target/Target.java b/Mage/src/main/java/mage/target/Target.java similarity index 100% rename from Mage/src/mage/target/Target.java rename to Mage/src/main/java/mage/target/Target.java diff --git a/Mage/src/mage/target/TargetAmount.java b/Mage/src/main/java/mage/target/TargetAmount.java similarity index 100% rename from Mage/src/mage/target/TargetAmount.java rename to Mage/src/main/java/mage/target/TargetAmount.java diff --git a/Mage/src/mage/target/TargetCard.java b/Mage/src/main/java/mage/target/TargetCard.java similarity index 100% rename from Mage/src/mage/target/TargetCard.java rename to Mage/src/main/java/mage/target/TargetCard.java diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/main/java/mage/target/TargetImpl.java similarity index 100% rename from Mage/src/mage/target/TargetImpl.java rename to Mage/src/main/java/mage/target/TargetImpl.java diff --git a/Mage/src/mage/target/TargetObject.java b/Mage/src/main/java/mage/target/TargetObject.java similarity index 100% rename from Mage/src/mage/target/TargetObject.java rename to Mage/src/main/java/mage/target/TargetObject.java diff --git a/Mage/src/mage/target/TargetPermanent.java b/Mage/src/main/java/mage/target/TargetPermanent.java similarity index 100% rename from Mage/src/mage/target/TargetPermanent.java rename to Mage/src/main/java/mage/target/TargetPermanent.java diff --git a/Mage/src/mage/target/TargetPlayer.java b/Mage/src/main/java/mage/target/TargetPlayer.java similarity index 100% rename from Mage/src/mage/target/TargetPlayer.java rename to Mage/src/main/java/mage/target/TargetPlayer.java diff --git a/Mage/src/mage/target/TargetSource.java b/Mage/src/main/java/mage/target/TargetSource.java similarity index 100% rename from Mage/src/mage/target/TargetSource.java rename to Mage/src/main/java/mage/target/TargetSource.java diff --git a/Mage/src/mage/target/TargetSpell.java b/Mage/src/main/java/mage/target/TargetSpell.java similarity index 100% rename from Mage/src/mage/target/TargetSpell.java rename to Mage/src/main/java/mage/target/TargetSpell.java diff --git a/Mage/src/mage/target/TargetStackObject.java b/Mage/src/main/java/mage/target/TargetStackObject.java similarity index 100% rename from Mage/src/mage/target/TargetStackObject.java rename to Mage/src/main/java/mage/target/TargetStackObject.java diff --git a/Mage/src/mage/target/Targets.java b/Mage/src/main/java/mage/target/Targets.java similarity index 100% rename from Mage/src/mage/target/Targets.java rename to Mage/src/main/java/mage/target/Targets.java diff --git a/Mage/src/mage/target/common/TargetActivatedAbility.java b/Mage/src/main/java/mage/target/common/TargetActivatedAbility.java similarity index 100% rename from Mage/src/mage/target/common/TargetActivatedAbility.java rename to Mage/src/main/java/mage/target/common/TargetActivatedAbility.java diff --git a/Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java b/Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java similarity index 100% rename from Mage/src/mage/target/common/TargetActivatedOrTriggeredAbility.java rename to Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java diff --git a/Mage/src/mage/target/common/TargetArtifactPermanent.java b/Mage/src/main/java/mage/target/common/TargetArtifactPermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetArtifactPermanent.java rename to Mage/src/main/java/mage/target/common/TargetArtifactPermanent.java diff --git a/Mage/src/mage/target/common/TargetAttackingCreature.java b/Mage/src/main/java/mage/target/common/TargetAttackingCreature.java similarity index 100% rename from Mage/src/mage/target/common/TargetAttackingCreature.java rename to Mage/src/main/java/mage/target/common/TargetAttackingCreature.java diff --git a/Mage/src/mage/target/common/TargetAttackingOrBlockingCreature.java b/Mage/src/main/java/mage/target/common/TargetAttackingOrBlockingCreature.java similarity index 100% rename from Mage/src/mage/target/common/TargetAttackingOrBlockingCreature.java rename to Mage/src/main/java/mage/target/common/TargetAttackingOrBlockingCreature.java diff --git a/Mage/src/mage/target/common/TargetBasicLandCard.java b/Mage/src/main/java/mage/target/common/TargetBasicLandCard.java similarity index 100% rename from Mage/src/mage/target/common/TargetBasicLandCard.java rename to Mage/src/main/java/mage/target/common/TargetBasicLandCard.java diff --git a/Mage/src/mage/target/common/TargetCardInASingleGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java similarity index 100% rename from Mage/src/mage/target/common/TargetCardInASingleGraveyard.java rename to Mage/src/main/java/mage/target/common/TargetCardInASingleGraveyard.java diff --git a/Mage/src/mage/target/common/TargetCardInExile.java b/Mage/src/main/java/mage/target/common/TargetCardInExile.java similarity index 100% rename from Mage/src/mage/target/common/TargetCardInExile.java rename to Mage/src/main/java/mage/target/common/TargetCardInExile.java diff --git a/Mage/src/mage/target/common/TargetCardInGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java similarity index 100% rename from Mage/src/mage/target/common/TargetCardInGraveyard.java rename to Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java diff --git a/Mage/src/mage/target/common/TargetCardInHand.java b/Mage/src/main/java/mage/target/common/TargetCardInHand.java similarity index 100% rename from Mage/src/mage/target/common/TargetCardInHand.java rename to Mage/src/main/java/mage/target/common/TargetCardInHand.java diff --git a/Mage/src/mage/target/common/TargetCardInLibrary.java b/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java similarity index 100% rename from Mage/src/mage/target/common/TargetCardInLibrary.java rename to Mage/src/main/java/mage/target/common/TargetCardInLibrary.java diff --git a/Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java similarity index 100% rename from Mage/src/mage/target/common/TargetCardInOpponentsGraveyard.java rename to Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java diff --git a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java similarity index 100% rename from Mage/src/mage/target/common/TargetCardInYourGraveyard.java rename to Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java diff --git a/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java b/Mage/src/main/java/mage/target/common/TargetControlledCreaturePermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetControlledCreaturePermanent.java rename to Mage/src/main/java/mage/target/common/TargetControlledCreaturePermanent.java diff --git a/Mage/src/mage/target/common/TargetControlledPermanent.java b/Mage/src/main/java/mage/target/common/TargetControlledPermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetControlledPermanent.java rename to Mage/src/main/java/mage/target/common/TargetControlledPermanent.java diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java similarity index 100% rename from Mage/src/mage/target/common/TargetCreatureOrPlaneswalker.java rename to Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlaneswalkerAmount.java b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalkerAmount.java similarity index 100% rename from Mage/src/mage/target/common/TargetCreatureOrPlaneswalkerAmount.java rename to Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalkerAmount.java diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlayer.java b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java similarity index 100% rename from Mage/src/mage/target/common/TargetCreatureOrPlayer.java rename to Mage/src/main/java/mage/target/common/TargetCreatureOrPlayer.java diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlayerAmount.java b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlayerAmount.java similarity index 100% rename from Mage/src/mage/target/common/TargetCreatureOrPlayerAmount.java rename to Mage/src/main/java/mage/target/common/TargetCreatureOrPlayerAmount.java diff --git a/Mage/src/mage/target/common/TargetCreaturePermanent.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetCreaturePermanent.java rename to Mage/src/main/java/mage/target/common/TargetCreaturePermanent.java diff --git a/Mage/src/mage/target/common/TargetCreaturePermanentAmount.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentAmount.java similarity index 100% rename from Mage/src/mage/target/common/TargetCreaturePermanentAmount.java rename to Mage/src/main/java/mage/target/common/TargetCreaturePermanentAmount.java diff --git a/Mage/src/mage/target/common/TargetDefender.java b/Mage/src/main/java/mage/target/common/TargetDefender.java similarity index 100% rename from Mage/src/mage/target/common/TargetDefender.java rename to Mage/src/main/java/mage/target/common/TargetDefender.java diff --git a/Mage/src/mage/target/common/TargetDiscard.java b/Mage/src/main/java/mage/target/common/TargetDiscard.java similarity index 100% rename from Mage/src/mage/target/common/TargetDiscard.java rename to Mage/src/main/java/mage/target/common/TargetDiscard.java diff --git a/Mage/src/mage/target/common/TargetEnchantmentPermanent.java b/Mage/src/main/java/mage/target/common/TargetEnchantmentPermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetEnchantmentPermanent.java rename to Mage/src/main/java/mage/target/common/TargetEnchantmentPermanent.java diff --git a/Mage/src/mage/target/common/TargetLandPermanent.java b/Mage/src/main/java/mage/target/common/TargetLandPermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetLandPermanent.java rename to Mage/src/main/java/mage/target/common/TargetLandPermanent.java diff --git a/Mage/src/mage/target/common/TargetNonBasicLandPermanent.java b/Mage/src/main/java/mage/target/common/TargetNonBasicLandPermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetNonBasicLandPermanent.java rename to Mage/src/main/java/mage/target/common/TargetNonBasicLandPermanent.java diff --git a/Mage/src/mage/target/common/TargetNonlandPermanent.java b/Mage/src/main/java/mage/target/common/TargetNonlandPermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetNonlandPermanent.java rename to Mage/src/main/java/mage/target/common/TargetNonlandPermanent.java diff --git a/Mage/src/mage/target/common/TargetOpponent.java b/Mage/src/main/java/mage/target/common/TargetOpponent.java similarity index 100% rename from Mage/src/mage/target/common/TargetOpponent.java rename to Mage/src/main/java/mage/target/common/TargetOpponent.java diff --git a/Mage/src/mage/target/common/TargetOpponentsChoicePermanent.java b/Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetOpponentsChoicePermanent.java rename to Mage/src/main/java/mage/target/common/TargetOpponentsChoicePermanent.java diff --git a/Mage/src/mage/target/common/TargetPermanentOrPlayer.java b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java similarity index 100% rename from Mage/src/mage/target/common/TargetPermanentOrPlayer.java rename to Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java diff --git a/Mage/src/mage/target/common/TargetPermanentOrPlayerWithCounter.java b/Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerWithCounter.java similarity index 100% rename from Mage/src/mage/target/common/TargetPermanentOrPlayerWithCounter.java rename to Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerWithCounter.java diff --git a/Mage/src/mage/target/common/TargetSpellOrPermanent.java b/Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java similarity index 100% rename from Mage/src/mage/target/common/TargetSpellOrPermanent.java rename to Mage/src/main/java/mage/target/common/TargetSpellOrPermanent.java diff --git a/Mage/src/mage/target/targetpointer/FirstTargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java similarity index 100% rename from Mage/src/mage/target/targetpointer/FirstTargetPointer.java rename to Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java diff --git a/Mage/src/mage/target/targetpointer/FixedTarget.java b/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java similarity index 100% rename from Mage/src/mage/target/targetpointer/FixedTarget.java rename to Mage/src/main/java/mage/target/targetpointer/FixedTarget.java diff --git a/Mage/src/mage/target/targetpointer/SecondTargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java similarity index 100% rename from Mage/src/mage/target/targetpointer/SecondTargetPointer.java rename to Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java diff --git a/Mage/src/mage/target/targetpointer/TargetPointer.java b/Mage/src/main/java/mage/target/targetpointer/TargetPointer.java similarity index 100% rename from Mage/src/mage/target/targetpointer/TargetPointer.java rename to Mage/src/main/java/mage/target/targetpointer/TargetPointer.java diff --git a/Mage/src/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java similarity index 100% rename from Mage/src/mage/util/CardUtil.java rename to Mage/src/main/java/mage/util/CardUtil.java diff --git a/Mage/src/mage/util/CircularList.java b/Mage/src/main/java/mage/util/CircularList.java similarity index 100% rename from Mage/src/mage/util/CircularList.java rename to Mage/src/main/java/mage/util/CircularList.java diff --git a/Mage/src/mage/util/ClassScanner.java b/Mage/src/main/java/mage/util/ClassScanner.java similarity index 100% rename from Mage/src/mage/util/ClassScanner.java rename to Mage/src/main/java/mage/util/ClassScanner.java diff --git a/Mage/src/mage/util/Copier.java b/Mage/src/main/java/mage/util/Copier.java similarity index 100% rename from Mage/src/mage/util/Copier.java rename to Mage/src/main/java/mage/util/Copier.java diff --git a/Mage/src/mage/util/CopierObjectInputStream.java b/Mage/src/main/java/mage/util/CopierObjectInputStream.java similarity index 100% rename from Mage/src/mage/util/CopierObjectInputStream.java rename to Mage/src/main/java/mage/util/CopierObjectInputStream.java diff --git a/Mage/src/mage/util/Copyable.java b/Mage/src/main/java/mage/util/Copyable.java similarity index 100% rename from Mage/src/mage/util/Copyable.java rename to Mage/src/main/java/mage/util/Copyable.java diff --git a/Mage/src/mage/util/DateFormat.java b/Mage/src/main/java/mage/util/DateFormat.java similarity index 100% rename from Mage/src/mage/util/DateFormat.java rename to Mage/src/main/java/mage/util/DateFormat.java diff --git a/Mage/src/mage/util/DeckUtil.java b/Mage/src/main/java/mage/util/DeckUtil.java similarity index 100% rename from Mage/src/mage/util/DeckUtil.java rename to Mage/src/main/java/mage/util/DeckUtil.java diff --git a/Mage/src/mage/util/FastByteArrayInputStream.java b/Mage/src/main/java/mage/util/FastByteArrayInputStream.java similarity index 100% rename from Mage/src/mage/util/FastByteArrayInputStream.java rename to Mage/src/main/java/mage/util/FastByteArrayInputStream.java diff --git a/Mage/src/mage/util/FastByteArrayOutputStream.java b/Mage/src/main/java/mage/util/FastByteArrayOutputStream.java similarity index 100% rename from Mage/src/mage/util/FastByteArrayOutputStream.java rename to Mage/src/main/java/mage/util/FastByteArrayOutputStream.java diff --git a/Mage/src/mage/util/GameLog.java b/Mage/src/main/java/mage/util/GameLog.java similarity index 100% rename from Mage/src/mage/util/GameLog.java rename to Mage/src/main/java/mage/util/GameLog.java diff --git a/Mage/src/mage/util/ManaUtil.java b/Mage/src/main/java/mage/util/ManaUtil.java similarity index 100% rename from Mage/src/mage/util/ManaUtil.java rename to Mage/src/main/java/mage/util/ManaUtil.java diff --git a/Mage/src/mage/util/MessageToClient.java b/Mage/src/main/java/mage/util/MessageToClient.java similarity index 100% rename from Mage/src/mage/util/MessageToClient.java rename to Mage/src/main/java/mage/util/MessageToClient.java diff --git a/Mage/src/mage/util/TargetAddress.java b/Mage/src/main/java/mage/util/TargetAddress.java similarity index 100% rename from Mage/src/mage/util/TargetAddress.java rename to Mage/src/main/java/mage/util/TargetAddress.java diff --git a/Mage/src/mage/util/ThreadLocalStringBuilder.java b/Mage/src/main/java/mage/util/ThreadLocalStringBuilder.java similarity index 100% rename from Mage/src/mage/util/ThreadLocalStringBuilder.java rename to Mage/src/main/java/mage/util/ThreadLocalStringBuilder.java diff --git a/Mage/src/mage/util/TournamentUtil.java b/Mage/src/main/java/mage/util/TournamentUtil.java similarity index 100% rename from Mage/src/mage/util/TournamentUtil.java rename to Mage/src/main/java/mage/util/TournamentUtil.java diff --git a/Mage/src/mage/util/TreeNode.java b/Mage/src/main/java/mage/util/TreeNode.java similarity index 100% rename from Mage/src/mage/util/TreeNode.java rename to Mage/src/main/java/mage/util/TreeNode.java diff --git a/Mage/src/mage/util/functions/AbilityApplier.java b/Mage/src/main/java/mage/util/functions/AbilityApplier.java similarity index 100% rename from Mage/src/mage/util/functions/AbilityApplier.java rename to Mage/src/main/java/mage/util/functions/AbilityApplier.java diff --git a/Mage/src/mage/util/functions/AddSubtypeApplier.java b/Mage/src/main/java/mage/util/functions/AddSubtypeApplier.java similarity index 100% rename from Mage/src/mage/util/functions/AddSubtypeApplier.java rename to Mage/src/main/java/mage/util/functions/AddSubtypeApplier.java diff --git a/Mage/src/mage/util/functions/ApplyToMageObject.java b/Mage/src/main/java/mage/util/functions/ApplyToMageObject.java similarity index 100% rename from Mage/src/mage/util/functions/ApplyToMageObject.java rename to Mage/src/main/java/mage/util/functions/ApplyToMageObject.java diff --git a/Mage/src/mage/util/functions/ApplyToPermanent.java b/Mage/src/main/java/mage/util/functions/ApplyToPermanent.java similarity index 100% rename from Mage/src/mage/util/functions/ApplyToPermanent.java rename to Mage/src/main/java/mage/util/functions/ApplyToPermanent.java diff --git a/Mage/src/mage/util/functions/CardTypeApplier.java b/Mage/src/main/java/mage/util/functions/CardTypeApplier.java similarity index 100% rename from Mage/src/mage/util/functions/CardTypeApplier.java rename to Mage/src/main/java/mage/util/functions/CardTypeApplier.java diff --git a/Mage/src/mage/util/functions/CopyTokenFunction.java b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java similarity index 100% rename from Mage/src/mage/util/functions/CopyTokenFunction.java rename to Mage/src/main/java/mage/util/functions/CopyTokenFunction.java diff --git a/Mage/src/mage/util/functions/EmptyApplyToPermanent.java b/Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java similarity index 100% rename from Mage/src/mage/util/functions/EmptyApplyToPermanent.java rename to Mage/src/main/java/mage/util/functions/EmptyApplyToPermanent.java diff --git a/Mage/src/mage/util/functions/Function.java b/Mage/src/main/java/mage/util/functions/Function.java similarity index 100% rename from Mage/src/mage/util/functions/Function.java rename to Mage/src/main/java/mage/util/functions/Function.java diff --git a/Mage/src/mage/util/trace/TraceUtil.java b/Mage/src/main/java/mage/util/trace/TraceUtil.java similarity index 100% rename from Mage/src/mage/util/trace/TraceUtil.java rename to Mage/src/main/java/mage/util/trace/TraceUtil.java diff --git a/Mage/src/mage/watchers/Watcher.java b/Mage/src/main/java/mage/watchers/Watcher.java similarity index 100% rename from Mage/src/mage/watchers/Watcher.java rename to Mage/src/main/java/mage/watchers/Watcher.java diff --git a/Mage/src/mage/watchers/Watchers.java b/Mage/src/main/java/mage/watchers/Watchers.java similarity index 100% rename from Mage/src/mage/watchers/Watchers.java rename to Mage/src/main/java/mage/watchers/Watchers.java diff --git a/Mage/src/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java rename to Mage/src/main/java/mage/watchers/common/AmountOfDamageAPlayerReceivedThisTurnWatcher.java diff --git a/Mage/src/mage/watchers/common/AttackedThisCombatWatcher.java b/Mage/src/main/java/mage/watchers/common/AttackedThisCombatWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/AttackedThisCombatWatcher.java rename to Mage/src/main/java/mage/watchers/common/AttackedThisCombatWatcher.java diff --git a/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java rename to Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java diff --git a/Mage/src/mage/watchers/common/BlockedAttackerWatcher.java b/Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/BlockedAttackerWatcher.java rename to Mage/src/main/java/mage/watchers/common/BlockedAttackerWatcher.java diff --git a/Mage/src/mage/watchers/common/BloodthirstWatcher.java b/Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/BloodthirstWatcher.java rename to Mage/src/main/java/mage/watchers/common/BloodthirstWatcher.java diff --git a/Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java rename to Mage/src/main/java/mage/watchers/common/CardsDrawnDuringDrawStepWatcher.java diff --git a/Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java rename to Mage/src/main/java/mage/watchers/common/CardsPutIntoGraveyardWatcher.java diff --git a/Mage/src/mage/watchers/common/CastFromHandWatcher.java b/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/CastFromHandWatcher.java rename to Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java diff --git a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java rename to Mage/src/main/java/mage/watchers/common/CastSpellLastTurnWatcher.java diff --git a/Mage/src/mage/watchers/common/CommanderInfoWatcher.java b/Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/CommanderInfoWatcher.java rename to Mage/src/main/java/mage/watchers/common/CommanderInfoWatcher.java diff --git a/Mage/src/mage/watchers/common/CreatureWasCastWatcher.java b/Mage/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/CreatureWasCastWatcher.java rename to Mage/src/main/java/mage/watchers/common/CreatureWasCastWatcher.java diff --git a/Mage/src/mage/watchers/common/CreaturesDiedWatcher.java b/Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/CreaturesDiedWatcher.java rename to Mage/src/main/java/mage/watchers/common/CreaturesDiedWatcher.java diff --git a/Mage/src/mage/watchers/common/DamageDoneWatcher.java b/Mage/src/main/java/mage/watchers/common/DamageDoneWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/DamageDoneWatcher.java rename to Mage/src/main/java/mage/watchers/common/DamageDoneWatcher.java diff --git a/Mage/src/mage/watchers/common/DamagedByWatcher.java b/Mage/src/main/java/mage/watchers/common/DamagedByWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/DamagedByWatcher.java rename to Mage/src/main/java/mage/watchers/common/DamagedByWatcher.java diff --git a/Mage/src/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java b/Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java rename to Mage/src/main/java/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java diff --git a/Mage/src/mage/watchers/common/FirstTimeStepWatcher.java b/Mage/src/main/java/mage/watchers/common/FirstTimeStepWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/FirstTimeStepWatcher.java rename to Mage/src/main/java/mage/watchers/common/FirstTimeStepWatcher.java diff --git a/Mage/src/mage/watchers/common/GravestormWatcher.java b/Mage/src/main/java/mage/watchers/common/GravestormWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/GravestormWatcher.java rename to Mage/src/main/java/mage/watchers/common/GravestormWatcher.java diff --git a/Mage/src/mage/watchers/common/LandfallWatcher.java b/Mage/src/main/java/mage/watchers/common/LandfallWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/LandfallWatcher.java rename to Mage/src/main/java/mage/watchers/common/LandfallWatcher.java diff --git a/Mage/src/mage/watchers/common/ManaSpentToCastWatcher.java b/Mage/src/main/java/mage/watchers/common/ManaSpentToCastWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/ManaSpentToCastWatcher.java rename to Mage/src/main/java/mage/watchers/common/ManaSpentToCastWatcher.java diff --git a/Mage/src/mage/watchers/common/MiracleWatcher.java b/Mage/src/main/java/mage/watchers/common/MiracleWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/MiracleWatcher.java rename to Mage/src/main/java/mage/watchers/common/MiracleWatcher.java diff --git a/Mage/src/mage/watchers/common/MorbidWatcher.java b/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/MorbidWatcher.java rename to Mage/src/main/java/mage/watchers/common/MorbidWatcher.java diff --git a/Mage/src/mage/watchers/common/PlayerAttackedWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerAttackedWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/PlayerAttackedWatcher.java rename to Mage/src/main/java/mage/watchers/common/PlayerAttackedWatcher.java diff --git a/Mage/src/mage/watchers/common/PlayerCastCreatureWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerCastCreatureWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/PlayerCastCreatureWatcher.java rename to Mage/src/main/java/mage/watchers/common/PlayerCastCreatureWatcher.java diff --git a/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java rename to Mage/src/main/java/mage/watchers/common/PlayerDamagedBySourceWatcher.java diff --git a/Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/PlayerGainedLifeWatcher.java rename to Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java diff --git a/Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/PlayerLostLifeWatcher.java rename to Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java diff --git a/Mage/src/mage/watchers/common/ProwlWatcher.java b/Mage/src/main/java/mage/watchers/common/ProwlWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/ProwlWatcher.java rename to Mage/src/main/java/mage/watchers/common/ProwlWatcher.java diff --git a/Mage/src/mage/watchers/common/SoulbondWatcher.java b/Mage/src/main/java/mage/watchers/common/SoulbondWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/SoulbondWatcher.java rename to Mage/src/main/java/mage/watchers/common/SoulbondWatcher.java diff --git a/Mage/src/mage/watchers/common/SourceDidDamageWatcher.java b/Mage/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java similarity index 100% rename from Mage/src/mage/watchers/common/SourceDidDamageWatcher.java rename to Mage/src/main/java/mage/watchers/common/SourceDidDamageWatcher.java diff --git a/Mage.Tests/src/test/java/mage/ManaSymbolTest.java b/Mage/src/test/java/mage/ManaSymbolTest.java similarity index 99% rename from Mage.Tests/src/test/java/mage/ManaSymbolTest.java rename to Mage/src/test/java/mage/ManaSymbolTest.java index 3fb8a73114..6d12ac4de4 100644 --- a/Mage.Tests/src/test/java/mage/ManaSymbolTest.java +++ b/Mage/src/test/java/mage/ManaSymbolTest.java @@ -8,13 +8,12 @@ import static org.junit.Assert.*; * Custom unit tests for {@link ManaSymbol} */ public class ManaSymbolTest { - @Test public void shouldCreateWhiteManaSymbol() { // given // when - ManaSymbol w = ManaSymbol.W; + ManaSymbol w = mage.ManaSymbol.W; // then assertEquals("{W}", w.toString()); @@ -38,7 +37,7 @@ public class ManaSymbolTest { } @Test - public void shouldCreateBlueManaSymbol() { + public void shouldCreateBlueManaSymbol() { // given // when @@ -674,7 +673,7 @@ public class ManaSymbolTest { @Test - public void shouldCreateGPhyrexianMana() { + public void shouldCreateGPhyrexianMana() { // given // when @@ -732,7 +731,7 @@ public class ManaSymbolTest { @Test - public void shouldCreateBPhyrexianMana() { + public void shouldCreateBPhyrexianMana() { // given // when diff --git a/Mage.Tests/src/test/java/org/mage/test/mana/ManaTest.java b/Mage/src/test/java/mage/ManaTest.java similarity index 99% rename from Mage.Tests/src/test/java/org/mage/test/mana/ManaTest.java rename to Mage/src/test/java/mage/ManaTest.java index 49f158d662..49f7cab20e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/mana/ManaTest.java +++ b/Mage/src/test/java/mage/ManaTest.java @@ -1,6 +1,5 @@ -package org.mage.test.mana; +package mage; -import mage.Mana; import mage.constants.ColoredManaSymbol; import mage.constants.ManaType; import mage.filter.FilterMana; @@ -10,7 +9,7 @@ import org.junit.rules.ExpectedException; import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertFalse; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; /** * Custom unit tests for {link Mana}.