diff --git a/src/card/Card.java b/src/card/Card.java
new file mode 100644
index 0000000..83c2c26
--- /dev/null
+++ b/src/card/Card.java
@@ -0,0 +1,89 @@
+package card;
+import game.Game;
+
+import java.awt.Color;
+
+/*
+ * COLORS:
+ * GREEN
+ * RED
+ * YELLOW
+ * WHITE
+ * BLUE
+ * (COLORED)
+ */
+public class Card {
+	protected int color;
+	protected int value;
+	protected int playerId;
+	protected Game g;
+		
+	public Card(int color, int value, int playerId, Game g){
+		this.color = color;
+		this.value = value;
+		this.playerId = playerId;
+		this.g = g;
+	}
+	
+	@Override
+	public String toString(){
+		return "Color: " + color + "; Value: " + value;
+	}
+	
+	public Color getColor(){
+		Color c = null;
+		switch(color){
+		case 0:
+			c = Color.green;
+			break;
+		case 1:
+			c = Color.red;
+			break;
+		case 2:
+			c = Color.yellow;
+			break;
+		case 3:
+			c = Color.white;
+			break;
+		case 4:
+			c = Color.blue;
+			break;
+		}
+		return c;
+	}
+	
+	public static String intColorToText(int id){
+		String color = "";
+		switch(id){
+		case 0:
+			color = "green";
+			break;
+		case 1:
+			color = "red";
+			break;
+		case 2:
+			color = "yellow";
+			break;
+		case 3:
+			color = "white";
+			break;
+		case 4:
+			color = "blue";
+			break;
+		}
+		return color;
+	}
+	
+	public int getColorInt(){
+		return color;
+	}
+	
+	public int getValue(){
+		return value;
+	}
+	
+	public void setProps(Card c){
+		this.value = c.getValue();
+		this.color = c.getColorInt();
+	}
+}
\ No newline at end of file
diff --git a/src/card/SwingCard.java b/src/card/SwingCard.java
new file mode 100644
index 0000000..e6ebd31
--- /dev/null
+++ b/src/card/SwingCard.java
@@ -0,0 +1,116 @@
+package card;
+
+import game.Game;
+
+import java.awt.Color;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+
+public class SwingCard extends Card {
+	JLabel face;
+	
+	public SwingCard(int color, int value, int playerId, Game g) {
+		super(color, value, playerId, g);
+	}
+	
+	public void setFace(JLabel face){
+		this.face = face;
+		face.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+		//uiCards[i].setHorizontalAlignment(SwingConstants.CENTER);
+		face.setFont(g.getFont().deriveFont(g.getFontSize()*2));
+		addMouseListener();
+	}
+	
+	public JLabel getFace(){
+		return face;
+	}
+
+	
+	private void addMouseListener(){
+		face.addMouseListener(new MouseListener() {
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				if(face.getBackground() == Color.pink){
+					g.removeSelectedCards();
+					face.setBackground(Color.black);
+					//System.out.println("Removed card #" + clickedCard + "(" + card.getColorInt() + ", " + card.getValue() + ")");
+					if(g.getSelectedCards() == 0){
+						g.resetMoveValues();
+					}
+				}
+				if(!g.isUseColor() && !g.isUseValue() && !g.isTrashCard() && !g.isPlaceCard()){
+					//System.out.println("Please choose move type first");
+					return;
+				}
+				if(playerId == g.getCurrentPlayerIndex()){
+					if(g.isUseColor() || g.isUseValue()){
+						//System.out.println("Please don't select your own cards!");
+						return;
+					} else if((g.isTrashCard() || g.isPlaceCard()) && g.getSelectedCards() == 1){
+						//System.out.println("You already selected a card!");
+						return;
+					}
+				} else if(playerId != g.getCurrentPlayerIndex() && (g.isTrashCard() || g.isPlaceCard())){
+					//System.out.println("Please select your own cards");
+					return;
+				}
+				if(g.getSelectedPlayer() == -1){
+					g.setSelectedPlayer(playerId);
+					g.setChosenColor(color);
+					g.setChosenValue(value);
+					g.addSelectedCards();
+					face.setBackground(Color.pink);
+					return;
+				}
+				if(g.getSelectedPlayer() != playerId){
+					//System.out.println("Please choose a card of the selected player or unselect all cards and choose another player.");
+					return;
+				}
+				if(g.getChosenColor() == -1){
+					g.setChosenColor(color);
+				}
+				if(g.getChosenValue() == -1){
+					g.setChosenValue(value);
+				}
+				if(face.getBackground() == Color.black){
+					if(g.isUseColor()){
+						if(g.getChosenColor() == color){
+							if(face.getBackground() != Color.pink){
+								g.addSelectedCards();
+								face.setBackground(Color.pink);
+								//System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
+							}
+						}
+					} else if(g.isUseValue()){
+						if(g.getChosenValue() == value){
+							if(face.getBackground() != Color.pink){
+								g.addSelectedCards();
+								face.setBackground(Color.pink);
+								//System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
+							}
+						}
+					}
+				}
+			}
+			
+			@Override
+			public void mousePressed(MouseEvent e) {
+			}
+			
+			@Override
+			public void mouseExited(MouseEvent e) {
+			}
+			
+			@Override
+			public void mouseEntered(MouseEvent e) {
+			}
+			
+			@Override
+			public void mouseClicked(MouseEvent e) {
+			}
+		});
+	}
+}
diff --git a/src/game/AbstractGame.java b/src/game/AbstractGame.java
new file mode 100644
index 0000000..a591202
--- /dev/null
+++ b/src/game/AbstractGame.java
@@ -0,0 +1,5 @@
+package game;
+
+public class AbstractGame {
+
+}
diff --git a/src/game/Card.java b/src/game/Card.java
deleted file mode 100644
index 8fbd3b9..0000000
--- a/src/game/Card.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package game;
-import java.awt.Color;
-
-/*
- * COLORS:
- * GREEN
- * RED
- * YELLOW
- * WHITE
- * BLUE
- * (COLORED)
- */
-public class Card {
-	private int color;
-	private int value;
-	
-	public Card(int color, int value){
-		this.color = color;
-		this.value = value;
-	}
-	
-	@Override
-	public String toString(){
-		return "Color: " + color + "; Value: " + value;
-	}
-	
-	public Color getColor(){
-		Color c = null;
-		switch(color){
-		case 0:
-			c = Color.green;
-			break;
-		case 1:
-			c = Color.red;
-			break;
-		case 2:
-			c = Color.yellow;
-			break;
-		case 3:
-			c = Color.white;
-			break;
-		case 4:
-			c = Color.blue;
-			break;
-		}
-		return c;
-	}
-	
-	public static String intColorToText(int id){
-		String color = "";
-		switch(id){
-		case 0:
-			color = "green";
-			break;
-		case 1:
-			color = "red";
-			break;
-		case 2:
-			color = "yellow";
-			break;
-		case 3:
-			color = "white";
-			break;
-		case 4:
-			color = "blue";
-			break;
-		}
-		return color;
-	}
-	
-	public int getColorInt(){
-		return color;
-	}
-	
-	public int getValue(){
-		return value;
-	}
-}
\ No newline at end of file
diff --git a/src/game/ConsoleGame.java b/src/game/ConsoleGame.java
new file mode 100644
index 0000000..da50352
--- /dev/null
+++ b/src/game/ConsoleGame.java
@@ -0,0 +1,5 @@
+package game;
+
+public class ConsoleGame {
+
+}
diff --git a/src/game/Game.java b/src/game/Game.java
index 9292b92..528ce2b 100644
--- a/src/game/Game.java
+++ b/src/game/Game.java
@@ -1,7 +1,7 @@
 package game;
 import player.AbstractPlayer;
 import player.SwingPlayer;
