diff --git a/.gitattributes b/.gitattributes
index c23e23c1554..a67d3c87072 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14806,7 +14806,6 @@ forge-gui/src/main/java/forge/ai/ability/UntapAi.java -text
 forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java -text
 forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text
 forge-gui/src/main/java/forge/card/CardBlock.java -text
-forge-gui/src/main/java/forge/card/CardCharacteristics.java -text
 forge-gui/src/main/java/forge/card/CardEditionPredicates.java -text
 forge-gui/src/main/java/forge/card/MetaSet.java -text
 forge-gui/src/main/java/forge/card/UnOpenedMeta.java -text
@@ -14968,6 +14967,7 @@ forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java -text
 forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java -text
 forge-gui/src/main/java/forge/game/ability/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/card/Card.java svneol=native#text/plain
+forge-gui/src/main/java/forge/game/card/CardCharacteristics.java -text
 forge-gui/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain
 forge-gui/src/main/java/forge/game/card/CardDamageHistory.java -text
 forge-gui/src/main/java/forge/game/card/CardFactory.java svneol=native#text/plain
diff --git a/forge-gui/src/main/java/forge/game/card/Card.java b/forge-gui/src/main/java/forge/game/card/Card.java
index 9e54dfa1bd1..76386164997 100644
--- a/forge-gui/src/main/java/forge/game/card/Card.java
+++ b/forge-gui/src/main/java/forge/game/card/Card.java
@@ -44,7 +44,6 @@ import com.google.common.collect.Lists;
 import forge.Command;
 import forge.Singletons;
 import forge.card.CardCharacteristicName;
-import forge.card.CardCharacteristics;
 import forge.card.CardEdition;
 import forge.card.CardRarity;
 import forge.card.CardRules;
diff --git a/forge-gui/src/main/java/forge/card/CardCharacteristics.java b/forge-gui/src/main/java/forge/game/card/CardCharacteristics.java
similarity index 95%
rename from forge-gui/src/main/java/forge/card/CardCharacteristics.java
rename to forge-gui/src/main/java/forge/game/card/CardCharacteristics.java
index 2d5e959f36f..27ac7d802ce 100644
--- a/forge-gui/src/main/java/forge/card/CardCharacteristics.java
+++ b/forge-gui/src/main/java/forge/game/card/CardCharacteristics.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package forge.card;
+package forge.game.card;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,8 +25,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.google.common.collect.Lists;
 
+import forge.card.CardEdition;
+import forge.card.CardRarity;
 import forge.card.mana.ManaCost;
-import forge.game.card.CardColor;
 import forge.game.replacement.ReplacementEffect;
 import forge.game.spellability.SpellAbility;
 import forge.game.staticability.StaticAbility;
diff --git a/forge-gui/src/main/java/forge/game/card/CardFactory.java b/forge-gui/src/main/java/forge/game/card/CardFactory.java
index 6bb5f22c719..29dc1b5fca3 100644
--- a/forge-gui/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-gui/src/main/java/forge/game/card/CardFactory.java
@@ -24,7 +24,6 @@ import java.util.Map.Entry;
 
 import forge.ImageCache;
 import forge.card.CardCharacteristicName;
-import forge.card.CardCharacteristics;
 import forge.card.CardRules;
 import forge.card.CardSplitType;
 import forge.card.ICardFace;
diff --git a/forge-gui/src/main/java/forge/game/card/CardUtil.java b/forge-gui/src/main/java/forge/game/card/CardUtil.java
index 24b9d0499af..9e3cae4a412 100644
--- a/forge-gui/src/main/java/forge/game/card/CardUtil.java
+++ b/forge-gui/src/main/java/forge/game/card/CardUtil.java
@@ -26,7 +26,6 @@ import forge.Constant;
 import forge.Singletons;
 import forge.Constant.Keywords;
 import forge.card.CardCharacteristicName;
-import forge.card.CardCharacteristics;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.game.Game;
diff --git a/forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java b/forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java
index 05d7045c1d2..7ea96defdaf 100644
--- a/forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java
+++ b/forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java
@@ -21,9 +21,9 @@ import java.util.Arrays;
 
 import forge.Command;
 import forge.card.CardCharacteristicName;
-import forge.card.CardCharacteristics;
 import forge.card.mana.ManaCost;
 import forge.game.card.Card;
+import forge.game.card.CardCharacteristics;
 import forge.game.trigger.ZCTrigger;
 
 /**