diff --git a/.gitattributes b/.gitattributes
index 9312c9f0e6b..76d1d299544 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -214,7 +214,6 @@ forge-core/src/main/java/forge/item/PreconDeck.java -text
 forge-core/src/main/java/forge/item/SealedProduct.java -text
 forge-core/src/main/java/forge/item/TournamentPack.java -text
 forge-core/src/main/java/forge/item/package-info.java -text
-forge-core/src/main/java/forge/package-info.java -text
 forge-core/src/main/java/forge/util/Aggregates.java -text
 forge-core/src/main/java/forge/util/BinaryUtil.java -text
 forge-core/src/main/java/forge/util/BuildInfo.java -text
@@ -242,7 +241,6 @@ forge-core/src/main/java/forge/util/maps/HashMapOfLists.java -text
 forge-core/src/main/java/forge/util/maps/MapOfLists.java -text
 forge-core/src/main/java/forge/util/maps/MapToAmount.java -text
 forge-core/src/main/java/forge/util/maps/package-info.java -text
-forge-core/src/main/java/forge/util/package-info.java -text
 forge-core/src/main/java/forge/util/storage/IStorage.java -text
 forge-core/src/main/java/forge/util/storage/StorageBase.java -text
 forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java -text
@@ -640,9 +638,7 @@ forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java svneol=nativ
 forge-game/src/main/java/forge/game/zone/Zone.java -text
 forge-game/src/main/java/forge/game/zone/ZoneType.java -text
 forge-game/src/main/java/forge/game/zone/package-info.java svneol=native#text/plain
-forge-game/src/main/java/forge/package-info.java -text
 forge-game/src/main/java/forge/util/Expressions.java -text
-forge-game/src/main/java/forge/util/package-info.java -text
 forge-gui-android/.classpath -text
 forge-gui-android/.project -text
 forge-gui-android/.settings/org.eclipse.core.resources.prefs -text
@@ -16334,7 +16330,6 @@ forge-gui/src/main/java/forge/deck/DeckgenUtil.java -text
 forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java -text
 forge-gui/src/main/java/forge/deck/io/DeckPreferences.java -text
 forge-gui/src/main/java/forge/deck/io/OldDeckParser.java -text
-forge-gui/src/main/java/forge/deck/io/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/error/BugReporter.java -text
 forge-gui/src/main/java/forge/error/ExceptionHandler.java svneol=native#text/plain
 forge-gui/src/main/java/forge/error/package-info.java svneol=native#text/plain
diff --git a/forge-core/src/main/java/forge/package-info.java b/forge-core/src/main/java/forge/package-info.java
deleted file mode 100644
index f52d24110e3..00000000000
--- a/forge-core/src/main/java/forge/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author Max
- *
- */
-package forge;
\ No newline at end of file
diff --git a/forge-core/src/main/java/forge/util/package-info.java b/forge-core/src/main/java/forge/util/package-info.java
deleted file mode 100644
index b9c9810076b..00000000000
--- a/forge-core/src/main/java/forge/util/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author Max
- *
- */
-package forge.util;
\ No newline at end of file
diff --git a/forge-game/src/main/java/forge/package-info.java b/forge-game/src/main/java/forge/package-info.java
deleted file mode 100644
index f52d24110e3..00000000000
--- a/forge-game/src/main/java/forge/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author Max
- *
- */
-package forge;
\ No newline at end of file
diff --git a/forge-game/src/main/java/forge/util/package-info.java b/forge-game/src/main/java/forge/util/package-info.java
deleted file mode 100644
index b9c9810076b..00000000000
--- a/forge-game/src/main/java/forge/util/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author Max
- *
- */
-package forge.util;
\ No newline at end of file
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index b079c14eabf..5f89345bc38 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -1,6 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    
+    <properties>
+        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+        <packaging.type>jar</packaging.type>
+        <build.min.memory>-Xms128m</build.min.memory>
+        <build.max.memory>-Xmx2048m</build.max.memory>
+    </properties>
 
     <parent>
         <artifactId>forge</artifactId>
@@ -9,9 +16,9 @@
     </parent>
 
     <artifactId>forge-gui-android</artifactId>
-    <packaging>apk</packaging>
-    <name>Forge</name>
-
+    <packaging>${packaging.type}</packaging>
+    <name>Forge Android</name>
+    
     <build>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
@@ -22,72 +29,7 @@
                     <target>1.7</target>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <version>3.9.0-rc.1</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <sign>
