diff --git a/src/magic/cardBuilder/renderers/CardBuilder.java b/src/magic/cardBuilder/renderers/CardBuilder.java
index 58187d7e86..e112ca1428 100644
--- a/src/magic/cardBuilder/renderers/CardBuilder.java
+++ b/src/magic/cardBuilder/renderers/CardBuilder.java
@@ -7,7 +7,7 @@ import java.awt.image.BufferedImage;
 import magic.model.MagicAbility;
 import magic.model.MagicSubType;
 import magic.model.MagicType;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 
 public class CardBuilder {
 
diff --git a/src/magic/cardBuilder/renderers/Frame.java b/src/magic/cardBuilder/renderers/Frame.java
index 45c4017c60..dc5f9271a4 100644
--- a/src/magic/cardBuilder/renderers/Frame.java
+++ b/src/magic/cardBuilder/renderers/Frame.java
@@ -16,7 +16,7 @@ import magic.model.MagicManaType;
 import magic.model.MagicSubType;
 import magic.model.MagicType;
 import magic.model.event.MagicManaActivation;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.cardBuilder.ResourceManager;
 
 public class Frame {
diff --git a/src/magic/cardBuilder/renderers/ImageFrame.java b/src/magic/cardBuilder/renderers/ImageFrame.java
index 480bcc0bf7..555034fa21 100644
--- a/src/magic/cardBuilder/renderers/ImageFrame.java
+++ b/src/magic/cardBuilder/renderers/ImageFrame.java
@@ -11,7 +11,7 @@ import magic.model.MagicColor;
 import magic.model.MagicType;
 import magic.ui.ImageFileIO;
 import magic.ui.MagicImages;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.cardBuilder.ResourceManager;
 import magic.ui.utility.GraphicsUtils;
 import magic.utility.MagicFileSystem;
diff --git a/src/magic/cardBuilder/renderers/OracleText.java b/src/magic/cardBuilder/renderers/OracleText.java
index af095f0dca..134510b0c5 100644
--- a/src/magic/cardBuilder/renderers/OracleText.java
+++ b/src/magic/cardBuilder/renderers/OracleText.java
@@ -26,7 +26,7 @@ import java.util.TreeMap;
 import magic.model.MagicColor;
 import magic.model.MagicType;
 import magic.ui.MagicImages;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.cardBuilder.ResourceManager;
 import magic.ui.utility.GraphicsUtils;
 
diff --git a/src/magic/cardBuilder/renderers/Overlay.java b/src/magic/cardBuilder/renderers/Overlay.java
index 9105ca4aef..5442f2e58c 100644
--- a/src/magic/cardBuilder/renderers/Overlay.java
+++ b/src/magic/cardBuilder/renderers/Overlay.java
@@ -8,7 +8,7 @@ import java.util.stream.Collectors;
 
 import magic.model.MagicAbility;
 import magic.model.MagicColor;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.cardBuilder.ResourceManager;
 
 public class Overlay {
diff --git a/src/magic/cardBuilder/renderers/PTFrame.java b/src/magic/cardBuilder/renderers/PTFrame.java
index b33fe7a51d..46a52ef858 100644
--- a/src/magic/cardBuilder/renderers/PTFrame.java
+++ b/src/magic/cardBuilder/renderers/PTFrame.java
@@ -16,7 +16,7 @@ import magic.model.MagicAbility;
 import magic.model.MagicColor;
 import magic.model.MagicSubType;
 import magic.model.MagicType;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.cardBuilder.ResourceManager;
 
 public class PTFrame {
diff --git a/src/magic/cardBuilder/renderers/TitleFrame.java b/src/magic/cardBuilder/renderers/TitleFrame.java
index 5b599e12db..961b88a322 100644
--- a/src/magic/cardBuilder/renderers/TitleFrame.java
+++ b/src/magic/cardBuilder/renderers/TitleFrame.java
@@ -19,7 +19,7 @@ import javax.swing.ImageIcon;
 import magic.data.MagicIcon;
 import magic.model.MagicType;
 import magic.ui.MagicImages;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.cardBuilder.ResourceManager;
 
 public class TitleFrame {
diff --git a/src/magic/cardBuilder/renderers/TypeLine.java b/src/magic/cardBuilder/renderers/TypeLine.java
index e1bc52c35f..b473aec9b1 100644
--- a/src/magic/cardBuilder/renderers/TypeLine.java
+++ b/src/magic/cardBuilder/renderers/TypeLine.java
@@ -9,7 +9,7 @@ import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 
 import magic.model.MagicType;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.cardBuilder.ResourceManager;
 
 public class TypeLine {
diff --git a/src/magic/cardBuilder/IRenderableCard.java b/src/magic/model/IRenderableCard.java
similarity index 92%
rename from src/magic/cardBuilder/IRenderableCard.java
rename to src/magic/model/IRenderableCard.java
index 910ee44756..5bfbb556be 100644
--- a/src/magic/cardBuilder/IRenderableCard.java
+++ b/src/magic/model/IRenderableCard.java
@@ -1,19 +1,10 @@
-package magic.cardBuilder;
+package magic.model;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.HashSet;
-
-import magic.model.MagicAbility;
-import magic.model.MagicCardDefinition;
-import magic.model.MagicColor;
-import magic.model.MagicManaCost;
-import magic.model.MagicPermanent;
-import magic.model.MagicSubType;
-import magic.model.MagicType;
-import magic.model.MagicCostManaType;
 import magic.model.event.MagicManaActivation;
 
 public interface IRenderableCard {
diff --git a/src/magic/model/MagicCard.java b/src/magic/model/MagicCard.java
index 33c7ff0ee2..d23e845194 100644
--- a/src/magic/model/MagicCard.java
+++ b/src/magic/model/MagicCard.java
@@ -17,7 +17,6 @@ import magic.model.stack.MagicItemOnStack;
 import magic.model.target.MagicTarget;
 import magic.model.target.MagicTargetFilter;
 import magic.model.target.MagicTargetType;
-import magic.cardBuilder.IRenderableCard;
 
 public class MagicCard
     extends MagicObjectImpl
diff --git a/src/magic/model/MagicCardDefinition.java b/src/magic/model/MagicCardDefinition.java
index e8a2e108a6..b32a52749e 100644
--- a/src/magic/model/MagicCardDefinition.java
+++ b/src/magic/model/MagicCardDefinition.java
@@ -15,7 +15,6 @@ import magic.model.trigger.ThisCycleTrigger;
 import magic.model.trigger.ThisDrawnTrigger;
 import magic.model.trigger.ThisPutIntoGraveyardTrigger;
 import magic.model.trigger.ThisSpellIsCastTrigger;
-import magic.cardBuilder.IRenderableCard;
 import magic.utility.MagicFileSystem;
 
 public class MagicCardDefinition implements MagicAbilityStore, IRenderableCard {
diff --git a/src/magic/model/MagicPermanent.java b/src/magic/model/MagicPermanent.java
index c9b618a9cb..7d27201a85 100644
--- a/src/magic/model/MagicPermanent.java
+++ b/src/magic/model/MagicPermanent.java
@@ -34,7 +34,6 @@ import magic.model.target.MagicTargetFilterFactory;
 import magic.model.trigger.EntersBattlefieldTrigger;
 import magic.model.trigger.MagicTrigger;
 import magic.model.trigger.MagicTriggerType;
-import magic.cardBuilder.IRenderableCard;
 
 public class MagicPermanent extends MagicObjectImpl implements MagicSource, MagicTarget, Comparable<MagicPermanent>, MagicMappable<MagicPermanent>, IRenderableCard {
 
diff --git a/src/magic/ui/MagicImages.java b/src/magic/ui/MagicImages.java
index ebd8ffdd5c..fa855fc76d 100644
--- a/src/magic/ui/MagicImages.java
+++ b/src/magic/ui/MagicImages.java
@@ -12,7 +12,7 @@ import java.util.Map;
 import javax.swing.ImageIcon;
 
 import magic.cardBuilder.renderers.CardBuilder;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import magic.data.CardImageFile;
 import magic.data.GeneralConfig;
 import magic.data.LRUCache;
diff --git a/src/magic/utility/MagicFileSystem.java b/src/magic/utility/MagicFileSystem.java
index 9dc59d3a1e..1f74b6cd34 100644
--- a/src/magic/utility/MagicFileSystem.java
+++ b/src/magic/utility/MagicFileSystem.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import magic.data.GeneralConfig;
 import magic.model.MagicCardDefinition;
-import magic.cardBuilder.IRenderableCard;
+import magic.model.IRenderableCard;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;