diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index 0d8f1e7019c..a22964dd813 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<groupId>org.mage</groupId>
-	<artifactId>mage-client</artifactId>
+	<artifactId>Mage-Client</artifactId>
 	<packaging>jar</packaging>
 	<version>0.3</version>
 	<name>Mage Client</name>
@@ -19,17 +19,17 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId>
-			<artifactId>mage</artifactId>
+			<artifactId>Mage</artifactId>
 			<version>${mage-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mage</groupId>
-			<artifactId>mage-common</artifactId>
+			<artifactId>Mage-Common</artifactId>
 			<version>${mage-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mage</groupId>
-			<artifactId>mage-sets</artifactId>
+			<artifactId>Mage-Sets</artifactId>
 			<version>${mage-version}</version>
 		</dependency>
 	</dependencies>
@@ -39,7 +39,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -51,7 +50,26 @@
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
-
+                        <plugin>
+                            <artifactId>maven-jar-plugin</artifactId>
+                            <configuration>
+                                 <archive>
+                                    <manifest>
+                                        <addClasspath>true</addClasspath>
+                                        <classpathPrefix>lib/</classpathPrefix>
+                                        <mainClass>mage.client.MageFrame</mainClass>
+                                    </manifest>
+                                </archive>
+                            </configuration>
+                        </plugin>
+                        <plugin>
+                            <artifactId>maven-assembly-plugin</artifactId>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/distribution.xml</descriptor>
+                                </descriptors>                               
+                            </configuration>
+                        </plugin>
 		</plugins>
 
 		<finalName>mage-client</finalName>
diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml
index 425e77e8d67..5c8c547b908 100644
--- a/Mage.Common/pom.xml
+++ b/Mage.Common/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <groupId>org.mage</groupId>
-  <artifactId>mage-common</artifactId>
+  <artifactId>Mage-Common</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Common Classes</name>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId> 
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage.Deck.Constructed/pom.xml b/Mage.Deck.Constructed/pom.xml
index 31c3198311a..7789e9cc1b1 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-Contructed</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Deck Constructed</name>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId> 
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage.Game.FreeForAll/pom.xml b/Mage.Game.FreeForAll/pom.xml
index 7269838e93d..a0718b63ca8 100644
--- a/Mage.Game.FreeForAll/pom.xml
+++ b/Mage.Game.FreeForAll/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <groupId>org.mage</groupId>
-  <artifactId>mage-game-freeforall</artifactId>
+  <artifactId>Mage-Game-FreeForAll</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Game Free For All</name>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId> 
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Game.TwoPlayerDuel/pom.xml
index 156b22ec32d..3289299e7ac 100644
--- a/Mage.Game.TwoPlayerDuel/pom.xml
+++ b/Mage.Game.TwoPlayerDuel/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <groupId>org.mage</groupId>
-  <artifactId>mage-game-twoplayerduel</artifactId>
+  <artifactId>Mage-Game-TwoPlayerDuel</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Game Two Player</name>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId> 
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage.Player.AI/pom.xml b/Mage.Player.AI/pom.xml
index 81dcb8008e7..5ab0d5afd38 100644
--- a/Mage.Player.AI/pom.xml
+++ b/Mage.Player.AI/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <groupId>org.mage</groupId>
-  <artifactId>mage-player-ai</artifactId>
+  <artifactId>Mage-Player-AI</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Player AI</name>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId> 
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage.Player.AIMinimax/pom.xml b/Mage.Player.AIMinimax/pom.xml
index 6f5cb62cbc9..cde93ea5b55 100644
--- a/Mage.Player.AIMinimax/pom.xml
+++ b/Mage.Player.AIMinimax/pom.xml
@@ -19,12 +19,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId>
 			<version>${mage-version}</version> 
 		</dependency>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage-player-ai</artifactId> 
+			<artifactId>Mage-Player-AI</artifactId>
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage.Player.Human/pom.xml b/Mage.Player.Human/pom.xml
index c07ddf8a192..036f128d428 100644
--- a/Mage.Player.Human/pom.xml
+++ b/Mage.Player.Human/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <groupId>org.mage</groupId>
-  <artifactId>mage-player-human</artifactId>
+  <artifactId>Mage-Player-Human</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Player Human</name>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId> 
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml
index 010c3585302..2a8d52f915e 100644
--- a/Mage.Server/pom.xml
+++ b/Mage.Server/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 	
   <groupId>org.mage</groupId>
-  <artifactId>mage-server</artifactId>
+  <artifactId>Mage-Server</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Server</name>
@@ -19,19 +19,18 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId>
 			<version>${mage-version}</version> 
 		</dependency>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage-common</artifactId> 
+			<artifactId>Mage-Common</artifactId>
 			<version>${mage-version}</version> 
 		</dependency>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage-sets</artifactId> 
+			<artifactId>Mage-Sets</artifactId>
 			<version>${mage-version}</version>
-			<scope>runtime</scope> 
 		</dependency>
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
diff --git a/Mage.Server/src/mage/server/game/GameController.java b/Mage.Server/src/mage/server/game/GameController.java
index fe6ddc48d44..3e3ef26e29e 100644
--- a/Mage.Server/src/mage/server/game/GameController.java
+++ b/Mage.Server/src/mage/server/game/GameController.java
@@ -43,7 +43,6 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import mage.Constants;
 import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.cards.Card;
diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml
index 7f94097a0ad..6cd958bfc63 100644
--- a/Mage.Sets/pom.xml
+++ b/Mage.Sets/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <groupId>org.mage</groupId>
-  <artifactId>mage-sets</artifactId>
+  <artifactId>Mage-Sets</artifactId>
   <packaging>jar</packaging>
   <version>0.3</version>
   <name>Mage Sets</name>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.mage</groupId> 
-			<artifactId>mage</artifactId> 
+			<artifactId>Mage</artifactId>
 			<version>${mage-version}</version> 
 		</dependency>
 	</dependencies>
diff --git a/Mage/pom.xml b/Mage/pom.xml
index c86cd5fd257..e0fa6842da3 100644
--- a/Mage/pom.xml
+++ b/Mage/pom.xml
@@ -10,10 +10,10 @@
 	</parent>
 
 	<groupId>org.mage</groupId>
-	<artifactId>mage</artifactId>
+	<artifactId>Mage</artifactId>
 	<packaging>jar</packaging>
 	<version>0.3</version>
-	<name>Mage Application</name>
+	<name>Mage Framework</name>
 	<url>http://maven.apache.org</url>
 
 	<dependencies />