diff --git a/MasterPassword/Java/masterpassword-algorithm/pom.xml b/MasterPassword/Java/masterpassword-algorithm/pom.xml
index bf8c2e6f..7bc976a3 100644
--- a/MasterPassword/Java/masterpassword-algorithm/pom.xml
+++ b/MasterPassword/Java/masterpassword-algorithm/pom.xml
@@ -5,7 +5,7 @@
 
     <!-- PROJECT METADATA -->
     <parent>
-        <groupId>com.lyndir.lhunath.masterpassword</groupId>
+        <groupId>com.lyndir.masterpassword</groupId>
         <artifactId>masterpassword</artifactId>
         <version>GIT-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
     <name>Master Password Algorithm Implementation</name>
     <description>The implementation of the Master Password algorithm</description>
 
-    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <groupId>com.lyndir.masterpassword</groupId>
     <artifactId>masterpassword-algorithm</artifactId>
     <packaging>jar</packaging>
 
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>com.lyndir.lhunath.opal</groupId>
             <artifactId>opal-system</artifactId>
-            <version>GIT-SNAPSHOT</version>
+            <version>1.6-p6</version>
         </dependency>
         <dependency>
             <groupId>com.lyndir.lhunath.opal</groupId>
             <artifactId>opal-crypto</artifactId>
