diff --git a/Mage.Client/src/main/java/mage/client/cards/Card.java b/Mage.Client/src/main/java/mage/client/cards/Card.java
index 01a9a11bf8d..6152f40843b 100644
--- a/Mage.Client/src/main/java/mage/client/cards/Card.java
+++ b/Mage.Client/src/main/java/mage/client/cards/Card.java
@@ -147,7 +147,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis
 	}
 
 	public void update(PermanentView permanent) {
-		this.update(permanent.getOriginal());
+		this.update((CardView)permanent);
 	}
 	
 	public void update(CardView card) {
diff --git a/Mage.Deck.Constructed/pom.xml b/Mage.Deck.Constructed/pom.xml
index 04a43c87d0d..72d17df068d 100644
--- a/Mage.Deck.Constructed/pom.xml
+++ b/Mage.Deck.Constructed/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <groupId>org.mage</groupId>
-  <artifactId>Mage-Deck-Contructed</artifactId>
+  <artifactId>Mage-Deck-Constructed</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Deck Constructed</name>
@@ -45,7 +45,7 @@
 
 	    </plugins>
     
-		<finalName>mage-deck-contructed</finalName>
+		<finalName>mage-deck-constructed</finalName>
 	</build>
   
 	<properties/>
diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index 23a34d273b1..6a1d2e8a3c2 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -3,16 +3,16 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
 	<server serverAddress="localhost" serverName="mage-server" port="17171" maxGameThreads="10" maxSecondsIdle="600"/>
 	<playerTypes>
-		<playerType name="Human" jar="Mage.Player.Human.jar" className="mage.player.human.HumanPlayer"/>
-		<playerType name="Computer - default" jar="Mage.Player.AI.jar" className="mage.player.ai.ComputerPlayer"/>
-		<playerType name="Computer - minimax" jar="Mage.Player.AIMinimax.jar" className="mage.player.ai.ComputerPlayer2"/>
-		<playerType name="Computer - minimax hybrid" jar="Mage.Player.AIMinimax.jar" className="mage.player.ai.ComputerPlayer3"/>
+		<playerType name="Human" jar="mage-player-human.jar" className="mage.player.human.HumanPlayer"/>
+		<playerType name="Computer - default" jar="mage-player-ai.jar" className="mage.player.ai.ComputerPlayer"/>
+		<playerType name="Computer - minimax" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer2"/>
+		<playerType name="Computer - minimax hybrid" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>
 	</playerTypes>
 	<gameTypes>
-		<gameType name="Two Player Duel" jar="Mage.Game.TwoPlayerDuel.jar" className="mage.game.TwoPlayerDuel" typeName="mage.game.TwoPlayerDuelType"/>
-		<gameType name="Free For All" jar="Mage.Game.FreeForAll.jar" className="mage.game.FreeForAll" typeName="mage.game.FreeForAllType"/>
+		<gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerDuel" typeName="mage.game.TwoPlayerDuelType"/>
+		<gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAll" typeName="mage.game.FreeForAllType"/>
 	</gameTypes>
 	<deckTypes>
-		<deckType name="Constructed" jar="Mage.Deck.Constructed.jar" className="mage.deck.Constructed"/>
+		<deckType name="Constructed" jar="mage-deck-constructed.jar" className="mage.deck.Constructed"/>
 	</deckTypes>
 </config>
diff --git a/Mage.Server/plugins/mage-deck-constructed.jar b/Mage.Server/plugins/mage-deck-constructed.jar
new file mode 100644
index 00000000000..4b38df4c7ea
Binary files /dev/null and b/Mage.Server/plugins/mage-deck-constructed.jar differ
diff --git a/Mage.Server/plugins/mage-game-freeforall.jar b/Mage.Server/plugins/mage-game-freeforall.jar
new file mode 100644
index 00000000000..0bdcdfbb1a9
Binary files /dev/null and b/Mage.Server/plugins/mage-game-freeforall.jar differ
diff --git a/Mage.Server/plugins/mage-game-twoplayerduel.jar b/Mage.Server/plugins/mage-game-twoplayerduel.jar
new file mode 100644
index 00000000000..bb624d77c9a
Binary files /dev/null and b/Mage.Server/plugins/mage-game-twoplayerduel.jar differ
diff --git a/Mage.Server/plugins/mage-player-ai.jar b/Mage.Server/plugins/mage-player-ai.jar
new file mode 100644
index 00000000000..5c76adf3868
Binary files /dev/null and b/Mage.Server/plugins/mage-player-ai.jar differ
diff --git a/Mage.Server/plugins/mage-player-aiminimax.jar b/Mage.Server/plugins/mage-player-aiminimax.jar
new file mode 100644
index 00000000000..bbf31e476ad
Binary files /dev/null and b/Mage.Server/plugins/mage-player-aiminimax.jar differ
diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar
new file mode 100644
index 00000000000..6e69382c1a2
Binary files /dev/null and b/Mage.Server/plugins/mage-player-human.jar differ
diff --git a/Mage.Server/src/mage/server/game/GameController.java b/Mage.Server/src/mage/server/game/GameController.java
index 14ea816b7ae..9fcfce422ff 100644
--- a/Mage.Server/src/mage/server/game/GameController.java
+++ b/Mage.Server/src/mage/server/game/GameController.java
@@ -218,7 +218,7 @@ public class GameController implements GameCallback {
 		for (Card card: deck.getCards()) {
 			card.putOntoBattlefield(game, Zone.OUTSIDE, playerId);
 		}
-		addCardsForTesting(game, game.getPlayer(playerId));
+		addCardsForTesting(game);
 		updateGame();
 	}
 
@@ -394,7 +394,7 @@ public class GameController implements GameCallback {
 	 * 4. Log message to all players that cards were added (to prevent unfair play).<br/>  
 	 * 5. Exit<br/>
 	 */
-	private void addCardsForTesting(Game game, Player player) {
+	private void addCardsForTesting(Game game) {
 		try {
 			File f = new File(INIT_FILE_PATH);
 			Pattern pattern = Pattern.compile("([a-zA-Z]*):([\\w]*):([a-zA-Z ,.!\\d]*):([\\d]*)");
@@ -403,7 +403,7 @@ public class GameController implements GameCallback {
 				return;
 			}
 			
-			logger.info("Parsing init.txt for player : " + player.getName());
+			//logger.info("Parsing init.txt for player : " + player.getName());
 			
 			Scanner scanner = new Scanner(f);
 			try {
@@ -416,7 +416,8 @@ public class GameController implements GameCallback {
 						String zone = m.group(1);
 						String nickname = m.group(2);
 
-						if (nickname.equals(player.getName())) {
+						Player player = findPlayer(game, nickname);
+						if (player != null) {
 							Zone gameZone;
 							if ("hand".equalsIgnoreCase(zone)) {
 								gameZone = Zone.HAND;
@@ -471,4 +472,12 @@ public class GameController implements GameCallback {
 		}
 		logger.info("Added card to player's " + zone.toString() + ": " + card.getName() +", player = " + player.getName());
 	}
+
+	private Player findPlayer(Game game, String name) {
+		for (Player player: game.getPlayers().values()) {
+			if (player.getName().equals(name))
+				return player;
+		}
+		return null;
+	}
 }