diff --git a/build/settings.gradle b/build/settings.gradle
index af5962e5..0d74348b 100644
--- a/build/settings.gradle
+++ b/build/settings.gradle
@@ -1,7 +1,19 @@
-rootProject.name = 'masterpassword'
-include ':masterpassword-tests'
-include ':masterpassword-algorithm'
-include ':masterpassword-model'
-include ':masterpassword-cli'
-include ':masterpassword-gui'
-include ':masterpassword-android'
+rootProject.name = ':masterpassword'
+
+include ':masterpassword:algorithm'
+project(':masterpassword:algorithm').projectDir = new File( '../core/java/algorithm' )
+
+include ':masterpassword:model'
+project(':masterpassword:model').projectDir = new File( '../core/java/model' )
+
+include ':masterpassword:tests'
+project(':masterpassword:tests').projectDir = new File( '../core/java/tests' )
+
+include ':masterpassword:android'
+project(':masterpassword:android').projectDir = new File( '../platform-android' )
+
+include ':masterpassword:cli'
+project(':masterpassword:cli').projectDir = new File( '../platform-independent/cli-java' )
+
+include ':masterpassword:gui'
+project(':masterpassword:gui').projectDir = new File( '../platform-independent/gui-java' )
diff --git a/core/java/model/build.gradle b/core/java/model/build.gradle
index 4b513baa..81c42ced 100644
--- a/core/java/model/build.gradle
+++ b/core/java/model/build.gradle
@@ -6,7 +6,7 @@ plugins {
 description = 'Master Password Site Model'
 
 dependencies {
-    compile     project(':masterpassword-algorithm')
+    compile     project(':masterpassword:algorithm')
 
     compile     group: 'joda-time', name: 'joda-time', version:'2.4'
 
diff --git a/core/java/tests/build.gradle b/core/java/tests/build.gradle
index 8d9ff652..e83ecc3a 100644
--- a/core/java/tests/build.gradle
+++ b/core/java/tests/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'java'
 description = 'Master Password Test Suite'
 
 dependencies {
-    compile project(':masterpassword-algorithm')
+    compile project(':masterpassword:algorithm')
 
     testCompile group: 'org.testng', name: 'testng', version:'6.8.5'
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
diff --git a/platform-android/build.gradle b/platform-android/build.gradle
index 945d6447..dea99a76 100644
--- a/platform-android/build.gradle
+++ b/platform-android/build.gradle
@@ -27,14 +27,15 @@ android {
     }
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            if (System.getenv('STORE_PW') != null)
+                signingConfig signingConfigs.release
         }
     }
 }
 
 dependencies {
-    compile project( ':masterpassword-algorithm' )
-    compile project( ':masterpassword-tests' )
+    compile project( ':masterpassword:algorithm' )
+    compile project( ':masterpassword:tests' )
 
     // Android dependencies
     compile 'org.slf4j:slf4j-android:1.7.13-underscore'
diff --git a/platform-independent/cli-java/build.gradle b/platform-independent/cli-java/build.gradle
index 41a2f099..4f4a6323 100644
--- a/platform-independent/cli-java/build.gradle
+++ b/platform-independent/cli-java/build.gradle
@@ -8,7 +8,7 @@ description = 'Master Password CLI'
 mainClassName = 'com.lyndir.masterpassword.CLI'
 
 dependencies {
-    compile project(':masterpassword-algorithm')
+    compile project(':masterpassword:algorithm')
 
     compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
 }
diff --git a/platform-independent/gui-java/build.gradle b/platform-independent/gui-java/build.gradle
index 867ec31d..faef5e30 100644
--- a/platform-independent/gui-java/build.gradle
+++ b/platform-independent/gui-java/build.gradle
@@ -8,7 +8,7 @@ description = 'Master Password GUI'
 mainClassName = 'com.lyndir.masterpassword.gui.GUI'
 
 dependencies {
-    compile project(':masterpassword-model')
+    compile project(':masterpassword:model')
 
     compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
     compile group: 'com.yuvimasory', name: 'orange-extensions', version:'1.3.0'