diff --git a/src/magic/model/MagicCardList.java b/src/magic/model/MagicCardList.java
index 3e8e43ecb5..68374027d3 100644
--- a/src/magic/model/MagicCardList.java
+++ b/src/magic/model/MagicCardList.java
@@ -31,7 +31,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
             keys[idx] = card.getStateId();
             idx++;
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 
     public long getUnorderedStateId() {
@@ -42,7 +42,7 @@ public class MagicCardList extends ArrayList<MagicCard> implements MagicCopyable
             idx++;
         }
         Arrays.sort(keys);
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 
     public void addToBottom(final MagicCard card) {
diff --git a/src/magic/model/MagicGame.java b/src/magic/model/MagicGame.java
index d0d4d435d0..edef4e80ae 100644
--- a/src/magic/model/MagicGame.java
+++ b/src/magic/model/MagicGame.java
@@ -286,7 +286,7 @@ public class MagicGame {
             statics.getStateId(),
             exiledUntilEndOfTurn.getUnorderedStateId(),
         };
-        stateId = magic.model.MurmurHash3.hash(keys);
+        stateId = MurmurHash3.hash(keys);
         return stateId;
     }
 
diff --git a/src/magic/model/MagicPayedCost.java b/src/magic/model/MagicPayedCost.java
index bc5f42a31c..f2588c14f6 100644
--- a/src/magic/model/MagicPayedCost.java
+++ b/src/magic/model/MagicPayedCost.java
@@ -74,7 +74,7 @@ public class MagicPayedCost implements MagicCopyable {
     }
 
     public long getStateId() {
-        return magic.model.MurmurHash3.hash(new long[] {
+        return MurmurHash3.hash(new long[] {
             MagicObjectImpl.getStateId(target),
             x,
             kicker
diff --git a/src/magic/model/MagicPermanentList.java b/src/magic/model/MagicPermanentList.java
index 77084dab5f..7e69593e08 100644
--- a/src/magic/model/MagicPermanentList.java
+++ b/src/magic/model/MagicPermanentList.java
@@ -35,6 +35,6 @@ public class MagicPermanentList extends ArrayList<MagicPermanent> implements Mag
             keys[idx] = permanent.getStateId();
             idx++;
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/MagicPermanentSet.java b/src/magic/model/MagicPermanentSet.java
index 1fd53148a1..9f77836168 100644
--- a/src/magic/model/MagicPermanentSet.java
+++ b/src/magic/model/MagicPermanentSet.java
@@ -29,6 +29,6 @@ public class MagicPermanentSet extends TreeSet<MagicPermanent> {
             keys[idx] = permanent.getStateId();
             idx++;
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/MagicPlayer.java b/src/magic/model/MagicPlayer.java
index 9e41e87414..a1f2a3f673 100644
--- a/src/magic/model/MagicPlayer.java
+++ b/src/magic/model/MagicPlayer.java
@@ -167,7 +167,7 @@ public class MagicPlayer extends MagicObjectImpl implements MagicSource, MagicTa
             activationPriority.getActivationId(),
             cachedAbilityFlags.hashCode()
         };
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 
     String getIdString() {
diff --git a/src/magic/model/choice/MagicCardChoiceResult.java b/src/magic/model/choice/MagicCardChoiceResult.java
index 1bc2a7d90b..951831d858 100644
--- a/src/magic/model/choice/MagicCardChoiceResult.java
+++ b/src/magic/model/choice/MagicCardChoiceResult.java
@@ -1,13 +1,14 @@
 package magic.model.choice;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import magic.model.MagicCard;
+import magic.model.MagicCopyMap;
+import magic.model.MagicCopyable;
 import magic.model.MagicGame;
 import magic.model.MagicMappable;
-import magic.model.MagicCopyable;
-import magic.model.MagicCopyMap;
-
-import java.util.List;
-import java.util.ArrayList;
+import magic.model.MurmurHash3;
 
 @SuppressWarnings("serial")
 public class MagicCardChoiceResult extends ArrayList<MagicCard> implements MagicMappable<MagicCardChoiceResult>, MagicCopyable {
@@ -63,6 +64,6 @@ public class MagicCardChoiceResult extends ArrayList<MagicCard> implements Magic
             keys[idx] = card.getStateId();
             idx++;
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/choice/MagicDeclareAttackersResult.java b/src/magic/model/choice/MagicDeclareAttackersResult.java
index 919d319c4e..030bb0b6f7 100644
--- a/src/magic/model/choice/MagicDeclareAttackersResult.java
+++ b/src/magic/model/choice/MagicDeclareAttackersResult.java
@@ -1,13 +1,14 @@
 package magic.model.choice;
 
-import magic.model.MagicGame;
-import magic.model.MagicMappable;
-import magic.model.MagicPermanent;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
+import magic.model.MagicGame;
+import magic.model.MagicMappable;
+import magic.model.MagicPermanent;
+import magic.model.MurmurHash3;
+
 @SuppressWarnings("serial")
 public class MagicDeclareAttackersResult extends ArrayList<MagicPermanent> implements MagicMappable<MagicDeclareAttackersResult> {
 
@@ -47,6 +48,6 @@ public class MagicDeclareAttackersResult extends ArrayList<MagicPermanent> imple
             keys[idx] = permanent.getStateId();
             idx++;
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/choice/MagicDeclareBlockersResult.java b/src/magic/model/choice/MagicDeclareBlockersResult.java
index 3b1089b3a9..d8fb17a1fd 100644
--- a/src/magic/model/choice/MagicDeclareBlockersResult.java
+++ b/src/magic/model/choice/MagicDeclareBlockersResult.java
@@ -1,12 +1,13 @@
 package magic.model.choice;
 
-import magic.model.MagicGame;
-import magic.model.MagicMappable;
-import magic.model.score.MagicScoreResult;
-
 import java.util.Arrays;
 import java.util.LinkedList;
 
+import magic.model.MagicGame;
+import magic.model.MagicMappable;
+import magic.model.MurmurHash3;
+import magic.model.score.MagicScoreResult;
+
 /** First creature in array is the attacker, the other creatures are blockers. */
 @SuppressWarnings("serial")
 public class MagicDeclareBlockersResult extends LinkedList<MagicCombatCreature[]> implements MagicMappable<MagicDeclareBlockersResult>, MagicScoreResult {
@@ -81,6 +82,6 @@ public class MagicDeclareBlockersResult extends LinkedList<MagicCombatCreature[]
                 idx++;
             }
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/choice/MagicExcludeResult.java b/src/magic/model/choice/MagicExcludeResult.java
index d310ccdd0c..0798f88a35 100644
--- a/src/magic/model/choice/MagicExcludeResult.java
+++ b/src/magic/model/choice/MagicExcludeResult.java
@@ -1,15 +1,16 @@
 package magic.model.choice;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import magic.model.MagicGame;
 import magic.model.MagicMappable;
 import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
+import magic.model.MurmurHash3;
 import magic.model.action.ChangeStateAction;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 public class MagicExcludeResult implements MagicMappable<MagicExcludeResult> {
 
     private static final List<MagicPermanent> NO_EXCLUDE_PERMANENTS=Collections.emptyList();
@@ -73,6 +74,6 @@ public class MagicExcludeResult implements MagicMappable<MagicExcludeResult> {
         }
         keys[idx] = excludeFlags;
         idx++;
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/choice/MagicPlayChoiceResult.java b/src/magic/model/choice/MagicPlayChoiceResult.java
index 4d0faac067..5e2e0e4f28 100644
--- a/src/magic/model/choice/MagicPlayChoiceResult.java
+++ b/src/magic/model/choice/MagicPlayChoiceResult.java
@@ -3,6 +3,7 @@ package magic.model.choice;
 import magic.model.MagicGame;
 import magic.model.MagicMappable;
 import magic.model.MagicSource;
+import magic.model.MurmurHash3;
 import magic.model.event.MagicSourceActivation;
 
 public class MagicPlayChoiceResult implements MagicMappable<MagicPlayChoiceResult> {
@@ -49,7 +50,7 @@ public class MagicPlayChoiceResult implements MagicMappable<MagicPlayChoiceResul
 
     @Override
     public long getId() {
-        return magic.model.MurmurHash3.hash(new long[] {
+        return MurmurHash3.hash(new long[] {
             sourceActivation.source.getStateId(),
             sourceActivation.activation.hashCode(),
         });
diff --git a/src/magic/model/choice/MagicTargetChoice.java b/src/magic/model/choice/MagicTargetChoice.java
index bccfc1947a..df85a34a40 100644
--- a/src/magic/model/choice/MagicTargetChoice.java
+++ b/src/magic/model/choice/MagicTargetChoice.java
@@ -1,13 +1,21 @@
 package magic.model.choice;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
 import magic.data.GeneralConfig;
+import magic.exception.UndoClickedException;
+import magic.model.IUIGameController;
 import magic.model.MagicCard;
 import magic.model.MagicCardList;
 import magic.model.MagicGame;
 import magic.model.MagicPermanent;
 import magic.model.MagicPlayer;
 import magic.model.MagicSource;
+import magic.model.MurmurHash3;
 import magic.model.event.MagicEvent;
+import magic.model.target.MagicOtherPermanentTargetFilter;
 import magic.model.target.MagicTarget;
 import magic.model.target.MagicTargetFilter;
 import magic.model.target.MagicTargetFilterFactory;
@@ -15,13 +23,6 @@ import magic.model.target.MagicTargetHint;
 import magic.model.target.MagicTargetNone;
 import magic.model.target.MagicTargetPicker;
 import magic.model.target.MagicTargetType;
-import magic.model.target.MagicOtherPermanentTargetFilter;
-import magic.exception.UndoClickedException;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import magic.model.IUIGameController;
 
 public class MagicTargetChoice extends MagicChoice {
     public static final MagicTargetChoice NONE =
@@ -443,7 +444,7 @@ public class MagicTargetChoice extends MagicChoice {
 
     @Override
     public long getStateId() {
-        return magic.model.MurmurHash3.hash(new long[] {
+        return MurmurHash3.hash(new long[] {
             targetDescription.hashCode(),
             targetFilter.hashCode(),
             (targeted ? 1L : -1L),
diff --git a/src/magic/model/event/MagicEvent.java b/src/magic/model/event/MagicEvent.java
index 65fdc9c3c1..781faa0faa 100644
--- a/src/magic/model/event/MagicEvent.java
+++ b/src/magic/model/event/MagicEvent.java
@@ -1,24 +1,10 @@
 package magic.model.event;
 
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 import magic.ai.ArtificialScoringSystem;
-import magic.model.MagicCard;
-import magic.model.MagicCardList;
-import magic.model.MagicColor;
-import magic.model.MagicCopyMap;
-import magic.model.MagicCopyable;
-import magic.model.MagicGame;
-import magic.model.MagicMessage;
-import magic.model.MagicObject;
-import magic.model.MagicObjectImpl;
-import magic.model.MagicPayedCost;
-import magic.model.MagicPermanent;
-import magic.model.MagicPermanentList;
-import magic.model.MagicPlayer;
-import magic.model.MagicSource;
-import magic.model.MagicSubType;
+import magic.model.*;
 import magic.model.action.MagicCardAction;
 import magic.model.action.MagicCardOnStackAction;
 import magic.model.action.MagicItemOnStackAction;
@@ -39,7 +25,6 @@ import magic.model.target.MagicDefaultTargetPicker;
 import magic.model.target.MagicTarget;
 import magic.model.target.MagicTargetNone;
 import magic.model.target.MagicTargetPicker;
-import magic.exception.GameException;
 
 public class MagicEvent implements MagicCopyable {
 
@@ -772,7 +757,7 @@ public class MagicEvent implements MagicCopyable {
     }
 
     public long getStateId() {
-        return magic.model.MurmurHash3.hash(new long[] {
+        return MurmurHash3.hash(new long[] {
             //don't call getStateId if source is MagicItemOnStack to avoid infinite loop
             (source instanceof MagicItemOnStack) ? -1L : source.getStateId(),
             player.getId(),
diff --git a/src/magic/model/event/MagicEventQueue.java b/src/magic/model/event/MagicEventQueue.java
index 9b146c59cf..06a73b547a 100644
--- a/src/magic/model/event/MagicEventQueue.java
+++ b/src/magic/model/event/MagicEventQueue.java
@@ -1,9 +1,10 @@
 package magic.model.event;
 
-import magic.model.MagicCopyMap;
-
 import java.util.LinkedList;
 
+import magic.model.MagicCopyMap;
+import magic.model.MurmurHash3;
+
 @SuppressWarnings("serial")
 public class MagicEventQueue extends LinkedList<MagicEvent> {
 
@@ -22,6 +23,6 @@ public class MagicEventQueue extends LinkedList<MagicEvent> {
             keys[idx] = event.getStateId();
             idx++;
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/mstatic/MagicPermanentStaticMap.java b/src/magic/model/mstatic/MagicPermanentStaticMap.java
index 1c930dcfb7..9b115c042e 100644
--- a/src/magic/model/mstatic/MagicPermanentStaticMap.java
+++ b/src/magic/model/mstatic/MagicPermanentStaticMap.java
@@ -1,8 +1,5 @@
 package magic.model.mstatic;
 
-import magic.model.MagicCopyMap;
-import magic.model.MagicPermanent;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumMap;
@@ -11,6 +8,10 @@ import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import magic.model.MagicCopyMap;
+import magic.model.MagicPermanent;
+import magic.model.MurmurHash3;
+
 public class MagicPermanentStaticMap {
 
     private final Map<MagicLayer,SortedSet<MagicPermanentStatic>> effects =
@@ -118,6 +119,6 @@ public class MagicPermanentStaticMap {
                 keys[idx] = mpstatic.getStatic().hashCode(); idx++;
             }
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/stack/MagicCardOnStack.java b/src/magic/model/stack/MagicCardOnStack.java
index 13126aadde..2c767f8afc 100644
--- a/src/magic/model/stack/MagicCardOnStack.java
+++ b/src/magic/model/stack/MagicCardOnStack.java
@@ -1,6 +1,11 @@
 package magic.model.stack;
 
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 import magic.model.MagicAbility;
 import magic.model.MagicCard;
 import magic.model.MagicCardDefinition;
@@ -11,16 +16,12 @@ import magic.model.MagicObject;
 import magic.model.MagicPayedCost;
 import magic.model.MagicPlayer;
 import magic.model.MagicSource;
+import magic.model.MurmurHash3;
+import magic.model.action.MagicPermanentAction;
 import magic.model.action.MoveCardAction;
 import magic.model.event.MagicCardEvent;
 import magic.model.event.MagicEvent;
 import magic.model.event.MagicSourceActivation;
-import magic.model.action.MagicPermanentAction;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 
 public class MagicCardOnStack extends MagicItemOnStack implements MagicSource {
 
@@ -88,7 +89,7 @@ public class MagicCardOnStack extends MagicItemOnStack implements MagicSource {
 
     @Override
     public long getStateId() {
-        return magic.model.MurmurHash3.hash(new long[] {
+        return MurmurHash3.hash(new long[] {
             super.getStateId(),
             moveLocation.ordinal(),
             fromLocation.ordinal(),
diff --git a/src/magic/model/stack/MagicItemOnStack.java b/src/magic/model/stack/MagicItemOnStack.java
index 0178a70de0..5a0b07b13a 100644
--- a/src/magic/model/stack/MagicItemOnStack.java
+++ b/src/magic/model/stack/MagicItemOnStack.java
@@ -4,6 +4,7 @@ import magic.model.MagicAbility;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicColor;
 import magic.model.MagicCopyMap;
+import magic.model.MagicCounterType;
 import magic.model.MagicGame;
 import magic.model.MagicMappable;
 import magic.model.MagicObject;
@@ -12,10 +13,9 @@ import magic.model.MagicPlayer;
 import magic.model.MagicSource;
 import magic.model.MagicSubType;
 import magic.model.MagicType;
-import magic.model.MagicCounterType;
+import magic.model.MurmurHash3;
 import magic.model.event.MagicActivation;
 import magic.model.event.MagicEvent;
-import magic.model.choice.MagicTargetChoice;
 import magic.model.target.MagicTarget;
 import magic.model.target.MagicTargetFilter;
 import magic.model.target.MagicTargetNone;
@@ -214,12 +214,12 @@ public abstract class MagicItemOnStack extends MagicObjectImpl implements MagicT
         for (int i = 0; i < arr.length; i++) {
             keys[i] = MagicObjectImpl.getStateId(arr[i]);
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 
     @Override
     public long getStateId() {
-        return magic.model.MurmurHash3.hash(new long[] {
+        return MurmurHash3.hash(new long[] {
             source     != null ? source.getStateId() : -1L,
             controller != null ? controller.getId()  : -1L,
             activation != null ? activation.hashCode()   : -1L,
diff --git a/src/magic/model/stack/MagicStack.java b/src/magic/model/stack/MagicStack.java
index 268868ef8b..f88b793604 100644
--- a/src/magic/model/stack/MagicStack.java
+++ b/src/magic/model/stack/MagicStack.java
@@ -1,13 +1,14 @@
 package magic.model.stack;
 
+import java.util.Arrays;
+import java.util.LinkedList;
+
 import magic.model.MagicCopyMap;
 import magic.model.MagicPlayer;
 import magic.model.MagicSource;
+import magic.model.MurmurHash3;
 import magic.model.event.MagicActivation;
 
-import java.util.Arrays;
-import java.util.LinkedList;
-
 @SuppressWarnings("serial")
 public class MagicStack extends LinkedList<MagicItemOnStack> {
 
@@ -127,6 +128,6 @@ public class MagicStack extends LinkedList<MagicItemOnStack> {
             keys[idx] = item.getStateId();
             idx++;
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }
diff --git a/src/magic/model/trigger/MagicPermanentTriggerMap.java b/src/magic/model/trigger/MagicPermanentTriggerMap.java
index b2c57ee05c..da115ff49c 100644
--- a/src/magic/model/trigger/MagicPermanentTriggerMap.java
+++ b/src/magic/model/trigger/MagicPermanentTriggerMap.java
@@ -1,9 +1,5 @@
 package magic.model.trigger;
 
-import magic.model.MagicCopyMap;
-import magic.model.MagicPermanent;
-import magic.exception.GameException;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumMap;
@@ -11,6 +7,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.PriorityQueue;
 
+import magic.exception.GameException;
+import magic.model.MagicCopyMap;
+import magic.model.MagicPermanent;
+import magic.model.MurmurHash3;
+
 public class MagicPermanentTriggerMap {
 
     private final Map<MagicTriggerType,PriorityQueue<MagicPermanentTrigger>> effects =
@@ -97,6 +98,6 @@ public class MagicPermanentTriggerMap {
                 keys[idx] = mptrigger.getTrigger().hashCode(); idx++;
             }
         }
-        return magic.model.MurmurHash3.hash(keys);
+        return MurmurHash3.hash(keys);
     }
 }