-import static game.Card.intColorToText;
+import static card.Card.intColorToText;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -23,6 +23,9 @@
 
 import org.json.*;
 
+import card.Card;
+import card.SwingCard;
+
 public class Game {
 	/*
 	 * COLORS:
@@ -120,6 +123,10 @@
 			root = new JSONObject(tokener);
 			difficulty = root.getInt("difficulty");
 			fontSize = root.getInt("fontSize");
+			if(difficulty < 0) difficulty = 0;
+			if(fontSize <= 0) fontSize = 20;
+			System.out.println("FontSize: " + fontSize);
+			System.out.println("Difficulty: " + difficulty);
 		} catch (JSONException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -143,7 +150,7 @@
 	private void createPlayers(){
 		players = new AbstractPlayer[NR_PLAYERS];
 		for(int i=0; i<NR_PLAYERS; ++i){
-			players[i] = new SwingPlayer(CARDS_PER_PLAYER, this);
+			players[i] = new SwingPlayer(CARDS_PER_PLAYER, this, i);
 		}
 	}
 	
@@ -166,7 +173,7 @@
 				p = randomPosition();
 			} while(tmp_cards[p.x][p.y] == 0);
 			tmp_cards[p.x][p.y]--;
-			cards.add(new Card(p.x, (p.y + 1)));
+			cards.add(new SwingCard(p.x, (p.y + 1), -1, this));
 		}
 	}
 	
@@ -467,12 +474,12 @@
 	}
 	
 	private void dealCard(int cardID, int playerID){
-		Card card;
+		SwingCard card;
 		if(CARDS_IN_DECK > 0){
 			int index = random(CARDS_IN_DECK--);
-			card = cards.remove(index);
+			card = (SwingCard) cards.remove(index);
 		} else {
-			card = new Card(3, -1);
+			card = new SwingCard(3, -1, playerID, this);
 		}
 		players[playerID].setCard(cardID, card);
 	}
@@ -482,7 +489,7 @@
 		for(; dealtCards < CARDS_PER_PLAYER; ++dealtCards){
 			for(int i=0; i<NR_PLAYERS; ++i){
 				int index = random(CARDS_IN_DECK--);
-				Card card = cards.remove(index);
+				SwingCard card = (SwingCard) cards.remove(index);
 				players[i].setCard(dealtCards, card);
 			}
 		}
diff --git a/src/game/SwingGame.java b/src/game/SwingGame.java
new file mode 100644
index 0000000..8078ba8
--- /dev/null
+++ b/src/game/SwingGame.java
@@ -0,0 +1,5 @@
+package game;
+
+public class SwingGame {
+
+}
diff --git a/src/player/AbstractPlayer.java b/src/player/AbstractPlayer.java
index d93143d..956db1c 100644
--- a/src/player/AbstractPlayer.java
+++ b/src/player/AbstractPlayer.java
@@ -1,21 +1,26 @@
 package player;
 
-import game.Card;
+import card.Card;
 import game.Game;
 
 public abstract class AbstractPlayer {
-	private Card[] cards;
-	private String[] cardInfos;
+	protected Card[] cards;
+	protected String[] cardInfos;
+	protected int Id;
 	protected Game g;
 	
-	public AbstractPlayer(int cards, Game g){
-		this.cards = new Card[cards];
-		cardInfos = new String[cards];
+	public AbstractPlayer(int nrOfCards, Game g, int Id){
+		cards = new Card[nrOfCards];
+		cardInfos = new String[nrOfCards];
 		this.g = g;
+		this.Id = Id;
+		for(int i=0; i<nrOfCards; ++i){
+			cards[i] = new Card(0, 0, Id, g);
+		}
 	}
 	
 	public void setCard(int pos, Card card){
-		cards[pos] = card;
+		cards[pos].setProps(card);// = card;
 		cardInfos[pos] = "";
 	}
 	
diff --git a/src/player/ConsolePlayer.java b/src/player/ConsolePlayer.java
index b3ca307..ce3a098 100644
--- a/src/player/ConsolePlayer.java
+++ b/src/player/ConsolePlayer.java
@@ -5,8 +5,8 @@
 
 public class ConsolePlayer extends AbstractPlayer {
 
-	public ConsolePlayer(int cards, Game g) {
-		super(cards, g);
+	public ConsolePlayer(int cards, Game g, int Id) {
+		super(cards, g, Id);
 	}
 
 	@Override
diff --git a/src/player/SwingPlayer.java b/src/player/SwingPlayer.java
index 736bf7b..f96e1eb 100644
--- a/src/player/SwingPlayer.java
+++ b/src/player/SwingPlayer.java
@@ -1,34 +1,31 @@
 package player;
 import game.Game;
-import game.Card;
-import static game.Card.intColorToText;
 
 import java.awt.Color;
-import java.awt.Font;
-import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
-import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import card.Card;
+import card.SwingCard;
+
 public class SwingPlayer extends AbstractPlayer {
 	private final static String HTML_BEGIN = "<html>";
 	private final static String HTML_END = "</html>";
 	private final static String HTML_NEWLINE = "<br/>";
-	private JLabel[] uiCards;
+	//private Card[] swingCards;
+	private JLabel[] labels;
 	private JPanel container;
-	public SwingPlayer(int cards, Game g) {
-		super(cards, g);
+	public SwingPlayer(int nrOfCards, Game g, int Id){
+		super(nrOfCards, g, Id);
+		labels = new JLabel[nrOfCards];
 		container = new JPanel();
-		uiCards = new JLabel[cards];
-		for(int i=0; i<cards; ++i){
-			uiCards[i] = new JLabel();
-			uiCards[i].setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-			//uiCards[i].setHorizontalAlignment(SwingConstants.CENTER);
-			uiCards[i].setFont(new Font(g.getFont().getFontName(), g.getFont().getStyle(), g.getFontSize()*2));
-			addMouseListener(i);
-			container.add(uiCards[i]);
+		for(int i=0; i<nrOfCards; ++i){
+			cards[i] = new SwingCard(0, 0, Id, g);
+			labels[i] = new JLabel();
+			((SwingCard) cards[i]).setFace(labels[i]);
+			container.add(((SwingCard) cards[i]).getFace());
 		}
 	}
 	
@@ -37,16 +34,17 @@
 	}
 	
 	public JLabel getUiCard(int pos){
-		return uiCards[pos];
+		return ((SwingCard) cards[pos]).getFace();
 	}
 	
 	@Override
 	public void setCard(int pos, Card card) {
 		super.setCard(pos, card);
-		uiCards[pos].setText(card.getValue() + "");
-		uiCards[pos].setForeground(card.getColor());
-		uiCards[pos].setBackground(Color.black);
-		uiCards[pos].setOpaque(true);
+		SwingCard sc = ((SwingCard) cards[pos]);		
+		sc.getFace().setText(card.getValue() + "");
+		sc.getFace().setForeground(card.getColor());
+		sc.getFace().setBackground(Color.black);
+		sc.getFace().setOpaque(true);
 	}
 	@Override
 	public Card getCard(int pos) {
@@ -58,7 +56,7 @@
 		if(g.getDifficulty() != 0) return;
 		info = info.replaceAll("\\n", HTML_NEWLINE);
 		info = HTML_BEGIN + info + HTML_END;
-		uiCards[pos].setToolTipText(info);
+		((SwingCard) cards[pos]).getFace().setToolTipText(info);
 	}
 	@Override
 	public String getCardInfo(int pos) {
@@ -72,28 +70,28 @@
 
 	@Override
 	public void setName(int index, String name) {
-		uiCards[index].setName(name);
+		((SwingCard) cards[index]).getFace().setName(name);
 	}
 
 	@Override
 	public String getName(int index) {
-		return uiCards[index].getName();
+		return ((SwingCard) cards[index]).getFace().getName();
 	}
 
 	@Override
 	public void setSize(int index, int width, int height) {
-		uiCards[index].setSize(width, height);
+		((SwingCard) cards[index]).getFace().setSize(width, height);
 	}
 
 	@Override
 	public void setColor(int index, int r, int g, int b) {
-		uiCards[index].setForeground(new Color(r, g, b));
+		((SwingCard) cards[index]).getFace().setForeground(new Color(r, g, b));
 	}
 
 	@Override
 	public int[] getColor(int index) {
 		int[] color = new int[3];
-		Color c = uiCards[index].getForeground();
+		Color c = ((SwingCard) cards[index]).getFace().getForeground();
 		color[0] = c.getRed();
 		color[1] = c.getGreen();
 		color[2] = c.getBlue();
@@ -102,13 +100,13 @@
 
 	@Override
 	public void setBackground(int index, int r, int g, int b) {
-		uiCards[index].setBackground(new Color(r, g, b));
+		((SwingCard) cards[index]).getFace().setBackground(new Color(r, g, b));
 	}
 
 	@Override
 	public int[] getBackground(int index) {
 		int[] color = new int[3];
-		Color c = uiCards[index].getBackground();
+		Color c = ((SwingCard) cards[index]).getFace().getBackground();
 		color[0] = c.getRed();
 		color[1] = c.getGreen();
 		color[2] = c.getBlue();
@@ -117,129 +115,37 @@
 
 	@Override
 	public void setText(int index, String text) {
-		uiCards[index].setText(text);
+		((SwingCard) cards[index]).getFace().setText(text);
 	}
 
 	@Override
 	public String getText(int index) {
-		return uiCards[index].getText();
-	}
-	
-	private void addMouseListener(int i){
-		uiCards[i].addMouseListener(new MouseListener() {
-			@Override
-			public void mouseReleased(MouseEvent e) {
-				JLabel label = (JLabel) e.getComponent();
-				String name = label.getName();
-				int clickedPlayer = Integer.parseInt(name.substring(0, 1));
-				int clickedCard = Integer.parseInt(name.substring(name.length()-1));
-				Card card = g.getPlayer(clickedPlayer).getCard(clickedCard);
-				int clickedValue = card.getValue();
-				int clickedColor = card.getColorInt();
-				if(label.getBackground() == Color.pink){
-					g.removeSelectedCards();
-					label.setBackground(Color.black);
-					System.out.println("Removed card #" + clickedCard + "(" + card.getColorInt() + ", " + card.getValue() + ")");
-					if(g.getSelectedCards() == 0){
-						g.resetMoveValues();
-					}
-				}
-				if(!g.isUseColor() && !g.isUseValue() && !g.isTrashCard() && !g.isPlaceCard()){
-					System.out.println("Please choose move type first");
-					return;
-				}
-				if(clickedPlayer == g.getCurrentPlayerIndex()){
-					if(g.isUseColor() || g.isUseValue()){
-						System.out.println("Please don't select your own cards!");
-						return;
-					} else if((g.isTrashCard() || g.isPlaceCard()) && g.getSelectedCards() == 1){
-						System.out.println("You already selected a card!");
-						return;
-					}
-				} else if(clickedPlayer != g.getCurrentPlayerIndex() && (g.isTrashCard() || g.isPlaceCard())){
-					System.out.println("Please select your own cards");
-					return;
-				}
-				if(g.getSelectedPlayer() == -1){
-					g.setSelectedPlayer(clickedPlayer);
-					g.setChosenColor(clickedColor);
-					g.setChosenValue(clickedValue);
-					g.addSelectedCards();
-					System.out.println("Selected player #" + g.getSelectedPlayer());
-					label.setBackground(Color.pink);
-					System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-					return;
-				}
-				if(g.getSelectedPlayer() != clickedPlayer){
-					System.out.println("Please choose a card of the selected player or unselect all cards and choose another player.");
-					return;
-				}
-				if(g.getChosenColor() == -1){
-					g.setChosenColor(clickedColor);
-				}
-				if(g.getChosenValue() == -1){
-					g.setChosenValue(clickedValue);
-				}
-				if(label.getBackground() == Color.black){
-					if(g.isUseColor()){
-						if(g.getChosenColor() == clickedColor){
-							if(label.getBackground() != Color.pink){
-								g.addSelectedCards();
-								label.setBackground(Color.pink);
-								System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-							}
-						}
-					} else if(g.isUseValue()){
-						if(g.getChosenValue() == clickedValue){
-							if(label.getBackground() != Color.pink){
-								g.addSelectedCards();
-								label.setBackground(Color.pink);
-								System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-							}
-						}
-					}
-				}
-			}
-			
-			@Override
-			public void mousePressed(MouseEvent e) {
-			}
-			
-			@Override
-			public void mouseExited(MouseEvent e) {
-			}
-			
-			@Override
-			public void mouseEntered(MouseEvent e) {
-			}
-			
-			@Override
-			public void mouseClicked(MouseEvent e) {
-			}
-		});
+		return ((SwingCard) cards[index]).getFace().getText();
 	}
 
 	@Override
 	public void unsetListeners(int index) {
-		MouseListener[] listeners = uiCards[index].getMouseListeners();
+		MouseListener[] listeners = ((SwingCard) cards[index]).getFace().getMouseListeners();
 		for(int i=0; i<listeners.length; ++i){
-			uiCards[index].removeMouseListener(listeners[i]);
+			((SwingCard) cards[index]).getFace().removeMouseListener(listeners[i]);
 		}
 	}
 
 	@Override
 	public void deactiveCards(){
-		for(int i=0; i<uiCards.length; ++i){
-			uiCards[i].setText("?");
-			uiCards[i].setEnabled(false);
+		for(int i=0; i<cards.length; ++i){
+			((SwingCard) cards[i]).getFace().setText("?");
+			//swingCards[i].getFace().setEnabled(false);
+			((SwingCard) cards[i]).getFace().setForeground(Color.gray);
 		}
 	}
 
 	@Override
 	public void activeCards(){
-		for(int i=0; i<uiCards.length; ++i){
-			uiCards[i].setText(getCard(i).getValue() + "");
-			uiCards[i].setEnabled(true);
+		for(int i=0; i<cards.length; ++i){
+			((SwingCard) cards[i]).getFace().setText(getCard(i).getValue() + "");
+			//swingCards[i].getFace().setEnabled(true);
+			((SwingCard) cards[i]).getFace().setBackground(getCard(i).getColor());
 		}
 	}
 }
\ No newline at end of file