diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..864f396
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+#Tue Aug 05 03:26:05 IDT 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9
diff --git a/gradlew b/gradlew
index 9d82f78..91a7e26 100755
--- a/gradlew
+++ b/gradlew
@@ -42,6 +42,11 @@ case "`uname`" in
     ;;
 esac
 
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -56,9 +61,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+cd "$SAVED" >&-
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -109,7 +114,6 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/meerkat-common/build.gradle b/meerkat-common/build.gradle
index 6aa93cb..c510e0a 100644
--- a/meerkat-common/build.gradle
+++ b/meerkat-common/build.gradle
@@ -49,9 +49,8 @@ dependencies {
     compile 'com.google.guava:guava:11.0.+'
 
     // Crypto
-    compile 'org.factcenter.qilin:qilin:1.1+'
+    compile 'org.factcenter.qilin:qilin:1.2+'
     compile 'org.bouncycastle:bcprov-jdk15on:1.53'
-    compile 'org.bouncycastle:bcpkix-jdk15on:1.53'
 
     testCompile 'junit:junit:4.+'
 
diff --git a/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java b/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
index 1e075bf..f9936c7 100644
--- a/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
+++ b/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
@@ -17,10 +17,10 @@ import org.bouncycastle.math.ec.ECPoint;
 import org.bouncycastle.util.BigIntegers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-import qilin.util.PRGRandom;
-import qilin.util.Pair;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.util.PRGRandom;
+import org.factcenter.qilin.util.Pair;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java
index bb52df9..81375e0 100644
--- a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java
+++ b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java
@@ -8,9 +8,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-import qilin.util.Pair;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.util.Pair;
 
 import java.math.BigInteger;
 import java.util.Random;
diff --git a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java
index 44efe69..66e1647 100644
--- a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java
+++ b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java
@@ -11,10 +11,10 @@ import org.bouncycastle.jce.spec.ECPublicKeySpec;
 import org.bouncycastle.math.ec.ECPoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-import qilin.primitives.generic.ElGamal;
-import qilin.util.Pair;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.generic.ElGamal;
+import org.factcenter.qilin.util.Pair;
 
 import java.io.ByteArrayInputStream;
 import java.security.KeyFactory;