diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/CardInfo.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
similarity index 82%
rename from Mage.Client/src/main/java/org/mage/plugins/card/images/CardInfo.java
rename to Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
index 4c76ccd8e6e..9bfb9ada0b3 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/CardInfo.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java
@@ -4,7 +4,7 @@ package org.mage.plugins.card.images;
  *
  * @author North
  */
-public class CardInfo {
+public class CardDownloadData {
 
     private String name;
     private String downloadName;
@@ -19,15 +19,15 @@ public class CardInfo {
     private boolean splitCard;
     private boolean usesVariousArt;
 
-    public CardInfo(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type) {
+    public CardDownloadData(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type) {
         this(name, set, collectorId, usesVariousArt, type, false);
     }
 
-    public CardInfo(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, boolean token) {
+    public CardDownloadData(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, boolean token) {
         this(name, set, collectorId, usesVariousArt, type, token, false, false);
     }
 
-    public CardInfo(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, boolean token, boolean twoFacedCard, boolean secondSide) {
+    public CardDownloadData(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type, boolean token, boolean twoFacedCard, boolean secondSide) {
         this.name = name;
         this.set = set;
         this.collectorId = collectorId;
@@ -38,7 +38,7 @@ public class CardInfo {
         this.secondSide = secondSide;
     }
 
-    public CardInfo(final CardInfo card) {
+    public CardDownloadData(final CardDownloadData card) {
         this.name = card.name;
         this.set = card.set;
         this.collectorId = card.collectorId;
@@ -57,7 +57,7 @@ public class CardInfo {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        final CardInfo other = (CardInfo) obj;
+        final CardDownloadData other = (CardDownloadData) obj;
         if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
             return false;
         }
@@ -96,10 +96,6 @@ public class CardInfo {
         return collectorId;
     }
 
-    public void setCollectorId(Integer collectorId) {
-        this.collectorId = collectorId;
-    }
-
     public String getName() {
         return name;
     }
@@ -160,10 +156,6 @@ public class CardInfo {
         return type;
     }
 
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
     public boolean getUsesVariousArt() {
         return usesVariousArt;
     }
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
index 3b0c602ee08..b985cf4aa95 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
@@ -46,7 +46,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
     private JButton closeButton;
     private JButton startDownloadButton;
     private int cardIndex;
-    private ArrayList<CardInfo> cards;
+    private ArrayList<CardDownloadData> cards;
     private JComboBox jComboBox1;
     private JLabel jLabel1;
     private static boolean offlineMode = false;
@@ -67,7 +67,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
     }
 
     public static void startDownload(JFrame frame, List<Card> allCards, String imagesPath) {
-        ArrayList<CardInfo> cards = getNeededCards(allCards, imagesPath);
+        ArrayList<CardDownloadData> cards = getNeededCards(allCards, imagesPath);
 
         /*
          * if (cards == null || cards.size() == 0) {
@@ -99,33 +99,15 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
         this.cancel = cancel;
     }
 
-    public DownloadPictures(ArrayList<CardInfo> cards, String imagesPath) {
+    public DownloadPictures(ArrayList<CardDownloadData> cards, String imagesPath) {
         this.cards = cards;
         this.imagesPath = imagesPath;
 
-        //addr = new JTextField("Proxy Address");
-        //port = new JTextField("Proxy Port");
         bar = new JProgressBar(this);
 
         JPanel p0 = new JPanel();
         p0.setLayout(new BoxLayout(p0, BoxLayout.Y_AXIS));
 
-        // Proxy Choice
-        /*ButtonGroup bg = new ButtonGroup();
-        String[] labels = { "No Proxy", "HTTP Proxy", "SOCKS Proxy" };
-        for (int i = 0; i < types.length; i++) {
-            JRadioButton rb = new JRadioButton(labels[i]);
-            rb.addChangeListener(new ProxyHandler(i));
-            bg.add(rb);
-            p0.add(rb);
-            if (i == 0)
-                rb.setSelected(true);
-        }*/
-
-        // Proxy config
-        //p0.add(addr);
-        //p0.add(port);
-
         p0.add(Box.createVerticalStrut(5));
         jLabel1 = new JLabel();
         jLabel1.setText("Please select server:");
@@ -210,7 +192,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
         TFile file;
         for (Card card : allCards) {
             if (card.getCardNumber() > 0 && !card.getExpansionSetCode().isEmpty()) {
-                CardInfo url = new CardInfo(card.getName(), card.getExpansionSetCode(), card.getCardNumber(),card.getUsesVariousArt(),0 , false, card.canTransform(), card.isNightCard());
+                CardDownloadData url = new CardDownloadData(card.getName(), card.getExpansionSetCode(), card.getCardNumber(),card.getUsesVariousArt(),0 , false, card.canTransform(), card.isNightCard());
                 file = new TFile(CardImageUtils.getImagePath(url, imagesPath));
                 if (!file.exists()) {
                     return true;
@@ -220,14 +202,14 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
         return false;
     }
 
-    private static ArrayList<CardInfo> getNeededCards(List<Card> allCards, String imagesPath) {
+    private static ArrayList<CardDownloadData> getNeededCards(List<Card> allCards, String imagesPath) {
 
-        ArrayList<CardInfo> cardsToDownload = new ArrayList<CardInfo>();
+        ArrayList<CardDownloadData> cardsToDownload = new ArrayList<CardDownloadData>();
 
         /**
          * read all card names and urls
          */
-        ArrayList<CardInfo> allCardsUrls = new ArrayList<CardInfo>();
+        ArrayList<CardDownloadData> allCardsUrls = new ArrayList<CardDownloadData>();
         HashSet<String> ignoreUrls = SettingsManager.getIntance().getIgnoreUrls();
 
         try {
@@ -237,7 +219,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                 if (card.getCardNumber() > 0 && !card.getExpansionSetCode().isEmpty()
                         && !ignoreUrls.contains(card.getExpansionSetCode())) {
                     String cardName = card.getName();
-                    CardInfo url = new CardInfo(cardName, card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), card.isNightCard());
+                    CardDownloadData url = new CardDownloadData(cardName, card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), card.isNightCard());
                     if (url.getUsesVariousArt()) {
                         url.setDownloadName(card.getClass().getName().replace(card.getClass().getPackage().getName() + ".", ""));
                     }
@@ -253,14 +235,14 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                         // it has the same expansion set code and card number as original one
                         // second side = true;
                         Card secondSide = card.getSecondCardFace();
-                        url = new CardInfo(secondSide.getName(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), true);
+                        url = new CardDownloadData(secondSide.getName(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), true);
                         allCardsUrls.add(url);
                     }
                     if (card.isFlipCard()) {
                         if (card.getFlipCardName() == null || card.getFlipCardName().trim().isEmpty()) {
                             throw new IllegalStateException("Flipped card can't have empty name.");
                         }
-                        url = new CardInfo(card.getFlipCardName(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), card.isNightCard());
+                        url = new CardDownloadData(card.getFlipCardName(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), 0, false, card.canTransform(), card.isNightCard());
                         url.setFlipCard(true);
                         url.setFlippedSide(true);
                         allCardsUrls.add(url);
@@ -286,14 +268,14 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
         /**
          * check to see which cards we already have
          */
-        for (CardInfo card : allCardsUrls) {
+        for (CardDownloadData card : allCardsUrls) {
             file = new TFile(CardImageUtils.getImagePath(card, imagesPath));
             if (!file.exists()) {
                 cardsToDownload.add(card);
             }
         }
 
-        for (CardInfo card : cardsToDownload) {
+        for (CardDownloadData card : cardsToDownload) {
             if (card.isToken()) {
                 log.info("Card to download: " + card.getName() + " (Token) ");
             } else {
@@ -308,8 +290,8 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
         return cardsToDownload;
     }
 
-    private static ArrayList<CardInfo> getTokenCardUrls() throws RuntimeException {
-        ArrayList<CardInfo> list = new ArrayList<CardInfo>();
+    private static ArrayList<CardDownloadData> getTokenCardUrls() throws RuntimeException {
+        ArrayList<CardDownloadData> list = new ArrayList<CardDownloadData>();
         InputStream in = DownloadPictures.class.getClassLoader().getResourceAsStream("card-pictures-tok.txt");
 
         if (in == null) {
@@ -332,15 +314,15 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                     if (params.length >= 4) {
                         if (params[1].toLowerCase().equals("generate") && params[2].startsWith("TOK:")) {
                             String set = params[2].substring(4);
-                            CardInfo card = new CardInfo(params[3], set, 0, false, 0, true);
+                            CardDownloadData card = new CardDownloadData(params[3], set, 0, false, 0, true);
                             list.add(card);
                         } else if (params[1].toLowerCase().equals("generate") && params[2].startsWith("EMBLEM:")) {
                             String set = params[2].substring(7);
-                            CardInfo card = new CardInfo("Emblem " + params[3], set, 0, false,0, true);
+                            CardDownloadData card = new CardDownloadData("Emblem " + params[3], set, 0, false,0, true);
                             list.add(card);
                         } else if (params[1].toLowerCase().equals("generate") && params[2].startsWith("EMBLEM-:")) {
                             String set = params[2].substring(8);
-                            CardInfo card = new CardInfo(params[3] + " Emblem", set, 0, false, 0, true);
+                            CardDownloadData card = new CardDownloadData(params[3] + " Emblem", set, 0, false, 0, true);
                             list.add(card);
                         }
                     } else {
@@ -408,7 +390,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
             for (int i = 0; i < cards.size() && !cancel; i++) {
                 try {
 
-                    CardInfo card = cards.get(i);
+                    CardDownloadData card = cards.get(i);
 
                     log.info("Downloading card: " + card.getName() + " (" + card.getSet() + ")");
 
@@ -457,10 +439,10 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
 
     private final class DownloadTask implements Runnable {
 
-        private CardInfo card;
+        private CardDownloadData card;
         private URL url;
 
-        public DownloadTask(CardInfo card, URL url) {
+        public DownloadTask(CardDownloadData card, URL url) {
             this.card = card;
             this.url = url;
         }
@@ -573,10 +555,10 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
             bar.setString(String.format("%d of %d cards finished! Please wait! [%.1f Mb]",
                     card, count, mb));
         } else {
-            Iterator<CardInfo> cardsIterator = DownloadPictures.this.cards.iterator();
+            Iterator<CardDownloadData> cardsIterator = DownloadPictures.this.cards.iterator();
             while (cardsIterator.hasNext()) {
-                CardInfo cardInfo = cardsIterator.next();
-                TFile file = new TFile(CardImageUtils.getImagePath(cardInfo, imagesPath));
+                CardDownloadData cardDownloadData = cardsIterator.next();
+                TFile file = new TFile(CardImageUtils.getImagePath(cardDownloadData, imagesPath));
                 if (file.exists()) {
                     cardsIterator.remove();
                 }
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
index e59c2deac5e..cb6d9e0dbeb 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -71,7 +71,7 @@ public class ImageCache {
                         Integer type = Integer.parseInt(m.group(3));
                         Integer collectorId = Integer.parseInt(m.group(4));
 
-                        CardInfo info = new CardInfo(name, set, collectorId, usesVariousArt, type);
+                        CardDownloadData info = new CardDownloadData(name, set, collectorId, usesVariousArt, type);
 
                         if (collectorId == 0) {
                             info.setToken(true);
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
index 9634efb0770..75172f7c9d0 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
@@ -4,12 +4,12 @@ import de.schlichtherle.truezip.file.TFile;
 import java.util.HashMap;
 import mage.client.constants.Constants;
 import mage.client.dialog.PreferencesDialog;
-import org.mage.plugins.card.images.CardInfo;
+import org.mage.plugins.card.images.CardDownloadData;
 import org.mage.plugins.card.properties.SettingsManager;
 
 public class CardImageUtils {
 
-    private static HashMap<CardInfo, String> pathCache = new HashMap<CardInfo, String>();
+    private static HashMap<CardDownloadData, String> pathCache = new HashMap<CardDownloadData, String>();
 
     /**
      * Get path to image for specific card.
@@ -18,7 +18,7 @@ public class CardImageUtils {
      *            card to get path for
      * @return String if image exists, else null
      */
-    public static String getImagePath(CardInfo card) {
+    public static String getImagePath(CardDownloadData card) {
         String filePath;
 
         TFile file;
@@ -51,19 +51,19 @@ public class CardImageUtils {
         }
     }
 
-    private static String getTokenImagePath(CardInfo card) {
+    private static String getTokenImagePath(CardDownloadData card) {
         String useDefault = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_USE_DEFAULT, "true");
         String path = useDefault.equals("true") ? null : PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PATH, null);
         String filename = getImagePath(card, path);
 
         TFile file = new TFile(filename);
         if (!file.exists()) {
-            CardInfo updated = new CardInfo(card);
+            CardDownloadData updated = new CardDownloadData(card);
             updated.setName(card.getName() + " 1");
             filename = getImagePath(updated, path);
             file = new TFile(filename);
             if (!file.exists()) {
-                updated = new CardInfo(card);
+                updated = new CardDownloadData(card);
                 updated.setName(card.getName() + " 2");
                 filename = getImagePath(updated, path);
             }
@@ -72,10 +72,10 @@ public class CardImageUtils {
         return filename;
     }
 
-    private static String searchForCardImage(CardInfo card) {
+    private static String searchForCardImage(CardDownloadData card) {
         TFile file;
         String path;
-        CardInfo c = new CardInfo(card);
+        CardDownloadData c = new CardDownloadData(card);
 
         for (String set : SettingsManager.getIntance().getTokenLookupOrder()) {
             c.setSet(set);
@@ -100,7 +100,7 @@ public class CardImageUtils {
         return set;
     }
 
-    private static String getImageDir(CardInfo card, String imagesPath) {
+    private static String getImageDir(CardDownloadData card, String imagesPath) {
         if (card.getSet() == null) {
             return "";
         }
@@ -129,7 +129,7 @@ public class CardImageUtils {
         }
     }
 
-    public static String getImagePath(CardInfo card, String imagesPath) {
+    public static String getImagePath(CardDownloadData card, String imagesPath) {
         String imageDir = getImageDir(card, imagesPath);
         String imageName;