diff --git a/.gitattributes b/.gitattributes
index 310ded2c255..94d3e9dfeb4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -237,8 +237,6 @@ forge-core/src/main/java/forge/util/BinaryUtil.java -text
 forge-core/src/main/java/forge/util/BuildInfo.java -text
 forge-core/src/main/java/forge/util/CollectionSuppliers.java -text
 forge-core/src/main/java/forge/util/ComparableOp.java -text
-forge-core/src/main/java/forge/util/FCollection.java -text
-forge-core/src/main/java/forge/util/FCollectionView.java -text
 forge-core/src/main/java/forge/util/FileSection.java -text
 forge-core/src/main/java/forge/util/FileSectionManual.java -text
 forge-core/src/main/java/forge/util/FileUtil.java svneol=native#text/plain
@@ -265,7 +263,6 @@ forge-core/src/main/java/forge/util/maps/HashMapOfLists.java -text
 forge-core/src/main/java/forge/util/maps/LinkedHashMapToAmount.java -text
 forge-core/src/main/java/forge/util/maps/MapOfLists.java -text
 forge-core/src/main/java/forge/util/maps/MapToAmount.java -text
-forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java -text
 forge-core/src/main/java/forge/util/maps/package-info.java -text
 forge-core/src/main/java/forge/util/storage/IStorage.java -text
 forge-core/src/main/java/forge/util/storage/StorageBase.java -text
@@ -717,6 +714,9 @@ forge-game/src/main/java/forge/trackable/TrackableSerializer.java -text
 forge-game/src/main/java/forge/trackable/TrackableTypes.java -text
 forge-game/src/main/java/forge/trackable/Tracker.java -text
 forge-game/src/main/java/forge/util/Expressions.java -text
+forge-game/src/main/java/forge/util/FCollection.java -text
+forge-game/src/main/java/forge/util/FCollectionView.java -text
+forge-game/src/main/java/forge/util/MapToAmountUtil.java -text
 forge-game/src/main/java/forge/util/MessageUtil.java -text
 forge-game/src/test/java/forge/game/mana/ManaCostBeingPaidTest.java -text
 forge-gui-android/.classpath -text
diff --git a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
index be27e86d7d2..8dee47c28c0 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
@@ -33,9 +33,9 @@ import forge.game.card.CounterType;
 import forge.game.zone.ZoneType;
 import forge.util.FCollection;
 import forge.util.FCollectionView;
+import forge.util.MapToAmountUtil;
 import forge.util.maps.LinkedHashMapToAmount;
 import forge.util.maps.MapToAmount;
-import forge.util.maps.MapToAmountUtil;
 
 public class AttackConstraints {
 
diff --git a/forge-game/src/main/java/forge/game/combat/AttackRequirement.java b/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
index 29df5c48ea8..95faceaa5eb 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
@@ -15,9 +15,9 @@ import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.FCollectionView;
+import forge.util.MapToAmountUtil;
 import forge.util.maps.LinkedHashMapToAmount;
 import forge.util.maps.MapToAmount;
-import forge.util.maps.MapToAmountUtil;
 
 public class AttackRequirement {
 
diff --git a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
index 3c01441bba8..5b2db5cab0d 100644
--- a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
+++ b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
@@ -12,9 +12,9 @@ import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.util.FCollectionView;
+import forge.util.MapToAmountUtil;
 import forge.util.maps.LinkedHashMapToAmount;
 import forge.util.maps.MapToAmount;
-import forge.util.maps.MapToAmountUtil;
 
 public class GlobalAttackRestrictions {
 
diff --git a/forge-core/src/main/java/forge/util/FCollection.java b/forge-game/src/main/java/forge/util/FCollection.java
similarity index 100%
rename from forge-core/src/main/java/forge/util/FCollection.java
rename to forge-game/src/main/java/forge/util/FCollection.java
diff --git a/forge-core/src/main/java/forge/util/FCollectionView.java b/forge-game/src/main/java/forge/util/FCollectionView.java
similarity index 100%
rename from forge-core/src/main/java/forge/util/FCollectionView.java
rename to forge-game/src/main/java/forge/util/FCollectionView.java
diff --git a/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java b/forge-game/src/main/java/forge/util/MapToAmountUtil.java
similarity index 94%
rename from forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java
rename to forge-game/src/main/java/forge/util/MapToAmountUtil.java
index 0a9ca5c7d8c..d6d34ec2d9e 100755
--- a/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java
+++ b/forge-game/src/main/java/forge/util/MapToAmountUtil.java
@@ -1,4 +1,4 @@
-package forge.util.maps;
+package forge.util;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -10,8 +10,9 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.collect.Lists;
 
-import forge.util.FCollection;
-import forge.util.FCollectionView;
+import forge.util.maps.LinkedHashMapToAmount;
+import forge.util.maps.MapToAmount;
+
 
 public final class MapToAmountUtil {