-            <version>GIT-SNAPSHOT</version>
+            <version>1.6-p6</version>
         </dependency>
 
         <!-- EXTERNAL DEPENDENCIES -->
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementFeature.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementFeature.java
similarity index 82%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementFeature.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementFeature.java
index 4261f916..1593a747 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementFeature.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementFeature.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 /**
  * <i>07 04, 2012</i>
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementType.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementType.java
similarity index 98%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementType.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementType.java
index 9612e297..25b576d4 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementType.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementType.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import com.google.common.collect.ImmutableSet;
 import com.lyndir.lhunath.opal.system.logging.Logger;
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementTypeClass.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementTypeClass.java
similarity index 83%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementTypeClass.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementTypeClass.java
index 1fbebeea..d26e816c 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementTypeClass.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPElementTypeClass.java
@@ -1,6 +1,6 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
-import com.lyndir.lhunath.masterpassword.entity.*;
+import com.lyndir.masterpassword.entity.*;
 
 
 /**
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplate.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java
similarity index 95%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplate.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java
index 2027c090..be28a17b 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplate.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import com.google.common.collect.ImmutableList;
 import com.lyndir.lhunath.opal.system.util.MetaObject;
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplateCharacterClass.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java
similarity index 94%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplateCharacterClass.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java
index 24545e30..d5116c11 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplateCharacterClass.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import com.lyndir.lhunath.opal.system.util.MetaObject;
 import com.lyndir.lhunath.opal.system.util.ObjectMeta;
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplates.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplates.java
similarity index 99%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplates.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplates.java
index 4a3d9b62..f3378bef 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplates.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MPTemplates.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MasterPassword.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MasterPassword.java
similarity index 99%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MasterPassword.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MasterPassword.java
index 2e100b1e..b1df9ce3 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MasterPassword.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/MasterPassword.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementEntity.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementEntity.java
similarity index 63%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementEntity.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementEntity.java
index b047bc04..6b7eb519 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementEntity.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementEntity.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword.entity;
+package com.lyndir.masterpassword.entity;
 
 /**
  * <i>07 04, 2012</i>
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementGeneratedEntity.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementGeneratedEntity.java
similarity index 70%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementGeneratedEntity.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementGeneratedEntity.java
index 99d4c43b..c2175766 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementGeneratedEntity.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementGeneratedEntity.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword.entity;
+package com.lyndir.masterpassword.entity;
 
 /**
  * <i>07 04, 2012</i>
diff --git a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementStoredEntity.java b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementStoredEntity.java
similarity index 70%
rename from MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementStoredEntity.java
rename to MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementStoredEntity.java
index 0a1e7873..794ec263 100644
--- a/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/entity/MPElementStoredEntity.java
+++ b/MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/masterpassword/entity/MPElementStoredEntity.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword.entity;
+package com.lyndir.masterpassword.entity;
 
 /**
  * <i>07 04, 2012</i>
diff --git a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
index ed61be4b..fecf60d4 100644
--- a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
+++ b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.lyndir.lhunath.masterpassword" android:versionCode="1" android:versionName="GIT-SNAPSHOT">
+          package="com.lyndir.masterpassword"
+          android:versionCode="1"
+          android:versionName="GIT-SNAPSHOT">
 
-  <uses-sdk android:minSdkVersion="11"
-            android:targetSdkVersion="16" />
+    <uses-sdk
+            android:minSdkVersion="11"
+            android:targetSdkVersion="19" />
 
-  <application android:icon="@drawable/icon" android:label="@string/app_name">
-    <activity android:name=".UsersActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
+    <application
+            android:icon="@drawable/icon"
+            android:label="@string/app_name"
+            android:allowBackup="true">
+        <activity android:name=".UsersActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 
 </manifest>
 
diff --git a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/BuildConfig.java b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/BuildConfig.java
similarity index 84%
rename from MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/BuildConfig.java
rename to MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/BuildConfig.java
index 595b3987..2bfb61e8 100644
--- a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/BuildConfig.java
+++ b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/BuildConfig.java
@@ -1,6 +1,6 @@
 /*___Generated_by_IDEA___*/
 
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 /* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
 public final class BuildConfig {
diff --git a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/Manifest.java b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/Manifest.java
similarity index 78%
rename from MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/Manifest.java
rename to MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/Manifest.java
index fbdd3240..6ba03ae6 100644
--- a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/Manifest.java
+++ b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/Manifest.java
@@ -1,7 +1,7 @@
 /*___Generated_by_IDEA___*/
 
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 /* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
 public final class Manifest {
-}
\ No newline at end of file
+}
diff --git a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/R.java b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/R.java
similarity index 76%
rename from MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/R.java
rename to MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/R.java
index 6caa0b2e..550daf6c 100644
--- a/MasterPassword/Java/masterpassword-android/gen/com/lyndir/lhunath/masterpassword/R.java
+++ b/MasterPassword/Java/masterpassword-android/gen/com/lyndir/masterpassword/R.java
@@ -1,7 +1,7 @@
 /*___Generated_by_IDEA___*/
 
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 /* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
 public final class R {
-}
\ No newline at end of file
+}
diff --git a/MasterPassword/Java/masterpassword-android/pom.xml b/MasterPassword/Java/masterpassword-android/pom.xml
index 490c6480..f2bab397 100644
--- a/MasterPassword/Java/masterpassword-android/pom.xml
+++ b/MasterPassword/Java/masterpassword-android/pom.xml
@@ -5,7 +5,7 @@
 
     <!-- PROJECT METADATA -->
     <parent>
-        <groupId>com.lyndir.lhunath.masterpassword</groupId>
+        <groupId>com.lyndir.masterpassword</groupId>
         <artifactId>masterpassword</artifactId>
         <version>GIT-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
     <name>Master Password Android</name>
     <description>An Android application to the Master Password algorithm</description>
 
-    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <groupId>com.lyndir.masterpassword</groupId>
     <artifactId>masterpassword-android</artifactId>
     <packaging>apk</packaging>
 
@@ -24,12 +24,9 @@
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
 
-                <!--configuration>
-                    <proguard>
-                        <skip>false</skip>
-                        <config>proguard.cfg</config>
-                    </proguard>
-                </configuration-->
+                <configuration>
+                    <sdk>19</sdk>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -39,7 +36,7 @@
 
         <!-- PROJECT REFERENCES -->
         <dependency>
-            <groupId>com.lyndir.lhunath.masterpassword</groupId>
+            <groupId>com.lyndir.masterpassword</groupId>
             <artifactId>masterpassword-algorithm</artifactId>
             <version>GIT-SNAPSHOT</version>
         </dependency>
@@ -47,18 +44,13 @@
         <dependency>
             <groupId>com.jakewharton</groupId>
             <artifactId>butterknife</artifactId>
-            <version>5.1.2</version>
         </dependency>
 
+        <!-- clone https://github.com/mosabua/maven-android-sdk-deployer.git
+             run   mvn install -P 4.4 -->
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.android</groupId>
+            <groupId>android</groupId>
             <artifactId>android</artifactId>
-            <version>4.1.1.4</version>
-            <scope>provided</scope>
         </dependency>
 
     </dependencies>
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-0.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar0.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-0.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar0.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-1.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar1.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-1.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar1.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-10.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar10.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-10.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar10.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-11.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar11.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-11.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar11.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-12.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar12.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-12.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar12.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-13.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar13.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-13.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar13.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-14.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar14.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-14.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar14.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-15.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar15.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-15.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar15.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-16.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar16.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-16.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar16.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-17.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar17.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-17.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar17.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-18.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar18.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-18.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar18.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-2.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar2.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-2.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar2.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-3.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar3.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-3.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar3.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-4.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar4.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-4.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar4.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-5.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar5.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-5.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar5.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-6.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar6.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-6.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar6.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-7.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar7.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-7.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar7.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-8.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar8.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-8.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar8.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-9.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar9.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-9.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar9.png
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-add.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avataradd.png
similarity index 100%
rename from MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avatar-add.png
rename to MasterPassword/Java/masterpassword-android/res/drawable-mdpi/avataradd.png
diff --git a/MasterPassword/Java/masterpassword-android/res/values/strings.xml b/MasterPassword/Java/masterpassword-android/res/values/strings.xml
index 83a098b8..3eb0d582 100644
--- a/MasterPassword/Java/masterpassword-android/res/values/strings.xml
+++ b/MasterPassword/Java/masterpassword-android/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello masterpassword-android!</string>
-    <string name="app_name">masterpassword-android</string>
+    <string name="app_name">Master Password</string>
     <string name="avatar">User Avatar</string>
 </resources>
diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/UsersActivity.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/UsersActivity.java
similarity index 77%
rename from MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/UsersActivity.java
rename to MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/UsersActivity.java
index e304e2cc..a6f347b1 100644
--- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/UsersActivity.java
+++ b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/UsersActivity.java
@@ -1,13 +1,13 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.LinearLayout;
 import butterknife.ButterKnife;
 import butterknife.InjectView;
-import com.lyndir.lhunath.masterpassword.model.Avatar;
-import com.lyndir.lhunath.masterpassword.model.User;
-import com.lyndir.lhunath.masterpassword.view.AvatarView;
+import com.lyndir.masterpassword.model.Avatar;
+import com.lyndir.masterpassword.model.User;
+import com.lyndir.masterpassword.view.AvatarView;
 
 
 public class UsersActivity extends Activity {
diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/model/Avatar.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/Avatar.java
similarity index 90%
rename from MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/model/Avatar.java
rename to MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/Avatar.java
index 88dd5369..d551aa71 100644
--- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/model/Avatar.java
+++ b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/Avatar.java
@@ -1,6 +1,6 @@
-package com.lyndir.lhunath.masterpassword.model;
+package com.lyndir.masterpassword.model;
 
-import com.lyndir.lhunath.masterpassword.R;
+import com.lyndir.masterpassword.R;
 
 
 /**
diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/model/User.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/User.java
similarity index 87%
rename from MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/model/User.java
rename to MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/User.java
index da702360..e396685a 100644
--- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/model/User.java
+++ b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/model/User.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword.model;
+package com.lyndir.masterpassword.model;
 
 /**
  * @author lhunath, 2014-08-20
diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/view/AvatarView.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/view/AvatarView.java
similarity index 77%
rename from MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/view/AvatarView.java
rename to MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/view/AvatarView.java
index b42337ef..6febb0c0 100644
--- a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/view/AvatarView.java
+++ b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/view/AvatarView.java
@@ -1,13 +1,11 @@
-package com.lyndir.lhunath.masterpassword.view;
+package com.lyndir.masterpassword.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import butterknife.ButterKnife;
-import com.lyndir.lhunath.masterpassword.R;
-import com.lyndir.lhunath.masterpassword.model.User;
+import com.lyndir.masterpassword.R;
+import com.lyndir.masterpassword.model.User;
 
 
 /**
diff --git a/MasterPassword/Java/masterpassword-cli/pom.xml b/MasterPassword/Java/masterpassword-cli/pom.xml
index 12cc8f38..93f99018 100644
--- a/MasterPassword/Java/masterpassword-cli/pom.xml
+++ b/MasterPassword/Java/masterpassword-cli/pom.xml
@@ -5,7 +5,7 @@
 
     <!-- PROJECT METADATA -->
     <parent>
-        <groupId>com.lyndir.lhunath.masterpassword</groupId>
+        <groupId>com.lyndir.masterpassword</groupId>
         <artifactId>masterpassword</artifactId>
         <version>GIT-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
     <name>Master Password CLI</name>
     <description>A CLI interface to the Master Password algorithm</description>
 
-    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <groupId>com.lyndir.masterpassword</groupId>
     <artifactId>masterpassword-cli</artifactId>
     <packaging>jar</packaging>
 
@@ -59,7 +59,7 @@
                         <configuration>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.lyndir.lhunath.masterpassword.CLI</mainClass>
+                                    <mainClass>com.lyndir.masterpassword.CLI</mainClass>
                                 </transformer>
                             </transformers>
                             <filters>
@@ -84,7 +84,7 @@
 
         <!-- PROJECT REFERENCES -->
         <dependency>
-            <groupId>com.lyndir.lhunath.masterpassword</groupId>
+            <groupId>com.lyndir.masterpassword</groupId>
             <artifactId>masterpassword-algorithm</artifactId>
             <version>GIT-SNAPSHOT</version>
         </dependency>
diff --git a/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java b/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/masterpassword/CLI.java
similarity index 99%
rename from MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java
rename to MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/masterpassword/CLI.java
index a8ead9fd..31042c62 100644
--- a/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java
+++ b/MasterPassword/Java/masterpassword-cli/src/main/java/com/lyndir/masterpassword/CLI.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import com.google.common.io.LineReader;
 import com.lyndir.lhunath.opal.system.logging.Logger;
diff --git a/MasterPassword/Java/masterpassword-gui/pom.xml b/MasterPassword/Java/masterpassword-gui/pom.xml
index 646ae8c5..d9c9466e 100644
--- a/MasterPassword/Java/masterpassword-gui/pom.xml
+++ b/MasterPassword/Java/masterpassword-gui/pom.xml
@@ -5,7 +5,7 @@
 
     <!-- PROJECT METADATA -->
     <parent>
-        <groupId>com.lyndir.lhunath.masterpassword</groupId>
+        <groupId>com.lyndir.masterpassword</groupId>
         <artifactId>masterpassword</artifactId>
         <version>GIT-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
     <name>Master Password GUI</name>
     <description>A GUI interface to the Master Password algorithm</description>
 
-    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <groupId>com.lyndir.masterpassword</groupId>
     <artifactId>masterpassword-gui</artifactId>
     <packaging>jar</packaging>
 
@@ -39,7 +39,7 @@
                         <configuration>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.lyndir.lhunath.masterpassword.GUI</mainClass>
+                                    <mainClass>com.lyndir.masterpassword.GUI</mainClass>
                                 </transformer>
                             </transformers>
                             <filters>
@@ -64,7 +64,7 @@
 
         <!-- PROJECT REFERENCES -->
         <dependency>
-            <groupId>com.lyndir.lhunath.masterpassword</groupId>
+            <groupId>com.lyndir.masterpassword</groupId>
             <artifactId>masterpassword-algorithm</artifactId>
             <version>GIT-SNAPSHOT</version>
         </dependency>
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AppleGUI.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/AppleGUI.java
similarity index 94%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AppleGUI.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/AppleGUI.java
index fb0a3992..00f6edf8 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AppleGUI.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/AppleGUI.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import com.apple.eawt.*;
 
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/AuthenticationPanel.java
similarity index 92%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/AuthenticationPanel.java
index d95f5f1f..d8ec8df6 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/AuthenticationPanel.java
@@ -1,6 +1,5 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
-import com.google.common.io.Resources;
 import java.awt.*;
 import javax.swing.*;
 
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/ConfigAuthenticationPanel.java
similarity index 99%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/ConfigAuthenticationPanel.java
index 05d84481..a5f3cf71 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/ConfigAuthenticationPanel.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
 
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/GUI.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java
similarity index 83%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/GUI.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java
index 60e47de4..948aff07 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/GUI.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java
@@ -13,9 +13,8 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
-import com.google.common.base.Optional;
 import com.lyndir.lhunath.opal.system.util.TypeUtils;
 import java.io.IOException;
 import javax.swing.*;
@@ -34,15 +33,13 @@ public class GUI implements UnlockFrame.SignInCallback {
     public static void main(final String[] args)
             throws IOException {
 
-        // Apple
-        Optional<? extends GUI> appleGUI = TypeUtils.newInstance( AppleGUI.class );
-        if (appleGUI.isPresent()) {
-            appleGUI.get().open();
-            return;
+        GUI gui;
+        try {
+            gui = TypeUtils.newInstance( AppleGUI.class );
+        } catch (RuntimeException e) {
+            gui = new GUI();
         }
-
-        // All others
-        new GUI().open();
+        gui.open();
     }
 
     void open() {
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/PasswordFrame.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/PasswordFrame.java
similarity index 98%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/PasswordFrame.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/PasswordFrame.java
index 5a898f59..b6d71165 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/PasswordFrame.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/PasswordFrame.java
@@ -1,9 +1,9 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
 
 import com.google.common.collect.Iterables;
-import com.lyndir.lhunath.masterpassword.util.Components;
+import com.lyndir.masterpassword.util.Components;
 import java.awt.*;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.*;
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/Res.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/Res.java
similarity index 98%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/Res.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/Res.java
index b2663159..46ec097a 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/Res.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/Res.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse;
 import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/TextAuthenticationPanel.java
similarity index 98%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/TextAuthenticationPanel.java
index 098f8827..9526a743 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/TextAuthenticationPanel.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/UnlockFrame.java
similarity index 98%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/UnlockFrame.java
index 52a33883..068b262c 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/UnlockFrame.java
@@ -1,8 +1,8 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
 
-import com.lyndir.lhunath.masterpassword.util.Components;
+import com.lyndir.masterpassword.util.Components;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/User.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/User.java
similarity index 96%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/User.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/User.java
index fcb62768..3f6298a2 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/User.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/User.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword;
+package com.lyndir.masterpassword;
 
 import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
 
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/util/Components.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/util/Components.java
similarity index 89%
rename from MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/util/Components.java
rename to MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/util/Components.java
index 0c3aff58..3169a2db 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/util/Components.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/util/Components.java
@@ -1,4 +1,4 @@
-package com.lyndir.lhunath.masterpassword.util;
+package com.lyndir.masterpassword.util;
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/MasterPassword/Java/pom.xml b/MasterPassword/Java/pom.xml
index 08b32a63..22d397ff 100644
--- a/MasterPassword/Java/pom.xml
+++ b/MasterPassword/Java/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>com.lyndir.lhunath</groupId>
         <artifactId>lyndir</artifactId>
-        <version>GIT-SNAPSHOT</version>
+        <version>1.19</version>
     </parent>
 
     <name>Master Password</name>
     <description>A Java implementation of the Master Password algorithm.</description>
 
-    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <groupId>com.lyndir.masterpassword</groupId>
     <artifactId>masterpassword</artifactId>
     <version>GIT-SNAPSHOT</version>
     <packaging>pom</packaging>