-                        <debug>true</debug>
-                    </sign>
-                    <sdk>
-                        <platform>19</platform>
-                    </sdk>
-                    <dexForceJumbo>true</dexForceJumbo>
-                    <deleteConflictingFiles>true</deleteConflictingFiles>
-                    <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
-                    <assetsDirectory>${project.basedir}/assets</assetsDirectory>
-                    <resourceDirectory>${project.basedir}/res</resourceDirectory>
-                    <nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
-                    <extractDuplicates>true</extractDuplicates>
-                    <proguard>
-                        <config>${project.basedir}/proguard.cfg</config>
-                    </proguard>
-                    <release>true</release>
-                </configuration>
-            </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings 
-                    only. It has no influence on the Maven build itself. -->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            com.jayway.maven.plugins.android.generation2
-                                        </groupId>
-                                        <artifactId>
-                                            android-maven-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [3.9.0-rc.1,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>proguard</goal>
-                                            <goal>
-                                                generate-sources
-                                            </goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <dependencies>
@@ -158,6 +100,9 @@
     <profiles>
         <profile>
             <id>android-debug</id>
+            <properties>
+                <packaging.type>apk</packaging.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -185,13 +130,13 @@
                             <release>true</release>
                             <dex>
                                 <jvmArguments>
-                                    <argument>-Xms128m</argument>
-                                    <argument>-Xmx2048m</argument>
+                                    <argument>${build.min.memory}</argument>
+                                    <argument>${build.max.memory}</argument>
                                 </jvmArguments>
                             </dex>
                             <jvmArguments>
-                                <argument>-Xms128m</argument>
-                                <argument>-Xmx2048m</argument>
+                                <argument>${build.min.memory}</argument>
+                                <argument>${build.max.memory}</argument>
                             </jvmArguments>
                         </configuration>
                     </plugin>
@@ -199,9 +144,12 @@
             </build>
         </profile>
         <profile>
-        	<id>android-release-build</id>
-        	<build>
-        		<plugins>
+            <id>android-release-build</id>
+            <properties>
+                <packaging.type>apk</packaging.type>
+            </properties>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                         <artifactId>android-maven-plugin</artifactId>
@@ -214,9 +162,9 @@
                             <sdk>
                                 <platform>19</platform>
                             </sdk>
-					        <zipalign>
-					            <verbose>false</verbose>
-					        </zipalign>
+                            <zipalign>
+                                <verbose>false</verbose>
+                            </zipalign>
                             <dexForceJumbo>true</dexForceJumbo>
                             <deleteConflictingFiles>true</deleteConflictingFiles>
                             <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
@@ -230,77 +178,80 @@
                             <release>true</release>
                             <dex>
                                 <jvmArguments>
-                                    <argument>-Xms128m</argument>
-                                    <argument>-Xmx2048m</argument>
+                                    <argument>${build.min.memory}</argument>
+                                    <argument>${build.max.memory}</argument>
                                 </jvmArguments>
                             </dex>
                             <jvmArguments>
-                                <argument>-Xms128m</argument>
-                                <argument>-Xmx2048m</argument>
+                                <argument>${build.min.memory}</argument>
+                                <argument>${build.max.memory}</argument>
                             </jvmArguments>
                         </configuration>
                     </plugin>
-        		</plugins>
-        	</build>
+                </plugins>
+            </build>
         </profile>
-		<profile>
-        	<id>android-release-sign</id>
-        	<build>
-        		<plugins>
+        <profile>
+            <id>android-release-sign</id>
+            <properties>
+                <packaging.type>apk</packaging.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jarsigner-plugin</artifactId>
+                        <version>1.3.2</version>
+                        <executions>
+                            <execution>
+                                <id>signing</id>
+                                <goals>
+                                    <goal>sign</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <inherited>true</inherited>
+                                <configuration>
+                                    <removeExistingSignatures>true</removeExistingSignatures>
+                                    <archiveDirectory/>
+                                    <includes>
+                                        <include>${project.build.directory}/${project.build.finalName}/${project.build.finalName}.apk</include>
+                                    </includes>
+                                    <keystore>${sign.keystore}</keystore>
+                                    <alias>${sign.alias}</alias>
+                                    <storepass>${sign.storepass}</storepass>
+                                    <keypass>${sign.keypass}</keypass>
+                                    <verbose>true</verbose>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
-			            <groupId>org.apache.maven.plugins</groupId>
-			            <artifactId>maven-jarsigner-plugin</artifactId>
-			            <version>1.3.2</version>
-			            <executions>
-			                <execution>
-			                    <id>signing</id>
-			                    <goals>
-			                        <goal>sign</goal>
-			                        <goal>verify</goal>
-			                    </goals>
-			                    <phase>package</phase>
-			                    <inherited>true</inherited>
-			                    <configuration>
-			                        <removeExistingSignatures>true</removeExistingSignatures>
-			                        <archiveDirectory/>
-			                        <includes>
-			                            <include>${project.build.directory}/${project.build.finalName}/${project.build.finalName}.apk</include>
-			                        </includes>
-			                        <keystore>${sign.keystore}</keystore>
-			                        <alias>${sign.alias}</alias>
-			                        <storepass>${sign.storepass}</storepass>
-			                        <keypass>${sign.keypass}</keypass>
-			                        <verbose>true</verbose>
-			                    </configuration>
-			                </execution>
-			            </executions>
-			        </plugin>
-	                <plugin>
                         <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                         <artifactId>android-maven-plugin</artifactId>
                         <version>3.9.0-rc.1</version>
-					    <inherited>true</inherited>
-					    <configuration>
-					        <sign>
-					            <debug>false</debug>
-					        </sign>
-					        <zipalign>
-					        	<skip>false</skip>
-					            <verbose>true</verbose>
-					            <inputApk>${project.build.directory}/${project.build.finalName}.apk</inputApk>
-					            <outputApk>${project.build.directory}/${project.build.finalName}-signed-aligned.apk</outputApk>
-					        </zipalign>
-					    </configuration>
-					    <executions>
-					        <execution>
-					            <id>alignApk</id>
-					            <phase>package</phase>
-					            <goals>
-					                <goal>zipalign</goal>
-					            </goals>
-					        </execution>
-					    </executions>
-					</plugin>
+                        <inherited>true</inherited>
+                        <configuration>
+                            <sign>
+                                <debug>false</debug>
+                            </sign>
+                            <zipalign>
+                                <skip>false</skip>
+                                <verbose>true</verbose>
+                                <inputApk>${project.build.directory}/${project.build.finalName}.apk</inputApk>
+                                <outputApk>${project.build.directory}/${project.build.finalName}-signed-aligned.apk</outputApk>
+                            </zipalign>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>android-align</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>zipalign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
@@ -314,20 +265,7 @@
                         </dependencies>
                         <executions>
                             <execution>
-                                <id>android-clean</id>
-                                <phase>clean</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${project.build.directory}" />
-                                        <mkdir dir="${project.build.directory}/classes" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>android-apk</id>
+                                <id>android-release-packaging</id>
                                 <phase>package</phase>
                                 <configuration>
                                     <target>
@@ -343,6 +281,7 @@
                                         </copy>
                                         <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
                                         <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
+                                        <zip destfile="${project.build.directory}/${project.build.finalName}/res.zip" basedir="${basedir}/../forge-gui/res" level="1" />
                                         <zip destfile="${project.build.directory}/${project.build.finalName}.zip" basedir="${project.build.directory}/${project.build.finalName}" level="1" />
                                     </target>
                                 </configuration>
@@ -352,8 +291,60 @@
                             </execution>
                         </executions>
                     </plugin>
-        		</plugins>
-        	</build>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>android-release-upload</id>
+            <properties>
+                <packaging.type>apk</packaging.type>
+            </properties>
+			<build>
+			    <plugins>
+			        <plugin>
+			         <groupId>org.apache.maven.plugins</groupId>
+			         <artifactId>maven-antrun-plugin</artifactId>
+			         <version>1.7</version>
+			         <dependencies>
+			             <dependency>
+			                 <groupId>org.apache.ant</groupId>
+			                 <artifactId>ant-nodeps</artifactId>
+			                 <version>1.8.1</version>
+			             </dependency>
+			            <dependency>
+			              <groupId>commons-net</groupId>
+			              <artifactId>commons-net</artifactId>
+			              <version>1.4.1</version>
+			            </dependency>
+			            <dependency>
+			              <groupId>ant</groupId>
+			              <artifactId>ant-commons-net</artifactId>
+			              <version>1.6.5</version>
+			            </dependency>
+			         </dependencies>
+			         <executions>
+			             <execution>
+			                 <id>android-ftp</id>
+			                 <phase>package</phase>
+			                 <configuration>
+			                     <target>
+			                         <ftp action="mkdir" password="${cardforge.pass}" server="ftp.cardforge.org" userid="${cardforge.user}" passive="true" remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}" />
+			                         <ftp password="${cardforge.pass}" server="ftp.cardforge.org" userid="${cardforge.user}" passive="true" remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}/">
+			                             <fileset dir="${project.build.directory}/${project.build.finalName}">
+			                                 <include name="${project.build.finalName}-signed-aligned.apk"/>
+			                                 <include name="res.zip"/>
+			                             </fileset>
+			                         </ftp>
+			                     </target>
+			                 </configuration>
+			                 <goals>
+			                     <goal>run</goal>
+			                 </goals>
+			             </execution>
+			         </executions>
+			     </plugin>
+			    </plugins>
+			</build>
         </profile>
     </profiles>
 </project>
\ No newline at end of file
diff --git a/forge-gui/src/main/java/forge/deck/io/package-info.java b/forge-gui/src/main/java/forge/deck/io/package-info.java
deleted file mode 100644
index bf1b74cc5bf..00000000000
--- a/forge-gui/src/main/java/forge/deck/io/package-info.java
+++ /dev/null
@@ -1,3 +0,0 @@
-/** Forge Card Game. */
-package forge.deck.io;
-