diff --git a/F-Droid/.classpath b/F-Droid/.classpath
deleted file mode 100644
index 2415c67fd..000000000
--- a/F-Droid/.classpath
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="../extern/symlinks-for-ant-and-eclipse">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/AndroidPinning"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/MemorizingActivity"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/library"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/F-Droid/.project b/F-Droid/.project
deleted file mode 100644
index 7045783ad..000000000
--- a/F-Droid/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>fdroid</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/F-Droid/ant-prepare.sh b/F-Droid/ant-prepare.sh
deleted file mode 100755
index 67644b360..000000000
--- a/F-Droid/ant-prepare.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash -ex
-
-if ! which android > /dev/null; then
-    if [ -z $ANDROID_HOME ]; then
-        if [ -e ~/.android/bashrc ]; then
-            . ~/.android/bashrc
-        else
-            echo "'android' not found, ANDROID_HOME must be set!"
-            exit
-        fi
-    else
-        export PATH="${ANDROID_HOME}/tools:$PATH"
-    fi
-fi
-
-# set up test signing keys for any `ant release` runs
-if [ -e ~/.android/ant.properties ]; then
-    cp ~/.android/ant.properties ./
-else
-    echo "skipping release ant.properties"
-fi
-
-
-EXTERN=../extern
-
-place_support_v4() {
-    mkdir -p $1/libs
-    cp libs/android-support-v4.jar $1/libs/
-}
-
-android update lib-project --path $EXTERN/UniversalImageLoader/library
-
-android update lib-project --path $EXTERN/AndroidPinning
-
-android update lib-project --path $EXTERN/libsuperuser/libsuperuser
-
-android update lib-project --path $EXTERN/zxing-core
-
-android update lib-project --path $EXTERN/support-v4-preferencefragment
-place_support_v4 $EXTERN/support-v4-preferencefragment
-
-android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19
-place_support_v4 $EXTERN/Support/v7/appcompat
-
-android update project --path . --name F-Droid
-
-{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null
-
-# technically optional, needed for the tests
-cd test
-android update test-project --path . --main ..
-
-{ echo -e "\nSuccessfully updated the test project.\n"; } 2>/dev/null
diff --git a/F-Droid/project.properties b/F-Droid/project.properties
deleted file mode 100644
index cab683d5d..000000000
--- a/F-Droid/project.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-target=android-21
-
-android.library.reference.1=../extern/UniversalImageLoader/library
-android.library.reference.2=../extern/AndroidPinning
-android.library.reference.3=../extern/libsuperuser/libsuperuser
-android.library.reference.4=../extern/zxing-core
-android.library.reference.5=../extern/support-v4-preferencefragment
-android.library.reference.6=../extern/Support/v7/appcompat
-
-# For java libraries, place symlinks in ../extern/symlinks-for-ant-and-eclipse/
-source.dir=src;../extern/symlinks-for-ant-and-eclipse
-
-# With a target SDK of android-21 (5.0/Lollipop) and a Java 1.7 compiler, you
-# can use Java 1.7 features like the <> diamond operator, multi-catch, strings
-# in switches, etc. zxing uses the <> operator, so Java 1.7 is required.
-java.encoding=UTF-8
-java.source=1.7
-java.target=1.7
diff --git a/README.md b/README.md
index 73927e9a4..22177329e 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,17 @@ for Android.
 Building from source with Gradle
 --------------------------------
 
-Once you have checked out the version you wish to build, install gradle on your system and run:
+The only required tools are the [Android SDK](http://developer.android.com/sdk/index.html) and Gradle.
+
+You should use a relatively new version of Gradle, such as 2.4, or use the
+gradle wrapper.
+
+Once you have checked out the version you wish to build, run:
 
 ```
 git submodule update --init
-gradle build
+cd F-Droid
+gradle clean assembleRelease
 ```
 
 Android Studio
@@ -19,19 +25,6 @@ Android Studio
 
 From Android Studio: File -> Import Project -> Select the cloned top folder
 
-Building from source with Ant
------------------------------
-
-The only required tools are the [Android SDK](http://developer.android.com/sdk/index.html) and Apache Ant.
-
-Once you have checked out the version you wish to build, run:
-
-```
-git submodule update --init
-cd F-Droid
-./ant-prepare.sh # This runs 'android update' on the libs and the main project
-ant clean release
-```
 
 Direct download
 ---------------
@@ -63,67 +56,6 @@ would like to contribute.
 Running the test suite
 ----------------------
 
-FDroid client includes a embedded Android Test Project for running tests.  It
-is in the `test/` subfolder.  To run the tests from the command line, do:
-
-```
-git submodule update --init
-./ant-prepare.sh # This runs 'android update' on the libs and the main project
-ant clean emma debug install test
-```
-
-You can also run the tests in Eclipse. Here's how:
-
-1. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/` directory.
-2. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/test/` directory
-3. If **fdroid-test** has errors, right-click on it, select *Properties*, the
-*Java Build Path*, then click on the *Projects* tab.
-4. Click on the *Add...* button and select `fdroidclient/`
-5. Right-click on the **fdroid-test** project, then *Run As...* -> *Android JUnit Test*
-
-
-Troubleshooting
----------------
-
-When building F-Droid, the following error may occur:
-
-> Invalid file: extern/UniversalImageLoader/library/build.xml
-
-Check the output of the ./ant-prepare.sh command. This error is often
-accompanied by the following message:
-
-> Error: The project either has no target set or the target is invalid.
-> Please provide a --target to the 'android update' command.
-
-The most likely cause of this is that your installed Android SDK is missing
-the target version specified by one of the dependencies. For example, at the
-time of writing this, UniversalImageLoader uses the "android-16" target API,
-however the default install of the Android SDK will usually only install the
-latest version ("android-20" as of writing). So you will have to install
-missings "android-xx" targets via the SDK manager. To get a list of already
-installed SDK targets, run:
-
-```
-$ android list targets
-```
-
-To get a list of targets used by fdroidclient libs, run:
-
-```
-$ for i in $(grep "android.library.reference" project.properties | cut -f2 -d'='); do
-grep ^target $i/project.properties | cut -f2 -d'=';
-done | sort | uniq | paste -s -d',' -
-```
-to install missing or all needed targets, for example "android-16" and "android-7" run:
-
-```
-$ android update sdk -u -t "android-16,android-7"
-```
-
-NOTE: While it may be tempting to add "--target=android-19" to the
-ant-prepare.sh script, it is not the correct solution. Although it may work,
-it can cause strange bugs at runtime.
-
 
 License
 -------
diff --git a/extern/symlinks-for-ant-and-eclipse/fi b/extern/symlinks-for-ant-and-eclipse/fi
deleted file mode 120000
index 1f9b675b2..000000000
--- a/extern/symlinks-for-ant-and-eclipse/fi
+++ /dev/null
@@ -1 +0,0 @@
-../nanohttpd/core/src/main/java/fi
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/javax b/extern/symlinks-for-ant-and-eclipse/javax
deleted file mode 120000
index 09bb0ae3c..000000000
--- a/extern/symlinks-for-ant-and-eclipse/javax
+++ /dev/null
@@ -1 +0,0 @@
-../jmdns/src/main/java/javax
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/kellinwood b/extern/symlinks-for-ant-and-eclipse/kellinwood
deleted file mode 120000
index 443258ed6..000000000
--- a/extern/symlinks-for-ant-and-eclipse/kellinwood
+++ /dev/null
@@ -1 +0,0 @@
-../zipsigner/src/main/java/kellinwood
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/asn1 b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/asn1
deleted file mode 120000
index cbc2ffa1b..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/asn1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extern/spongycastle/core/src/main/java/org/spongycastle/asn1
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/cert b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/cert
deleted file mode 120000
index 72ff90805..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/cert
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/pkix/src/main/java/org/spongycastle/cert
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/cms b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/cms
deleted file mode 120000
index d5222f6c5..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/cms
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/pkix/src/main/java/org/spongycastle/cms
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/crypto b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/crypto
deleted file mode 120000
index 73c1163b2..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/crypto
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/core/src/main/java/org/spongycastle/crypto
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/i18n b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/i18n
deleted file mode 120000
index af504fb4a..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/i18n
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/core/src/main/java/org/spongycastle/i18n
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jcajce b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jcajce
deleted file mode 120000
index aeb7c4c59..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jcajce
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/prov/src/main/java/org/spongycastle/jcajce
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECGOST3410NamedCurveTable.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECGOST3410NamedCurveTable.java
deleted file mode 120000
index 85a167493..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECGOST3410NamedCurveTable.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECGOST3410NamedCurveTable.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECKeyUtil.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECKeyUtil.java
deleted file mode 120000
index 247a8b7a5..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECKeyUtil.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECKeyUtil.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECNamedCurveTable.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECNamedCurveTable.java
deleted file mode 120000
index 1c70aaf03..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECNamedCurveTable.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECNamedCurveTable.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECPointUtil.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECPointUtil.java
deleted file mode 120000
index 4ee1c0b51..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/ECPointUtil.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/ECPointUtil.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/MultiCertStoreParameters.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/MultiCertStoreParameters.java
deleted file mode 120000
index 82e03628a..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/MultiCertStoreParameters.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/MultiCertStoreParameters.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PKCS10CertificationRequest.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PKCS10CertificationRequest.java
deleted file mode 120000
index 595c7b9fa..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PKCS10CertificationRequest.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/PKCS10CertificationRequest.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PKCS12Util.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PKCS12Util.java
deleted file mode 120000
index 1c65f4081..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PKCS12Util.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/PKCS12Util.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PrincipalUtil.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PrincipalUtil.java
deleted file mode 120000
index a6352af2e..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/PrincipalUtil.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/PrincipalUtil.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509KeyUsage.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509KeyUsage.java
deleted file mode 120000
index 6f7a30366..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509KeyUsage.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/X509KeyUsage.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509LDAPCertStoreParameters.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509LDAPCertStoreParameters.java
deleted file mode 120000
index 69b78a6bc..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509LDAPCertStoreParameters.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/X509LDAPCertStoreParameters.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509Principal.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509Principal.java
deleted file mode 120000
index 9e93b34ee..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/X509Principal.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/X509Principal.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/exception b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/exception
deleted file mode 120000
index 18723f8d3..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/exception
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/exception
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/interfaces b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/interfaces
deleted file mode 120000
index 2e12d5422..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/interfaces
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/interfaces
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/AnnotatedException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/AnnotatedException.java
deleted file mode 120000
index a17cc1a5b..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/AnnotatedException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/AnnotatedException.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BouncyCastleProvider.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BouncyCastleProvider.java
deleted file mode 120000
index 19b9993ff..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BouncyCastleProvider.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProvider.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java
deleted file mode 120000
index 6186311d7..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java
deleted file mode 120000
index 80ab322c4..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java
deleted file mode 120000
index ed461e38a..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenPBE.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenPBE.java
deleted file mode 120000
index dedf6d02d..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/BrokenPBE.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/BrokenPBE.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertPathValidatorUtilities.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertPathValidatorUtilities.java
deleted file mode 120000
index 0b15e047f..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertPathValidatorUtilities.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/CertPathValidatorUtilities.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertStatus.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertStatus.java
deleted file mode 120000
index 0f700b517..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertStatus.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/CertStatus.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertStoreCollectionSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertStoreCollectionSpi.java
deleted file mode 120000
index d57bc96c2..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/CertStoreCollectionSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/CertStoreCollectionSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/DHUtil.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/DHUtil.java
deleted file mode 120000
index 0a5db15e8..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/DHUtil.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/DHUtil.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/ExtCRLException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/ExtCRLException.java
deleted file mode 120000
index 9e8263158..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/ExtCRLException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/ExtCRLException.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEDHPrivateKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEDHPrivateKey.java
deleted file mode 120000
index 03684ee5e..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEDHPrivateKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPrivateKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEDHPublicKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEDHPublicKey.java
deleted file mode 120000
index 9803a0249..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEDHPublicKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPublicKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEECPrivateKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEECPrivateKey.java
deleted file mode 120000
index 7e16440c1..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEECPrivateKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEECPrivateKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEECPublicKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEECPublicKey.java
deleted file mode 120000
index 90f4a70c7..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEECPublicKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEECPublicKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java
deleted file mode 120000
index 84866b855..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEElGamalPublicKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEElGamalPublicKey.java
deleted file mode 120000
index f7291294d..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEElGamalPublicKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPublicKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java
deleted file mode 120000
index ebebdb693..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPrivateKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPrivateKey.java
deleted file mode 120000
index 06ae733fc..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPrivateKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPublicKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPublicKey.java
deleted file mode 120000
index fe29ccd3d..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCERSAPublicKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPublicKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEStreamCipher.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEStreamCipher.java
deleted file mode 120000
index a72744fd9..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JCEStreamCipher.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JCEStreamCipher.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKDSAPrivateKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKDSAPrivateKey.java
deleted file mode 120000
index 9c81bd9d6..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKDSAPrivateKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPrivateKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKDSAPublicKey.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKDSAPublicKey.java
deleted file mode 120000
index d7f2b4792..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKDSAPublicKey.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPublicKey.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java
deleted file mode 120000
index 75e6cf659..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/MultiCertStoreSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/MultiCertStoreSpi.java
deleted file mode 120000
index e37877c27..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/MultiCertStoreSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/MultiCertStoreSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PEMUtil.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PEMUtil.java
deleted file mode 120000
index a8d3b6b50..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PEMUtil.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PEMUtil.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
deleted file mode 120000
index d25de9aa8..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
deleted file mode 120000
index bcf9c6677..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCRLUtil.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCRLUtil.java
deleted file mode 120000
index b15fdd33e..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCRLUtil.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXCRLUtil.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java
deleted file mode 120000
index 389434741..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java
deleted file mode 120000
index dbab12bb9..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java
deleted file mode 120000
index 870e97815..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java
deleted file mode 120000
index b2b022602..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXPolicyNode.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXPolicyNode.java
deleted file mode 120000
index f135d82f9..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/PKIXPolicyNode.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/PKIXPolicyNode.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java
deleted file mode 120000
index b1545f960..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java
deleted file mode 120000
index 9bf137403..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/ReasonsMask.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/ReasonsMask.java
deleted file mode 120000
index 69ea8ebf5..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/ReasonsMask.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/ReasonsMask.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509AttrCertParser.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509AttrCertParser.java
deleted file mode 120000
index af1537def..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509AttrCertParser.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509AttrCertParser.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLEntryObject.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLEntryObject.java
deleted file mode 120000
index e5b5192ec..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLEntryObject.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CRLEntryObject.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLObject.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLObject.java
deleted file mode 120000
index 9f6d01eb2..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLObject.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CRLObject.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLParser.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLParser.java
deleted file mode 120000
index 9ae15edbe..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CRLParser.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CRLParser.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertPairParser.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertPairParser.java
deleted file mode 120000
index b5b0129a3..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertPairParser.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CertPairParser.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertParser.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertParser.java
deleted file mode 120000
index 98fed98e6..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertParser.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CertParser.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertificateObject.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertificateObject.java
deleted file mode 120000
index 21e2f213c..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509CertificateObject.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509CertificateObject.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509SignatureUtil.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509SignatureUtil.java
deleted file mode 120000
index b89b84852..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509SignatureUtil.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509SignatureUtil.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java
deleted file mode 120000
index f7b93deab..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCRLCollection.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCRLCollection.java
deleted file mode 120000
index c3b1afe9f..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCRLCollection.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCRLCollection.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCertCollection.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCertCollection.java
deleted file mode 120000
index 66ee054e2..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCertCollection.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertCollection.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCertPairCollection.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCertPairCollection.java
deleted file mode 120000
index 3821264c3..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/provider/X509StoreCertPairCollection.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertPairCollection.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/spec b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/spec
deleted file mode 120000
index a57149cc8..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/jce/spec
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/jce/spec
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/math b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/math
deleted file mode 120000
index 879523869..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/math
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/core/src/main/java/org/spongycastle/math
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/mozilla b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/mozilla
deleted file mode 120000
index 023e32f6e..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/mozilla
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/pkix/src/main/java/org/spongycastle/mozilla
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/operator b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/operator
deleted file mode 120000
index 7307766ea..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/operator
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/pkix/src/main/java/org/spongycastle/operator
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pkcs b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pkcs
deleted file mode 120000
index 20235a46a..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pkcs
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/pkix/src/main/java/org/spongycastle/pkcs
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/asn1 b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/asn1
deleted file mode 120000
index 882f32de4..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/asn1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/core/src/main/java/org/spongycastle/pqc/asn1
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/crypto b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/crypto
deleted file mode 120000
index f68dc7d37..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/crypto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/core/src/main/java/org/spongycastle/pqc/crypto
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/jcajce b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/jcajce
deleted file mode 120000
index f7ee4db36..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/jcajce
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/pqc/jcajce
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/math b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/math
deleted file mode 120000
index c54bddb65..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/pqc/math
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/core/src/main/java/org/spongycastle/pqc/math
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/util b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/util
deleted file mode 120000
index 26566a804..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/util
+++ /dev/null
@@ -1 +0,0 @@
-../../../spongycastle/core/src/main/java/org/spongycastle/util
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/AttributeCertificateHolder.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/AttributeCertificateHolder.java
deleted file mode 120000
index 449cbc84c..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/AttributeCertificateHolder.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/AttributeCertificateHolder.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/AttributeCertificateIssuer.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/AttributeCertificateIssuer.java
deleted file mode 120000
index e95b91120..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/AttributeCertificateIssuer.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/CertPathReviewerException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/CertPathReviewerException.java
deleted file mode 120000
index 328857ece..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/CertPathReviewerException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/CertPathReviewerException.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtCertificateEncodingException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtCertificateEncodingException.java
deleted file mode 120000
index a4ebd94d6..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtCertificateEncodingException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/ExtCertificateEncodingException.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java
deleted file mode 120000
index 91138abcd..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtendedPKIXParameters.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtendedPKIXParameters.java
deleted file mode 120000
index 8e8b5d3a5..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/ExtendedPKIXParameters.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXParameters.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/NoSuchParserException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/NoSuchParserException.java
deleted file mode 120000
index 5f1d75cc8..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/NoSuchParserException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/NoSuchParserException.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/NoSuchStoreException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/NoSuchStoreException.java
deleted file mode 120000
index c30100a98..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/NoSuchStoreException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/NoSuchStoreException.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/PKIXAttrCertChecker.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/PKIXAttrCertChecker.java
deleted file mode 120000
index f756fae9f..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/PKIXAttrCertChecker.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/PKIXAttrCertChecker.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/PKIXCertPathReviewer.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/PKIXCertPathReviewer.java
deleted file mode 120000
index 4dde00db4..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/PKIXCertPathReviewer.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/PKIXCertPathReviewer.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Attribute.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Attribute.java
deleted file mode 120000
index 00d7d88b2..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Attribute.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509Attribute.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509AttributeCertStoreSelector.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509AttributeCertStoreSelector.java
deleted file mode 120000
index 2325963d3..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509AttributeCertStoreSelector.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509AttributeCertStoreSelector.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509AttributeCertificate.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509AttributeCertificate.java
deleted file mode 120000
index d7c7d4487..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509AttributeCertificate.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509AttributeCertificate.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CRLStoreSelector.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CRLStoreSelector.java
deleted file mode 120000
index f89602f11..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CRLStoreSelector.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509CRLStoreSelector.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertPairStoreSelector.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertPairStoreSelector.java
deleted file mode 120000
index 2ab1dc1f8..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertPairStoreSelector.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509CertPairStoreSelector.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertStoreSelector.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertStoreSelector.java
deleted file mode 120000
index 32e539801..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertStoreSelector.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509CertStoreSelector.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertificatePair.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertificatePair.java
deleted file mode 120000
index f77f16468..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CertificatePair.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509CertificatePair.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CollectionStoreParameters.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CollectionStoreParameters.java
deleted file mode 120000
index 06f1e6e1b..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509CollectionStoreParameters.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509CollectionStoreParameters.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Store.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Store.java
deleted file mode 120000
index c6b2546ec..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Store.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509Store.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StoreParameters.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StoreParameters.java
deleted file mode 120000
index d88eba314..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StoreParameters.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509StoreParameters.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StoreSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StoreSpi.java
deleted file mode 120000
index bec53a9d6..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StoreSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509StoreSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StreamParser.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StreamParser.java
deleted file mode 120000
index 6434dae4a..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StreamParser.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509StreamParser.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StreamParserSpi.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StreamParserSpi.java
deleted file mode 120000
index 9826a7183..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509StreamParserSpi.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509StreamParserSpi.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Util.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Util.java
deleted file mode 120000
index e5ce6324b..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509Util.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509Util.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V1CertificateGenerator.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V1CertificateGenerator.java
deleted file mode 120000
index 0f9c09f01..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V1CertificateGenerator.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509V1CertificateGenerator.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V2AttributeCertificate.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V2AttributeCertificate.java
deleted file mode 120000
index 4189c2d78..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V2AttributeCertificate.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509V2AttributeCertificate.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V2CRLGenerator.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V2CRLGenerator.java
deleted file mode 120000
index 494902bd6..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V2CRLGenerator.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509V2CRLGenerator.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V3CertificateGenerator.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V3CertificateGenerator.java
deleted file mode 120000
index a53b0b38b..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/X509V3CertificateGenerator.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/X509V3CertificateGenerator.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/extension b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/extension
deleted file mode 120000
index 493af5f83..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/extension
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/extension
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/util/StreamParser.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/util/StreamParser.java
deleted file mode 120000
index c92a26626..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/util/StreamParser.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/util/StreamParser.java
\ No newline at end of file
diff --git a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/util/StreamParsingException.java b/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/util/StreamParsingException.java
deleted file mode 120000
index 2f2fa9862..000000000
--- a/extern/symlinks-for-ant-and-eclipse/org/spongycastle/x509/util/StreamParsingException.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../spongycastle/prov/src/main/java/org/spongycastle/x509/util/StreamParsingException.java
\ No newline at end of file